]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 Sep 2009 22:18:57 +0000 (15:18 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 Sep 2009 22:18:57 +0000 (15:18 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  SELinux: do not destroy the avc_cache_nodep
  KEYS: Have the garbage collector set its timer for live expired keys
  tpm-fixup-pcrs-sysfs-file-update
  creds_are_invalid() needs to be exported for use by modules:
  include/linux/cred.h: fix build

Fix trivial BUILD_BUG_ON-induced conflicts in drivers/char/tpm/tpm.c

1351 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/mtdnand.tmpl
Documentation/DocBook/scsi.tmpl
Documentation/Intel-IOMMU.txt
Documentation/SubmittingPatches
Documentation/accounting/getdelays.c
Documentation/auxdisplay/cfag12864b-example.c
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/memory.txt
Documentation/networking/regulatory.txt
Documentation/numastat.txt
Documentation/pcmcia/crc32hash.c
Documentation/power/power_supply_class.txt
Documentation/power/regulator/design.txt [new file with mode: 0644]
Documentation/power/regulator/machine.txt
Documentation/power/regulator/overview.txt
Documentation/power/regulator/regulator.txt
Documentation/powerpc/dts-bindings/fsl/esdhc.txt
Documentation/powerpc/dts-bindings/marvell.txt
Documentation/powerpc/dts-bindings/mtd-physmap.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/tracepoint-analysis.txt [new file with mode: 0644]
Documentation/usb/authorization.txt
Documentation/usb/usbmon.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/nhk8815_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/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-ixp4xx/common.c
arch/arm/mach-ixp4xx/include/mach/system.h
arch/arm/mach-nomadik/board-nhk8815.c
arch/arm/mach-nomadik/include/mach/fsmc.h [new file with mode: 0644]
arch/arm/mach-nomadik/include/mach/nand.h [new file with mode: 0644]
arch/arm/mach-omap2/board-apollon.c
arch/arm/mach-omap2/board-rx51-peripherals.c
arch/arm/mach-omap2/devices.c
arch/arm/mach-omap2/gpmc.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/gpmc.h
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/mach-bf538/include/mach/defBF539.h
arch/cris/include/asm/mman.h
arch/cris/mm/init.c
arch/frv/include/asm/gdb-stub.h
arch/frv/include/asm/hardirq.h
arch/frv/include/asm/mman.h
arch/frv/kernel/debug-stub.c
arch/frv/kernel/process.c
arch/frv/lib/cache.S
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/cputime.h
arch/ia64/include/asm/mman.h
arch/ia64/kernel/pci-swiotlb.c
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/kernel/time.c
arch/m68k/mm/init.c
arch/microblaze/mm/init.c
arch/mips/include/asm/mman.h
arch/mips/include/asm/pgtable.h
arch/mips/mm/init.c
arch/mn10300/include/asm/cacheflush.h
arch/mn10300/include/asm/gdb-stub.h
arch/mn10300/include/asm/mman.h
arch/mn10300/kernel/asm-offsets.c
arch/mn10300/kernel/mn10300-serial-low.S
arch/mn10300/kernel/mn10300-serial.c
arch/mn10300/kernel/setup.c
arch/mn10300/mm/init.c
arch/parisc/include/asm/mman.h
arch/parisc/mm/init.c
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/cputime.h
arch/powerpc/include/asm/mman.h
arch/powerpc/include/asm/perf_event.h
arch/powerpc/kernel/perf_event.c
arch/powerpc/kernel/setup-common.c
arch/powerpc/kernel/time.c
arch/powerpc/kernel/udbg_16550.c
arch/powerpc/mm/init_32.c
arch/powerpc/mm/init_64.c
arch/powerpc/mm/mem.c
arch/powerpc/platforms/cell/spufs/inode.c
arch/powerpc/platforms/powermac/udbg_scc.c
arch/powerpc/platforms/pseries/hvCall_inst.c
arch/powerpc/sysdev/axonram.c
arch/s390/defconfig
arch/s390/hypfs/inode.c
arch/s390/include/asm/cputime.h
arch/s390/include/asm/lowcore.h
arch/s390/include/asm/mman.h
arch/s390/include/asm/processor.h
arch/s390/kernel/asm-offsets.c
arch/s390/kernel/compat_linux.c
arch/s390/kernel/compat_linux.h
arch/s390/kernel/compat_wrapper.S
arch/s390/kernel/entry.h
arch/s390/kernel/process.c
arch/s390/kernel/ptrace.c
arch/s390/kernel/sclp.S
arch/s390/kernel/smp.c
arch/s390/kernel/suspend.c
arch/s390/kernel/swsusp_asm64.S
arch/s390/kernel/syscalls.S
arch/s390/kvm/interrupt.c
arch/s390/mm/init.c
arch/s390/mm/page-states.c
arch/s390/mm/pgtable.c
arch/score/include/asm/page.h
arch/score/include/asm/thread_info.h
arch/score/kernel/vmlinux.lds.S
arch/sh/mm/init.c
arch/sparc/include/asm/mman.h
arch/sparc/include/asm/vio.h
arch/sparc/kernel/irq_64.c
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/x86/Kconfig
arch/x86/include/asm/acpi.h
arch/x86/include/asm/syscall.h
arch/x86/kernel/Makefile
arch/x86/kernel/cpu/amd.c
arch/x86/kernel/e820.c
arch/x86/kernel/early_printk.c
arch/x86/kernel/entry_64.S
arch/x86/kernel/microcode_core.c
arch/x86/kernel/pci-swiotlb.c
arch/x86/kernel/ptrace.c
arch/x86/kernel/setup.c
arch/x86/kernel/sfi.c [new file with mode: 0644]
arch/x86/lguest/boot.c
arch/x86/mm/init_32.c
arch/x86/mm/init_64.c
arch/x86/mm/kmemcheck/kmemcheck.c
arch/x86/pci/mmconfig-shared.c
arch/x86/pci/mmconfig_32.c
arch/xtensa/include/asm/mman.h
arch/xtensa/mm/init.c
drivers/Makefile
drivers/acpi/Kconfig
drivers/acpi/Makefile
drivers/acpi/ac.c
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/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/blacklist.c
drivers/acpi/bus.c
drivers/acpi/button.c
drivers/acpi/cm_sbs.c
drivers/acpi/container.c
drivers/acpi/debug.c
drivers/acpi/dock.c
drivers/acpi/ec.c
drivers/acpi/event.c
drivers/acpi/fan.c
drivers/acpi/glue.c
drivers/acpi/internal.h
drivers/acpi/numa.c
drivers/acpi/osl.c
drivers/acpi/pci_irq.c
drivers/acpi/pci_link.c
drivers/acpi/pci_root.c
drivers/acpi/pci_slot.c
drivers/acpi/power.c
drivers/acpi/power_meter.c [new file with mode: 0644]
drivers/acpi/processor_core.c
drivers/acpi/processor_idle.c
drivers/acpi/processor_perflib.c
drivers/acpi/processor_thermal.c
drivers/acpi/processor_throttling.c
drivers/acpi/sbs.c
drivers/acpi/sbshc.c
drivers/acpi/scan.c
drivers/acpi/sleep.c
drivers/acpi/system.c
drivers/acpi/tables.c
drivers/acpi/thermal.c
drivers/acpi/utils.c
drivers/acpi/video.c
drivers/acpi/video_detect.c
drivers/ata/pata_hpt37x.c
drivers/base/node.c
drivers/block/DAC960.c
drivers/block/amiflop.c
drivers/block/aoe/aoeblk.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/epca.c
drivers/char/hw_random/virtio-rng.c
drivers/char/ipmi/ipmi_poweroff.c
drivers/char/misc.c
drivers/char/pcmcia/cm4000_cs.c
drivers/char/tpm/tpm.c
drivers/char/tpm/tpm_bios.c
drivers/char/virtio_console.c
drivers/connector/cn_proc.c
drivers/cpuidle/governors/menu.c
drivers/edac/edac_core.h
drivers/firewire/core-card.c
drivers/firewire/core-transaction.c
drivers/firewire/core.h
drivers/firewire/ohci.c
drivers/firewire/sbp2.c
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/i915/intel_dp.c
drivers/gpu/drm/mga/mga_state.c
drivers/gpu/drm/radeon/r600_blit.c
drivers/gpu/drm/radeon/r600_blit_kms.c
drivers/gpu/drm/radeon/radeon.h
drivers/gpu/drm/radeon/radeon_drv.h
drivers/gpu/drm/radeon/radeon_family.h [new file with mode: 0644]
drivers/hid/Kconfig
drivers/hid/hid-core.c
drivers/hid/usbhid/hid-core.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-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/ieee1394/raw1394.c
drivers/ieee1394/sbp2.c
drivers/infiniband/hw/ehca/ehca_mrmw.c
drivers/infiniband/hw/ipath/ipath_iba6110.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/input/touchscreen/wm97xx-core.c
drivers/isdn/capi/capifs.c
drivers/isdn/capi/capiutil.c
drivers/isdn/capi/kcapi_proc.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.c
drivers/md/md.c
drivers/md/md.h
drivers/md/multipath.c
drivers/media/dvb/pt1/pt1.c
drivers/media/dvb/siano/smscoreapi.c
drivers/media/dvb/siano/smscoreapi.h
drivers/media/radio/radio-mr800.c
drivers/media/video/cx88/cx88-blackbird.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/gspca/m5602/m5602_core.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/Kconfig
drivers/mtd/afs.c
drivers/mtd/chips/cfi_cmdset_0002.c
drivers/mtd/chips/cfi_util.c [changed mode: 0644->0755]
drivers/mtd/chips/jedec_probe.c
drivers/mtd/devices/Kconfig
drivers/mtd/devices/Makefile
drivers/mtd/devices/lart.c
drivers/mtd/devices/m25p80.c
drivers/mtd/devices/mtd_dataflash.c
drivers/mtd/devices/phram.c
drivers/mtd/devices/slram.c
drivers/mtd/devices/sst25l.c [new file with mode: 0644]
drivers/mtd/ftl.c
drivers/mtd/inftlcore.c [changed mode: 0644->0755]
drivers/mtd/maps/Kconfig
drivers/mtd/maps/Makefile
drivers/mtd/maps/gpio-addr-flash.c [new file with mode: 0644]
drivers/mtd/maps/ixp2000.c
drivers/mtd/maps/physmap_of.c
drivers/mtd/maps/plat-ram.c
drivers/mtd/maps/pmcmsp-flash.c
drivers/mtd/maps/uclinux.c
drivers/mtd/mtd_blkdevs.c
drivers/mtd/mtdblock.c
drivers/mtd/mtdconcat.c
drivers/mtd/mtdcore.c
drivers/mtd/mtdpart.c
drivers/mtd/nand/Kconfig
drivers/mtd/nand/Makefile
drivers/mtd/nand/atmel_nand.c
drivers/mtd/nand/cafe_nand.c
drivers/mtd/nand/cmx270_nand.c
drivers/mtd/nand/davinci_nand.c
drivers/mtd/nand/fsl_elbc_nand.c
drivers/mtd/nand/mxc_nand.c
drivers/mtd/nand/nand_base.c
drivers/mtd/nand/nand_ecc.c
drivers/mtd/nand/ndfc.c
drivers/mtd/nand/nomadik_nand.c [new file with mode: 0644]
drivers/mtd/nand/omap2.c
drivers/mtd/nand/orion_nand.c
drivers/mtd/nand/pxa3xx_nand.c
drivers/mtd/nand/sh_flctl.c
drivers/mtd/nand/tmio_nand.c
drivers/mtd/nand/txx9ndfmc.c
drivers/mtd/nand/w90p910_nand.c [new file with mode: 0644]
drivers/mtd/ofpart.c
drivers/mtd/onenand/Kconfig
drivers/mtd/onenand/generic.c
drivers/mtd/onenand/onenand_base.c
drivers/mtd/tests/mtd_oobtest.c
drivers/mtd/tests/mtd_pagetest.c
drivers/mtd/ubi/eba.c
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/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/pci/intel-iommu.c
drivers/pci/intr_remapping.c
drivers/pci/iova.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/platform/x86/wmi.c
drivers/pnp/driver.c
drivers/pnp/pnpacpi/core.c
drivers/power/Kconfig
drivers/power/Makefile
drivers/power/ds2760_battery.c
drivers/power/olpc_battery.c
drivers/power/power_supply_core.c
drivers/power/power_supply_sysfs.c
drivers/power/wm831x_power.c [new file with mode: 0644]
drivers/power/wm8350_power.c
drivers/power/wm97xx_battery.c
drivers/regulator/Kconfig
drivers/regulator/Makefile
drivers/regulator/core.c
drivers/regulator/da903x.c
drivers/regulator/fixed.c
drivers/regulator/lp3971.c
drivers/regulator/pcf50633-regulator.c
drivers/regulator/tps65023-regulator.c [new file with mode: 0644]
drivers/regulator/tps6507x-regulator.c [new file with mode: 0644]
drivers/regulator/userspace-consumer.c
drivers/regulator/virtual.c
drivers/regulator/wm8350-regulator.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/cio/css.c
drivers/s390/cio/css.h
drivers/s390/cio/device.c
drivers/s390/cio/device.h
drivers/s390/cio/idset.c
drivers/s390/cio/idset.h
drivers/s390/cio/qdio_main.c
drivers/s390/crypto/ap_bus.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/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/max3100.c
drivers/serial/serial_core.c
drivers/sfi/Kconfig [new file with mode: 0644]
drivers/sfi/Makefile [new file with mode: 0644]
drivers/sfi/sfi_acpi.c [new file with mode: 0644]
drivers/sfi/sfi_core.c [new file with mode: 0644]
drivers/sfi/sfi_core.h [new file with mode: 0644]
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/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/usbtmc.c
drivers/usb/core/config.c
drivers/usb/core/devio.c
drivers/usb/core/driver.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/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/ch341.c
drivers/usb/serial/cypress_m8.h
drivers/usb/serial/ftdi_sio.c
drivers/usb/serial/ftdi_sio.h
drivers/usb/serial/generic.c
drivers/usb/serial/io_edgeport.c
drivers/usb/serial/iuu_phoenix.c
drivers/usb/serial/kl5kusb105.c
drivers/usb/serial/moto_modem.c
drivers/usb/serial/option.c
drivers/usb/serial/pl2303.c
drivers/usb/serial/pl2303.h
drivers/usb/serial/sierra.c
drivers/usb/serial/spcp8x5.c
drivers/usb/serial/usb-serial.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
firmware/ihex2fw.c
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/background.c
fs/jffs2/malloc.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/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/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/cputime.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/linux/acpi.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/eventfd.h
include/linux/firewire.h
include/linux/flex_array.h
include/linux/fs.h
include/linux/genhd.h
include/linux/gfp.h
include/linux/gpio.h
include/linux/hid.h
include/linux/hugetlb.h
include/linux/i2c-id.h
include/linux/i2c.h
include/linux/intel-iommu.h
include/linux/ioport.h
include/linux/iova.h
include/linux/jbd.h
include/linux/kernel.h
include/linux/kmemcheck.h
include/linux/ksm.h [new file with mode: 0644]
include/linux/lis3lv02d.h
include/linux/lockd/lockd.h
include/linux/mISDNif.h
include/linux/magic.h
include/linux/memory_hotplug.h
include/linux/mempool.h
include/linux/mfd/da903x.h
include/linux/mfd/wm831x/pmu.h [new file with mode: 0644]
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/mtd/nand.h
include/linux/mtd/nand_ecc.h
include/linux/mtd/onenand.h
include/linux/mtd/onenand_regs.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/pci_ids.h
include/linux/pnp.h
include/linux/poison.h
include/linux/power_supply.h
include/linux/proc_fs.h
include/linux/quotaops.h
include/linux/regulator/consumer.h
include/linux/regulator/driver.h
include/linux/regulator/fixed.h
include/linux/regulator/machine.h
include/linux/regulator/max1586.h
include/linux/rmap.h
include/linux/sched.h
include/linux/serial_core.h
include/linux/sfi.h [new file with mode: 0644]
include/linux/sfi_acpi.h [new file with mode: 0644]
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/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/vgaarb.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/wm97xx.h
include/linux/wm97xx_batt.h
include/linux/workqueue.h
include/rdma/ib_cm.h
include/scsi/fc/fc_fc2.h
include/trace/events/kmem.h
include/trace/events/timer.h [new file with mode: 0644]
include/video/da8xx-fb.h [new file with mode: 0644]
init/main.c
ipc/mqueue.c
ipc/shm.c
ipc/util.c
kernel/cgroup.c
kernel/exit.c
kernel/fork.c
kernel/hrtimer.c
kernel/itimer.c
kernel/kallsyms.c
kernel/kmod.c
kernel/kprobes.c
kernel/lockdep.c
kernel/lockdep_proc.c
kernel/module.c
kernel/panic.c
kernel/pid.c
kernel/posix-cpu-timers.c
kernel/power/process.c
kernel/power/snapshot.c
kernel/printk.c
kernel/resource.c
kernel/sched.c
kernel/smp.c
kernel/sys.c
kernel/sysctl.c
kernel/timer.c
kernel/trace/Kconfig
kernel/trace/ftrace.c
kernel/trace/trace.c
kernel/trace/trace_hw_branches.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/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
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
security/integrity/ima/ima_fs.c
security/smack/smack_lsm.c
security/smack/smackfs.c
sound/core/pcm_native.c
sound/oss/swarm_cs4297a.c
sound/oss/sys_timer.c
sound/pci/lx6464es/lx6464es.h
sound/pci/lx6464es/lx_core.c
sound/soc/blackfin/bf5xx-ac97.c
sound/soc/blackfin/bf5xx-ac97.h
sound/soc/blackfin/bf5xx-i2s.c
sound/soc/blackfin/bf5xx-i2s.h
sound/soc/blackfin/bf5xx-sport.c
sound/soc/codecs/ad1836.c
sound/soc/codecs/ad1938.c
sound/soc/codecs/wm8753.c
sound/soc/codecs/wm9081.c
sound/soc/davinci/davinci-mcasp.c
sound/soc/pxa/pxa-ssp.c
sound/soc/s3c24xx/s3c24xx_uda134x.c
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 8aab8092ad35dd4bfc55188e22999651b572b24a..80f4c94c7befdc67e9ecfec2753238ee7811bc1b 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 8e145857fc9dad52ff39f90dcac17015b4851fd0..df0d089d0fb9ff444e2bb665ff1227ab818fd7b1 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 10a150ae2a7e383557c6d7c39be70353f500494f..d87f4569e7682a85bde0d34fafabdc96028430c2 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 21bc416d887efdfabfe4c03b22639b225d72909c..cf9431db873150d38a3d2477280d481ff42bfa83 100644 (file)
@@ -56,11 +56,7 @@ Graphics Problems?
 ------------------
 If you encounter issues with graphics devices, you can try adding
 option intel_iommu=igfx_off to turn off the integrated graphics engine.
-
-If it happens to be a PCI device included in the INCLUDE_ALL Engine,
-then try enabling CONFIG_DMAR_GFX_WA to setup a 1-1 map. We hear
-graphics drivers may be in process of using DMA api's in the near
-future and at that time this option can be yanked out.
+If this fixes anything, please ensure you file a bug reporting the problem.
 
 Some exceptions to IOVA
 -----------------------
index 5c555a8b39e553cf0c3117026ebf37d481c588b6..b7f9d3b4bbf6b15934091f55b20e327419cddd6b 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 aa73e72fd793896cbb70fa85505d5f6a7b76d80a..6e25c2659e0af2ab38b1c2cd1d700b129a96a064 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 2caeea5e49932e1c3e132a55794373c3fe65dbad..1d2c010bae120faacda9f7a40324a3bc3b57a308 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];
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 ad7a67707d622b36d4dad79c76ae27fd0406a607..e5ce8a1a978bf815654228c9d1a1e92625ffdb05 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 f12c30c93f2fff8408a051446d7bf53cc94a4826..5af164f4b37b530fba1ffbb238d0dcd1331c2092 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 05d81cbcb2e17e4e47fd44f7729fba05e1d45e50..5920fe26e6ff5cb006372571b1f1da5a80cd526e 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 68baddf3c3e04f0c75e03dcf58a83dc926d57644..3ba0b945aaf862fc1c08a9c1a7f2ea04b0653486 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 ffead13f9443fd7d11b63e2cd3a6ffb15c0f1994..b5aee7838a001755350d7510de1ebd02f000c95d 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 40ec633527600be750ef15ec4f8706c8bcae0f01..e7ca6478cd93d4e6422d1ae92455b347dbdf7ccb 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 e4b6985044a263249976cc0ca985529555007462..fa4dc077ae0eed46adf4a7312f5d033fec717fdf 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 bbea1ccfd46a30c95cc2861223f1a499600d0bf0..681ec22b9d0e2b2574821617160fed57f88aa537 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 d1ebbe510f359b71034d612eea140f6b6fd2499a..db5cc1227a83949a50146cbe01dd887c8610bcea 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 f889481762b5686a4819a7ddafb174b26fb104f9..c5b37c570554bb78aa0017684dfa7397110abe32 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 d23610fb2ff9e0560580bf4332bc81ea0a249326..3dfb76ca6931dd302e7fe53c57339dd9742511df 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 0f17d16dc1012d1e4bef0a72ceab0bb72b499805..6fa7292947e5c8d100d6e426013aa31aa421f115 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 363044609dadd243a9bae89ab437b5eeaaa8b023..c28f82895d6bea2b5561f6c56f3b2e7bfa126754 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 e2ddcdeb61b6f5caffa1f80f901ebf5619f93dd7..6d03487ef1c71ea3a3ea6cc30240e2a0c9f9d5d4 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 6399557cdab3d6542a0feea0c0cd2c6b2af5ffad..8fd5ca2ae32dde4d9eb27722942a5d099f4afbc3 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 950cde6d6e58384083202b40af0921ef31e0e0ca..ba9373f82ab5fa9fe62276cc27333447a22475ba 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);
index 2b3dedd39538f0101467b52c821829924dd10adb..802efe58647c677df31bb01e943d5174205d28a3 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 eaa1a25946c1d011c0a51a2fed1b9f1d7047829c..ee31369e9e5baec8300136a1d2992be5a8bb2c97 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 80133ace1eb277e28fa0c1b0d95007caf205dd30..9fcc9a608dc04789c1a0831db06998561dffbec8 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 4210e5abab8a8b86de57770420ac0cfff96a4b38..44f8beea726040a332c3c9002ea2f1fa0a1f9512 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 c6cd4956047c2f88c24ef5df0282193e885b6b3e..9f16c5178b662b8f9ec67f3dd7eafd6f4c89e39a 100644 (file)
@@ -76,6 +76,11 @@ STATUS - this attribute represents operating status (charging, full,
 discharging (i.e. powering a load), etc.). This corresponds to
 BATTERY_STATUS_* values, as defined in battery.h.
 
+CHARGE_TYPE - batteries can typically charge at different rates.
+This defines trickle and fast charges.  For batteries that
+are already charged or discharging, 'n/a' can be displayed (or
+'unknown', if the status is not known).
+
 HEALTH - represents health of the battery, values corresponds to
 POWER_SUPPLY_HEALTH_*, defined in battery.h.
 
@@ -108,6 +113,8 @@ relative, time-based measurements.
 ENERGY_FULL, ENERGY_EMPTY - same as above but for energy.
 
 CAPACITY - capacity in percents.
+CAPACITY_LEVEL - capacity level. This corresponds to
+POWER_SUPPLY_CAPACITY_LEVEL_*.
 
 TEMP - temperature of the power supply.
 TEMP_AMBIENT - ambient temperature.
diff --git a/Documentation/power/regulator/design.txt b/Documentation/power/regulator/design.txt
new file mode 100644 (file)
index 0000000..f9b56b7
--- /dev/null
@@ -0,0 +1,33 @@
+Regulator API design notes
+==========================
+
+This document provides a brief, partially structured, overview of some
+of the design considerations which impact the regulator API design.
+
+Safety
+------
+
+ - Errors in regulator configuration can have very serious consequences
+   for the system, potentially including lasting hardware damage.
+ - It is not possible to automatically determine the power confugration
+   of the system - software-equivalent variants of the same chip may
+   have different power requirments, and not all components with power
+   requirements are visible to software.
+
+  => The API should make no changes to the hardware state unless it has
+     specific knowledge that these changes are safe to do perform on
+     this particular system.
+
+Consumer use cases
+------------------
+
+ - The overwhelming majority of devices in a system will have no
+   requirement to do any runtime configuration of their power beyond
+   being able to turn it on or off.
+
+ - Many of the power supplies in the system will be shared between many
+   different consumers.
+
+  => The consumer API should be structured so that these use cases are
+     very easy to handle and so that consumers will work with shared
+     supplies without any additional effort.
index ce3487d99abedef8b3616740bc3a980d3607bdd3..63728fed620b7bacea9cdbb80b659a2105ed4173 100644 (file)
@@ -87,7 +87,7 @@ static struct platform_device regulator_devices[] = {
 },
 };
 /* register regulator 1 device */
-platform_device_register(&wm8350_regulator_devices[0]);
+platform_device_register(&regulator_devices[0]);
 
 /* register regulator 2 device */
-platform_device_register(&wm8350_regulator_devices[1]);
+platform_device_register(&regulator_devices[1]);
index 0cded696ca01cdc0ebb9a97deec4f80ede656809..ffd185bb60540f9e3332ffbe9a4c88bb611dce72 100644 (file)
@@ -29,7 +29,7 @@ Some terms used in this document:-
 
 
   o PMIC         - Power Management IC. An IC that contains numerous regulators
-                   and often contains other susbsystems.
+                   and often contains other subsystems.
 
 
   o Consumer     - Electronic device that is supplied power by a regulator.
@@ -168,4 +168,4 @@ relevant to non SoC devices and is split into the following four interfaces:-
       userspace via sysfs. This could be used to help monitor device power
       consumption and status.
 
-        See Documentation/ABI/testing/regulator-sysfs.txt
+        See Documentation/ABI/testing/sysfs-class-regulator
index 4200accb9bba981b0c582c6089a6a07fcc215fae..3f8b528f237e17626142dfba88f955dfee7a11b3 100644 (file)
@@ -10,8 +10,9 @@ Registration
 
 Drivers can register a regulator by calling :-
 
-struct regulator_dev *regulator_register(struct device *dev,
-       struct regulator_desc *regulator_desc);
+struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
+       struct device *dev, struct regulator_init_data *init_data,
+       void *driver_data);
 
 This will register the regulators capabilities and operations to the regulator
 core.
index 3ed3797b50865fb374f3c36c88b82e03367244da..8a0040738969a222ad1b77527fb053196aff537c 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 3708a2fd474735dda75a255830f9da8700983dfa..f1533d91953a9fe160145f58da488ef979492ac8 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 667c9bde8699a3eb8433a223579529d443378aaa..80152cb567d91941f9b91e79cb456dc6a16a9833 100644 (file)
@@ -1,18 +1,19 @@
-CFI or JEDEC memory-mapped NOR flash
+CFI or JEDEC memory-mapped NOR flash, MTD-RAM (NVRAM...)
 
 Flash chips (Memory Technology Devices) are often used for solid state
 file systems on embedded devices.
 
- - compatible : should contain the specific model of flash chip(s)
-   used, if known, followed by either "cfi-flash" or "jedec-flash"
- - reg : Address range(s) of the flash chip(s)
+ - compatible : should contain the specific model of mtd chip(s)
+   used, if known, followed by either "cfi-flash", "jedec-flash"
+   or "mtd-ram".
+ - reg : Address range(s) of the mtd chip(s)
    It's possible to (optionally) define multiple "reg" tuples so that
-   non-identical NOR chips can be described in one flash node.
- - bank-width : Width (in bytes) of the flash bank.  Equal to the
+   non-identical chips can be described in one node.
+ - bank-width : Width (in bytes) of the bank.  Equal to the
    device width times the number of interleaved chips.
- - device-width : (optional) Width of a single flash chip.  If
+ - device-width : (optional) Width of a single mtd chip.  If
    omitted, assumed to be equal to 'bank-width'.
- - #address-cells, #size-cells : Must be present if the flash has
+ - #address-cells, #size-cells : Must be present if the device has
    sub-nodes representing partitions (see below).  In this case
    both #address-cells and #size-cells must be equal to 1.
 
@@ -22,24 +23,24 @@ are defined:
  - vendor-id : Contains the flash chip's vendor id (1 byte).
  - device-id : Contains the flash chip's device id (1 byte).
 
-In addition to the information on the flash bank itself, the
+In addition to the information on the mtd bank itself, the
 device tree may optionally contain additional information
-describing partitions of the flash address space.  This can be
+describing partitions of the address space.  This can be
 used on platforms which have strong conventions about which
-portions of the flash are used for what purposes, but which don't
+portions of a flash are used for what purposes, but which don't
 use an on-flash partition table such as RedBoot.
 
-Each partition is represented as a sub-node of the flash device.
+Each partition is represented as a sub-node of the mtd device.
 Each node's name represents the name of the corresponding
-partition of the flash device.
+partition of the mtd device.
 
 Flash partitions
- - reg : The partition's offset and size within the flash bank.
- - label : (optional) The label / name for this flash partition.
+ - reg : The partition's offset and size within the mtd bank.
+ - label : (optional) The label / name for this partition.
    If omitted, the label is taken from the node name (excluding
    the unit address).
  - read-only : (optional) This parameter, if present, is a hint to
-   Linux that this flash partition should only be mounted
+   Linux that this partition should only be mounted
    read-only.  This is usually used for flash partitions
    containing early-boot firmware images or data which should not
    be clobbered.
@@ -78,3 +79,12 @@ Here an example with multiple "reg" tuples:
                        reg = <0 0x04000000>;
                };
        };
+
+An example using SRAM:
+
+       sram@2,0 {
+               compatible = "samsung,k6f1616u6a", "mtd-ram";
+               reg = <2 0 0x00200000>;
+               bank-width = <2>;
+       };
+
index 8deffcd68cb8d3fc2737279e780a28bee3726f57..9104c10620840fcc45c47938a1b96dea48309aa7 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 eaa4801f2ce6aecfb0f7c1b3ca5f91ceb58341fd..38e9e7cadc9029ecdd1df470746fd0b41cc734c2 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 d7f181701dc2fadd19695217558cdcf4a47ae534..aec6549ab0978833eafe552381f87b3b528dc2b3 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 97eebd63bedc453cc74e597e5873ec9adaeb1731..f1708b79f9637a39fe2926bd519bb562a789b8d3 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 4a02d2508bc8b951402bf9ab74411f16da1e1b52..deab51ddc33e1482d65df238568202572b6e3220 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 c1a5aad3c75a905d470725fc5795775227c4a4fd..10abd3773e49122aab0dfad27f7cb2c91b8d5d08 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 2dbff53369d0ea734b7a3c4c446d70d5297c8dc2..b3d8b492274052c8fbb538b1fba96c16a4d64cff 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 c4de6359d440e4dbf92d585e8a7e577d62d475c1..e6fb1ec2744b180d25bd41e6a672e5627dd8e971 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 78c45a87be57a3c0d8df08664adce439df47586d..02ac6ed38b2d0ba73c44298484b7d7bac540dae2 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 1b6292bbdd6dac91655057367681e1c733bf2a73..957b22fde2dfddac0bcf061d7af84259384f32f2 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/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 381b22ee7834bd2d7b0485570ea9a6caa0a5c587..c069b6884c779ffc855133f634cf6b640a81da00 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 6c3c625b7f30b260ceb5bf2363b63adced7c7d68..66f92d1194c11f54c175cc06c7bcf479078df719 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 05769cff100998a60ba991325f48f62fe80bc889..c8ded175796ea015a0daeb42416d8926c34f968c 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 2f77ced35df71550db59439efefad0a3045957d3..e57d6a9dd32bafca2a3d2122a8a3725f1c75d000 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 ea8714fcc3ad4882dba62d625d22e61ac0a3079f..82a7bd1800b2fba2a19aca1a69ac9c0a1274852c 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 0833f44ba16bf4b0a2c04f81dfffffb520f2bebb..3eda8ea00852ee7cbeb44ad39a17a74f0d73bcc4 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 df3227605d59bf594c3a962a7bf08d9e8d5097a9..92e729f4b676e39851a06760626915950a561035 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 65f6c19cb86575e7c43a4ecfabd61be11ccf720e..a750532ffcf8e36d8b5be5ce5324a13384546a7b 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 607b1a01606404a09085780c23614b8db435e451..f19802c0f4854653e5249889d12eb0859db028b8 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 751a307dc44ed4fba03d47c736f847e9dc43e3b4..7c1c0b05b298f069756c1dc119083e75f0e74a24 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,62 @@ 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 IXP4XX ARM ARCHITECTURE
+M:     Imre Kaloz <kaloz@openwrt.org>
+M:     Krzysztof Halasa <khc@pm.waw.pl>
+L:     linux-arm-kernel@lists.infradead.org
+S:     Maintained
+F:     arch/arm/mach-ixp4xx/
+
 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 +716,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 +727,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 +768,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 +798,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 +806,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 +902,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 +978,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 +1556,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 +2100,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 +2121,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 +2818,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 +2972,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 +3466,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 +3541,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 +3750,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 +3782,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 +3978,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
@@ -4025,8 +4056,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 +4198,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 +4211,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 +4458,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 +4488,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 +4563,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 +4662,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/
@@ -4646,6 +4676,18 @@ L:       linux-pci@vger.kernel.org
 S:     Supported
 F:     drivers/pci/hotplug/shpchp*
 
+SIMPLE FIRMWARE INTERFACE (SFI)
+P:     Len Brown
+M:     lenb@kernel.org
+L:     sfi-devel@simplefirmware.org
+W:     http://simplefirmware.org/
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6.git
+S:     Supported
+F:     arch/x86/kernel/*sfi*
+F:     drivers/sfi/
+F:     include/linux/sfi*.h
+
+
 SIMTEC EB110ATX (Chalice CATS)
 P:     Ben Dooks
 M:     Vincent Sanders <support@simtec.co.uk>
@@ -5046,6 +5088,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
@@ -5638,6 +5685,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
@@ -5657,8 +5710,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 9fb8aae5c3916d4450ecc0affac8ba153f71fe29..443448154f32e9c7143ca759fe32ee475f9e818e 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 ef1838230291190f6fcdb2e151919594b738edc1..9d0727d18aeeb82f6a1920f0ba3fc2bb1775e5cc 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 88971460fa6ce33b7bdda339951f0ae83e5846a2..242c09ba98c452d86308bbd1144035d05ca8e97a 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 90d7c35d286703a86a4f1c59061b2212b2de367d..99c56d47879dfe52645604d55a4c32ce230e255a 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 bfb880af959d4d39c4ed335cc4afb3326fcc989a..d15aedfe60661a5dc83b8292e959d23f2d4b8ac0 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 b04e2cbf23a445cb441839a415f204e49665830e..5d0826654c61c78388914ca36d41176a48dc9e9d 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 af71d38c8e412295bdd85e7f323cf9391e517ec5..a0902c20d6778edce8dd57deccd70ec7c54a36b8 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 0eab55749423f2a9e8df8fade6a890efa6c0f480..10b403554b6530bf582e9bbf7895b8e91aac272f 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 7350557a81e0b7067f05130e747b9d342474f734..54661125a8bfff2b69a1daee5d6de3ae5ebd1395 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 672f6db06a52d00bd3aac41b1cd9aa2e1b0b19ad..a1657b73683fb0ab56f53a522ce89c7a73ef1658 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 9bb45b932f048959a1cf5452ed4c38e0d8fe4f6e..600cb270f2bfee936c42448826c37b4678e02156 100644 (file)
@@ -498,7 +498,7 @@ CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_DOC2001PLUS is not set
 CONFIG_MTD_NAND=y
 CONFIG_MTD_NAND_VERIFY_WRITE=y
-# CONFIG_MTD_NAND_ECC_SMC is not set
+CONFIG_MTD_NAND_ECC_SMC=y
 # CONFIG_MTD_NAND_MUSEUM_IDS is not set
 # CONFIG_MTD_NAND_GPIO is not set
 CONFIG_MTD_NAND_IDS=y
index 51c0fa8897cd87ef0abcf0fcef46803dbcca061b..357d4021e2d0f50602c0545b8a63ee74e40257ca 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 9a510eab75a6066498f7e1b690ae07ffce2d2f84..8a4a7e2ba87b8d7136810fbd4fce6482a3b2f1ed 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 679a4a3e265e8222f91c67a17ab58d838a1dddb0..b9c48919a68c95e0ed0d47b085d75b6890172255 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 fc26976d8e3a7090716e8f5624bee962ebcb283a..8eebf89f5ab17884a98543f3b37a3b710355083b 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 a24d824c428b3cf1e3aa45c31a7f53f8bb9a7d2d..e35d54d43e709d52a3d025165c17cee01da8fc69 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 a6ed015d82edc9822f92a57a72ead4cf22760095..ada440aab0c5ab2a7597733ac529e26aea5c0c32 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 ee4ea0e720cf14239dedbece059d24c9c20c0f54..07eb7b07e442a69c9499b71cf49387f6ecd240e6 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 61e52b66bc72ed218ccb6af5009da3c6086ef462..50667bed7cc9f7eb1381b39802afb4b825aa1920 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 d3ba29c5d8c83722b7276b7d98ed51cfecfac4a7..02138af631e7e21a4c985f8f7a8c17428f0e944c 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 9ba7ba2cc3b168f0c8b205b411fa5f8842d1cf8f..8c0b71c95be46f4e1dbda7cbb81b6c9681ecf349 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 4cff9a7e61d2d70b8af645e11bc38df30bfdd72a..664938e8f6611857c8007251f495a1426375fe26 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 93a0f8b100eb24e725326cc0cb1f497526d6224d..ba9d501b5c50a83166ba7f2ed8f53f4681a64125 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 f9b19993a7a95e488109f985d4a3e4e90a5f0c86..c4c8865d52d7bfd84f5a22416ef7fe6bc1c472aa 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 1bf7bd4cbe13cbe622000bccdcfe99e91f7f4e4f..26f1aa6049afac276630a7ae4c17c6d39a36fa17 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 ca470d504ea09ecb5fdef59ba50625290ef088a3..29cf83177484dff44dfc9b126146894e6204b783 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 9d07679efce701d3528aef0abc15a184a827fdbc..94ffb5c103b9c74a2a5b3cdb4936cc13b898de07 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 d13304c0bc45eff75eabe5bb9310cf724bfcd74c..905d6ef768078dd4e75f0ac2058c267091161315 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 d96405b7d5785908dd6d438b4a32b98c95c40825..b6a3480383e58b19580417c705203637e7615438 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 13f27a4b882d10aef10df715f8f846dd06920d4d..583f38a38df708862c8cada64d743ed2c6dd4959 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 3dd0e2a23095c8c6b57ed493baf5e2655c7a6d63..dda19cd76194fd4334785dea7af869713d6db467 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 16b92c37ec99a7107ec29ef51103a67ba0c4c191..f7ebed942f662fda227c002a4998091f02616de4 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 ea78e908fc82cecc9bf7c32ccbf2fe597785bf2e..0fbf87b163385296ee932644d54a6875cfd7bdc3 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 5f5fa6574d342c28eacf06dde9a4550575358a46..01a0f0838e5b3d012a1c7aa1e94e4a70011464ae 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 5083f03e9b5e09c33f873ec8fcd54554003c2675..cfd52fb341cb0545558006cf806df799cbdc379f 100644 (file)
@@ -41,8 +41,8 @@
 #include <asm/mach/irq.h>
 #include <asm/mach/time.h>
 
-static int __init ixp4xx_clocksource_init(void);
-static int __init ixp4xx_clockevent_init(void);
+static void __init ixp4xx_clocksource_init(void);
+static void __init ixp4xx_clockevent_init(void);
 static struct clock_event_device clockevent_ixp4xx;
 
 /*************************************************************************
@@ -267,7 +267,7 @@ void __init ixp4xx_init_irq(void)
 
 static irqreturn_t ixp4xx_timer_interrupt(int irq, void *dev_id)
 {
-       struct clock_event_device *evt = &clockevent_ixp4xx;
+       struct clock_event_device *evt = dev_id;
 
        /* Clear Pending Interrupt by writing '1' to it */
        *IXP4XX_OSST = IXP4XX_OSST_TIMER_1_PEND;
@@ -281,6 +281,7 @@ static struct irqaction ixp4xx_timer_irq = {
        .name           = "timer1",
        .flags          = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,
        .handler        = ixp4xx_timer_interrupt,
+       .dev_id         = &clockevent_ixp4xx,
 };
 
 void __init ixp4xx_timer_init(void)
@@ -401,7 +402,7 @@ void __init ixp4xx_sys_init(void)
 /*
  * clocksource
  */
-cycle_t ixp4xx_get_cycles(struct clocksource *cs)
+static cycle_t ixp4xx_get_cycles(struct clocksource *cs)
 {
        return *IXP4XX_OSTS;
 }
@@ -417,14 +418,12 @@ static struct clocksource clocksource_ixp4xx = {
 
 unsigned long ixp4xx_timer_freq = FREQ;
 EXPORT_SYMBOL(ixp4xx_timer_freq);
-static int __init ixp4xx_clocksource_init(void)
+static void __init ixp4xx_clocksource_init(void)
 {
        clocksource_ixp4xx.mult =
                clocksource_hz2mult(ixp4xx_timer_freq,
                                    clocksource_ixp4xx.shift);
        clocksource_register(&clocksource_ixp4xx);
-
-       return 0;
 }
 
 /*
@@ -480,7 +479,7 @@ static struct clock_event_device clockevent_ixp4xx = {
        .set_next_event = ixp4xx_set_next_event,
 };
 
-static int __init ixp4xx_clockevent_init(void)
+static void __init ixp4xx_clockevent_init(void)
 {
        clockevent_ixp4xx.mult = div_sc(FREQ, NSEC_PER_SEC,
                                        clockevent_ixp4xx.shift);
@@ -491,5 +490,4 @@ static int __init ixp4xx_clockevent_init(void)
        clockevent_ixp4xx.cpumask = cpumask_of(0);
 
        clockevents_register_device(&clockevent_ixp4xx);
-       return 0;
 }
index d2aa26f5acd7cd8b2173c84d1ab9e210d189e828..54c0af7fa2d42296cb393c9d84456c22c3597480 100644 (file)
 
 static inline void arch_idle(void)
 {
+       /* ixp4xx does not implement the XScale PWRMODE register,
+        * so it must not call cpu_do_idle() here.
+        */
 #if 0
-       if (!hlt_counter)
-               cpu_do_idle(0);
+       cpu_do_idle();
 #endif
 }
 
index 79bdea943eb4bcc1299f2fd68a887c1d01f111fd..6bfd537d5afbeba3f4518c5381f3711cac5d9311 100644 (file)
 #include <linux/amba/bus.h>
 #include <linux/interrupt.h>
 #include <linux/gpio.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/nand.h>
+#include <linux/mtd/partitions.h>
+#include <linux/io.h>
+#include <asm/sizes.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/irq.h>
+#include <asm/mach/flash.h>
 #include <mach/setup.h>
+#include <mach/nand.h>
+#include <mach/fsmc.h>
 #include "clock.h"
 
+/* These adresses span 16MB, so use three individual pages */
+static struct resource nhk8815_nand_resources[] = {
+       {
+               .name = "nand_addr",
+               .start = NAND_IO_ADDR,
+               .end = NAND_IO_ADDR + 0xfff,
+               .flags = IORESOURCE_MEM,
+       }, {
+               .name = "nand_cmd",
+               .start = NAND_IO_CMD,
+               .end = NAND_IO_CMD + 0xfff,
+               .flags = IORESOURCE_MEM,
+       }, {
+               .name = "nand_data",
+               .start = NAND_IO_DATA,
+               .end = NAND_IO_DATA + 0xfff,
+               .flags = IORESOURCE_MEM,
+       }
+};
+
+static int nhk8815_nand_init(void)
+{
+       /* FSMC setup for nand chip select (8-bit nand in 8815NHK) */
+       writel(0x0000000E, FSMC_PCR(0));
+       writel(0x000D0A00, FSMC_PMEM(0));
+       writel(0x00100A00, FSMC_PATT(0));
+
+       /* enable access to the chip select area */
+       writel(readl(FSMC_PCR(0)) | 0x04, FSMC_PCR(0));
+
+       return 0;
+}
+
+/*
+ * These partitions are the same as those used in the 2.6.20 release
+ * shipped by the vendor; the first two partitions are mandated
+ * by the boot ROM, and the bootloader area is somehow oversized...
+ */
+static struct mtd_partition nhk8815_partitions[] = {
+       {
+               .name   = "X-Loader(NAND)",
+               .offset = 0,
+               .size   = SZ_256K,
+       }, {
+               .name   = "MemInit(NAND)",
+               .offset = MTDPART_OFS_APPEND,
+               .size   = SZ_256K,
+       }, {
+               .name   = "BootLoader(NAND)",
+               .offset = MTDPART_OFS_APPEND,
+               .size   = SZ_2M,
+       }, {
+               .name   = "Kernel zImage(NAND)",
+               .offset = MTDPART_OFS_APPEND,
+               .size   = 3 * SZ_1M,
+       }, {
+               .name   = "Root Filesystem(NAND)",
+               .offset = MTDPART_OFS_APPEND,
+               .size   = 22 * SZ_1M,
+       }, {
+               .name   = "User Filesystem(NAND)",
+               .offset = MTDPART_OFS_APPEND,
+               .size   = MTDPART_SIZ_FULL,
+       }
+};
+
+static struct nomadik_nand_platform_data nhk8815_nand_data = {
+       .parts          = nhk8815_partitions,
+       .nparts         = ARRAY_SIZE(nhk8815_partitions),
+       .options        = NAND_COPYBACK | NAND_CACHEPRG | NAND_NO_PADDING \
+                       | NAND_NO_READRDY | NAND_NO_AUTOINCR,
+       .init           = nhk8815_nand_init,
+};
+
+static struct platform_device nhk8815_nand_device = {
+       .name           = "nomadik_nand",
+       .dev            = {
+               .platform_data = &nhk8815_nand_data,
+       },
+       .resource       = nhk8815_nand_resources,
+       .num_resources  = ARRAY_SIZE(nhk8815_nand_resources),
+};
+
+/* These are the partitions for the OneNand device, different from above */
+static struct mtd_partition nhk8815_onenand_partitions[] = {
+       {
+               .name   = "X-Loader(OneNAND)",
+               .offset = 0,
+               .size   = SZ_256K,
+       }, {
+               .name   = "MemInit(OneNAND)",
+               .offset = MTDPART_OFS_APPEND,
+               .size   = SZ_256K,
+       }, {
+               .name   = "BootLoader(OneNAND)",
+               .offset = MTDPART_OFS_APPEND,
+               .size   = SZ_2M-SZ_256K,
+       }, {
+               .name   = "SysImage(OneNAND)",
+               .offset = MTDPART_OFS_APPEND,
+               .size   = 4 * SZ_1M,
+       }, {
+               .name   = "Root Filesystem(OneNAND)",
+               .offset = MTDPART_OFS_APPEND,
+               .size   = 22 * SZ_1M,
+       }, {
+               .name   = "User Filesystem(OneNAND)",
+               .offset = MTDPART_OFS_APPEND,
+               .size   = MTDPART_SIZ_FULL,
+       }
+};
+
+static struct flash_platform_data nhk8815_onenand_data = {
+       .parts          = nhk8815_onenand_partitions,
+       .nr_parts       = ARRAY_SIZE(nhk8815_onenand_partitions),
+};
+
+static struct resource nhk8815_onenand_resource[] = {
+       {
+               .start          = 0x30000000,
+               .end            = 0x30000000 + SZ_128K - 1,
+               .flags          = IORESOURCE_MEM,
+       },
+};
+
+static struct platform_device nhk8815_onenand_device = {
+       .name           = "onenand",
+       .id             = -1,
+       .dev            = {
+               .platform_data  = &nhk8815_onenand_data,
+       },
+       .resource       = nhk8815_onenand_resource,
+       .num_resources  = ARRAY_SIZE(nhk8815_onenand_resource),
+};
+
+static void __init nhk8815_onenand_init(void)
+{
+#ifdef CONFIG_ONENAND
+       /* Set up SMCS0 for OneNand */
+       writel(0x000030db, FSMC_BCR0);
+       writel(0x02100551, FSMC_BTR0);
+#endif
+}
+
 #define __MEM_4K_RESOURCE(x) \
        .res = {.start = (x), .end = (x) + SZ_4K - 1, .flags = IORESOURCE_MEM}
 
@@ -81,6 +233,8 @@ static int __init nhk8815_eth_init(void)
 device_initcall(nhk8815_eth_init);
 
 static struct platform_device *nhk8815_platform_devices[] __initdata = {
+       &nhk8815_nand_device,
+       &nhk8815_onenand_device,
        &nhk8815_eth_device,
        /* will add more devices */
 };
@@ -90,6 +244,7 @@ static void __init nhk8815_platform_init(void)
        int i;
 
        cpu8815_platform_init();
+       nhk8815_onenand_init();
        platform_add_devices(nhk8815_platform_devices,
                             ARRAY_SIZE(nhk8815_platform_devices));
 
diff --git a/arch/arm/mach-nomadik/include/mach/fsmc.h b/arch/arm/mach-nomadik/include/mach/fsmc.h
new file mode 100644 (file)
index 0000000..8c2c051
--- /dev/null
@@ -0,0 +1,29 @@
+
+/* Definitions for the Nomadik FSMC "Flexible Static Memory controller" */
+
+#ifndef __ASM_ARCH_FSMC_H
+#define __ASM_ARCH_FSMC_H
+
+#include <mach/hardware.h>
+/*
+ * Register list
+ */
+
+/* bus control reg. and bus timing reg. for CS0..CS3 */
+#define FSMC_BCR(x)     (NOMADIK_FSMC_VA + (x << 3))
+#define FSMC_BTR(x)     (NOMADIK_FSMC_VA + (x << 3) + 0x04)
+
+/* PC-card and NAND:
+ * PCR = control register
+ * PMEM = memory timing
+ * PATT = attribute timing
+ * PIO = I/O timing
+ * PECCR = ECC result
+ */
+#define FSMC_PCR(x)     (NOMADIK_FSMC_VA + ((2 + x) << 5) + 0x00)
+#define FSMC_PMEM(x)    (NOMADIK_FSMC_VA + ((2 + x) << 5) + 0x08)
+#define FSMC_PATT(x)    (NOMADIK_FSMC_VA + ((2 + x) << 5) + 0x0c)
+#define FSMC_PIO(x)     (NOMADIK_FSMC_VA + ((2 + x) << 5) + 0x10)
+#define FSMC_PECCR(x)   (NOMADIK_FSMC_VA + ((2 + x) << 5) + 0x14)
+
+#endif /* __ASM_ARCH_FSMC_H */
diff --git a/arch/arm/mach-nomadik/include/mach/nand.h b/arch/arm/mach-nomadik/include/mach/nand.h
new file mode 100644 (file)
index 0000000..c3c8254
--- /dev/null
@@ -0,0 +1,16 @@
+#ifndef __ASM_ARCH_NAND_H
+#define __ASM_ARCH_NAND_H
+
+struct nomadik_nand_platform_data {
+       struct mtd_partition *parts;
+       int nparts;
+       int options;
+       int (*init) (void);
+       int (*exit) (void);
+};
+
+#define NAND_IO_DATA   0x40000000
+#define NAND_IO_CMD    0x40800000
+#define NAND_IO_ADDR   0x41000000
+
+#endif                         /* __ASM_ARCH_NAND_H */
index 7a2b54c7291acb6b910d3dfed15f54811b8c7df5..a1132288c7015bbcaf51b0764968f9a29a72b449 100644 (file)
@@ -87,7 +87,7 @@ static struct mtd_partition apollon_partitions[] = {
        },
 };
 
-static struct flash_platform_data apollon_flash_data = {
+static struct onenand_platform_data apollon_flash_data = {
        .parts          = apollon_partitions,
        .nr_parts       = ARRAY_SIZE(apollon_partitions),
 };
@@ -99,7 +99,7 @@ static struct resource apollon_flash_resource[] = {
 };
 
 static struct platform_device apollon_onenand_device = {
-       .name           = "onenand",
+       .name           = "onenand-flash",
        .id             = -1,
        .dev            = {
                .platform_data  = &apollon_flash_data,
index e70baa79901860d7b61b3ebec4ad02bfee45fe77..e6e8290b7828613fd631abd6556f531f2c27852e 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 a2e915639b7222851b7c80e054e7da42aee6078f..bcfcfc7fdb9bffe60d95a8865498cf72c7b5f0f3 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 f91934b2b092dc7ca199f853de520637baa32d08..15876828db23b05abd24c4ab36eac7e6c9040a7d 100644 (file)
 #define GPMC_CHUNK_SHIFT       24              /* 16 MB */
 #define GPMC_SECTION_SHIFT     28              /* 128 MB */
 
+#define PREFETCH_FIFOTHRESHOLD (0x40 << 8)
+#define CS_NUM_SHIFT           24
+#define ENABLE_PREFETCH                (0x1 << 7)
+#define DMA_MPU_MODE           2
+
 static struct resource gpmc_mem_root;
 static struct resource gpmc_cs_mem[GPMC_CS_NUM];
 static DEFINE_SPINLOCK(gpmc_mem_lock);
@@ -386,6 +391,63 @@ void gpmc_cs_free(int cs)
 }
 EXPORT_SYMBOL(gpmc_cs_free);
 
+/**
+ * gpmc_prefetch_enable - configures and starts prefetch transfer
+ * @cs: nand cs (chip select) number
+ * @dma_mode: dma mode enable (1) or disable (0)
+ * @u32_count: number of bytes to be transferred
+ * @is_write: prefetch read(0) or write post(1) mode
+ */
+int gpmc_prefetch_enable(int cs, int dma_mode,
+                               unsigned int u32_count, int is_write)
+{
+       uint32_t prefetch_config1;
+
+       if (!(gpmc_read_reg(GPMC_PREFETCH_CONTROL))) {
+               /* Set the amount of bytes to be prefetched */
+               gpmc_write_reg(GPMC_PREFETCH_CONFIG2, u32_count);
+
+               /* Set dma/mpu mode, the prefetch read / post write and
+                * enable the engine. Set which cs is has requested for.
+                */
+               prefetch_config1 = ((cs << CS_NUM_SHIFT) |
+                                       PREFETCH_FIFOTHRESHOLD |
+                                       ENABLE_PREFETCH |
+                                       (dma_mode << DMA_MPU_MODE) |
+                                       (0x1 & is_write));
+               gpmc_write_reg(GPMC_PREFETCH_CONFIG1, prefetch_config1);
+       } else {
+               return -EBUSY;
+       }
+       /*  Start the prefetch engine */
+       gpmc_write_reg(GPMC_PREFETCH_CONTROL, 0x1);
+
+       return 0;
+}
+EXPORT_SYMBOL(gpmc_prefetch_enable);
+
+/**
+ * gpmc_prefetch_reset - disables and stops the prefetch engine
+ */
+void gpmc_prefetch_reset(void)
+{
+       /* Stop the PFPW engine */
+       gpmc_write_reg(GPMC_PREFETCH_CONTROL, 0x0);
+
+       /* Reset/disable the PFPW engine */
+       gpmc_write_reg(GPMC_PREFETCH_CONFIG1, 0x0);
+}
+EXPORT_SYMBOL(gpmc_prefetch_reset);
+
+/**
+ * gpmc_prefetch_status - reads prefetch status of engine
+ */
+int  gpmc_prefetch_status(void)
+{
+       return gpmc_read_reg(GPMC_PREFETCH_STATUS);
+}
+EXPORT_SYMBOL(gpmc_prefetch_status);
+
 static void __init gpmc_mem_init(void)
 {
        int cs;
@@ -452,6 +514,5 @@ void __init gpmc_init(void)
        l &= 0x03 << 3;
        l |= (0x02 << 3) | (1 << 0);
        gpmc_write_reg(GPMC_SYSCONFIG, l);
-
        gpmc_mem_init();
 }
index 3c04c2f1b23ff2faae92630600f7c20a4ed2b57b..c9c59a2db4e2f27e4d495160b0c4314bc0f01105 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 3807c45c9a6ca4d8dc0a4534da1276af8a069ce3..a47e68563fb64e3085b734fd57f5ccf9b75caca5 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 ea36186f32c385fb50bfd4df6c3735aa82360cfb..f982606d7bf91f5b5cf98beb7e4be4e1b8bec555 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 921b16532ff55c4e28301cb5bcce975de546a70b..9c99cda77ba6383c7f3bcd74a9986117de23fcca 100644 (file)
@@ -103,6 +103,10 @@ extern int gpmc_cs_request(int cs, unsigned long size, unsigned long *base);
 extern void gpmc_cs_free(int cs);
 extern int gpmc_cs_set_reserved(int cs, int reserved);
 extern int gpmc_cs_reserved(int cs);
+extern int gpmc_prefetch_enable(int cs, int dma_mode,
+                                       unsigned int u32_count, int is_write);
+extern void gpmc_prefetch_reset(void);
+extern int gpmc_prefetch_status(void);
 extern void __init gpmc_init(void);
 
 #endif
index fb7cb7723990082141de476990b7619741ec65d1..28a165058b61d961a06d98488dbd43fdb60cb5bc 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 f8fbc4801e5256ee9d4424cc4fc5a2dd34547811..8e52c6572281792cdb703b2f9ea60c70dbd56559 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 81d5b36534b340680ffc36fde156e9cafbb70e2d..7229b959330171d72bf478df7f4f1146eb6a97ab 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 7b74d1255e0b93c7531e607a77188a148bda980b..b226bdf45739f6ef5b1f82812dbefbd7c67eda13 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 9a92b15f6a66c19eeae0c9c42ecc964447608268..8eebf89f5ab17884a98543f3b37a3b710355083b 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 e819fa69a90ea3d03e3aabae8b8009fe863009a7..376f18c4a6cb90370ded166c29eaa614d3fcf108 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 e7fd0ecd73f75de4d2a7df13b85a5049e046b7aa..ae4dae1e370b150a3df989bd2fd403a6e8e5ba24 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 bdc330cd0e1c3e41354433f2a556627058e0bceb..1c58914a87406e50f60f14918d35363058b78528 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 b7f0afba3ce052c515972d9c28d17ec264057243..8eebf89f5ab17884a98543f3b37a3b710355083b 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 514f46a4b2303baef15045e55fb218b8b1834c28..ff68b9f516a17f9fd2a5ace9b3abd263efb14ca0 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 24f9738670bd44b94ed916e8cbe82dfbbc74233c..2da716407ff29d73de0598f287ed3730142e3fe7 100644 (file)
@@ -90,7 +90,6 @@ extern void gdbstub_do_rx(void);
 extern asmlinkage void __debug_stub_init_break(void);
 extern asmlinkage void __break_hijack_kernel_event(void);
 extern asmlinkage void __break_hijack_kernel_event_breaks_here(void);
-extern asmlinkage void start_kernel(void);
 
 extern asmlinkage void gdbstub_rx_handler(void);
 extern asmlinkage void gdbstub_rx_irq(void);
index fc47515822a2d9da8bd43ab2864d8638a6fa7c87..5fc8b6f5bc55ccdc3934acf5e416f1d84ce52a35 100644 (file)
 #ifndef __ASM_HARDIRQ_H
 #define __ASM_HARDIRQ_H
 
-#include <linux/threads.h>
-#include <linux/irq.h>
-
-typedef struct {
-       unsigned int __softirq_pending;
-       unsigned long idle_timestamp;
-} ____cacheline_aligned irq_cpustat_t;
-
-#include <linux/irq_cpustat.h> /* Standard mappings for irq_cpustat_t above */
-
-#ifdef CONFIG_SMP
-#error SMP not available on FR-V
-#endif /* CONFIG_SMP */
+#include <asm/atomic.h>
 
 extern atomic_t irq_err_count;
 static inline void ack_bad_irq(int irq)
 {
        atomic_inc(&irq_err_count);
 }
+#define ack_bad_irq ack_bad_irq
+
+#include <asm-generic/hardirq.h>
 
 #endif
index 58c1d11e2ac71fe225f7e2a05137d80e53dbc32a..8eebf89f5ab17884a98543f3b37a3b710355083b 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>
index 2f6c60c921e0d4a4c20e8f23a7a71cb726d69598..2845139c8077d3208d8041c974eeb1bd2be844f4 100644 (file)
@@ -15,6 +15,7 @@
 #include <linux/sched.h>
 #include <linux/init.h>
 #include <linux/serial_reg.h>
+#include <linux/start_kernel.h>
 
 #include <asm/system.h>
 #include <asm/serial-regs.h>
index 0de50df7497036e52602c2bcfc5a0a0753f6b534..904255938216520e1e5661cb21e1765796efbb71 100644 (file)
@@ -83,13 +83,9 @@ void (*idle)(void) = core_sleep_idle;
  */
 void cpu_idle(void)
 {
-       int cpu = smp_processor_id();
-
        /* endless idle loop with no priority at all */
        while (1) {
                while (!need_resched()) {
-                       irq_stat[cpu].idle_timestamp = jiffies;
-
                        check_pgt_cache();
 
                        if (!frv_dma_inprogress && idle)
index 0e10ad8dc462dfa57b9e0ff0f9e5059df7605398..0c4fb204911b9147180d944f03776e80c3abd5d4 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)
index 9d7f7a7462b26936d6263fb5455553c3ba96945a..c2e1aa0f0d14441c05a4e9846ac5ef09254c3f84 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 cf35f0a6f12eee77729b51551f7a87bb3aeba477..8eebf89f5ab17884a98543f3b37a3b710355083b 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 74f8dd7b34d2f4be2d44f1922bda2760e200597c..5c913d472119dadf9c3fad5749223901ec3a0fd7 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 e7c6e614a758b6ea05380d393476a49b82ea8bc0..2193a2e2859af4fac6a33a9ba3e509416c64227d 100644 (file)
@@ -7,7 +7,6 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/errno.h>
 #include <linux/sched.h>
 #include <linux/kernel.h>
index 011a1cdf0eb53d4c97c39427bd1f0461690a6e79..6851e52ed5a23d924d3d536460e209092fd8d049 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 8cfb001092ab0f79f0cf2c450c39ef5df77e3fd1..674a8374c6d9ec989616827a20cd1895dd5fbcbb 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 16ef61a91d95810de82668fa23eefbd2d993a25c..625ed8f76fce7905aeaff30626f0ae3a74661e8e 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 d20b998cb91d1eb4a4fa0d148eaf1a8dd4ae5c20..7fa8a859466017410a58e2f483721623cf1d6694 100644 (file)
@@ -30,6 +30,7 @@ typedef u64 cputime_t;
 typedef u64 cputime64_t;
 
 #define cputime_zero                   ((cputime_t)0)
+#define cputime_one_jiffy              jiffies_to_cputime(1)
 #define cputime_max                    ((~((cputime_t)0) >> 1) - 1)
 #define cputime_add(__a, __b)          ((__a) +  (__b))
 #define cputime_sub(__a, __b)          ((__a) -  (__b))
index 48cf8b98a0b47bbb5eb4ff2c58ea837c6e56e623..4459028e5aa814276233f8e3d38e4e6695ec2a70 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 223abb134105a814ca755933a7bc9e105c62eaf5..285aae8431c6278d08c6ff862a18fdf66b2e52bf 100644 (file)
@@ -46,7 +46,7 @@ void __init swiotlb_dma_init(void)
 
 void __init pci_swiotlb_init(void)
 {
-       if (!iommu_detected || iommu_pass_through) {
+       if (!iommu_detected) {
 #ifdef CONFIG_IA64_GENERIC
                swiotlb = 1;
                printk(KERN_INFO "PCI-DMA: Re-initialize machine vector.\n");
index b115b3bbf04a90a76b2248b001d1630dc4b30b20..1857766a63c1850d968320559471c22a851b6335 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 cabba332cc48322c99ee23eb1604ddd929f29d91..c41234f1b825509e5e83d5725739723f56ed76d7 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 cb8aa762f2351435932b45f28e38921b5957121b..4c31c0ae215e87928098a9b60e2d978ae710f800 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 04a5f40aa401c988b9799e7362c99db07f2189e5..8eebf89f5ab17884a98543f3b37a3b710355083b 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 98b8feb12ed899e6dba32d0532b981057d4f5a6e..98682bba0ed9c3aedf0bc86ee43ef68e20333fc4 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 2547d6c4a827c3096290a65de4a708fc0279fd20..655ea1c47a0f2efccb8d4f84c58d9c4284eb7138 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 cada3ba4b9902f23bb13620e726a2625897e5d8a..ba61c4c73202769f947c87ace55c3d8453b2f336 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 24d429f9358a5d96dd2c79f04332ccee40a67ae4..9f581df3952b5cb87fbae357f858003750fd9400 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 fb87c08c6b57b5ca5fa126d615c93768b8e0ce7c..29dd8489ffec5efb617a070df0e712c90ba3095a 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 394ee946015c4284eea9ee0f668e1851ccfdd38b..554f65b6cd3b38e7ba0575def0c56ce2083189e3 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 9f5c4c4b3c7b20d37a4184e6d76a6888358d4510..8eebf89f5ab17884a98543f3b37a3b710355083b 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 54d980795fc45ceeaa021ad4fa98bd77f4d65508..17dc2a31a7cacd9a7d84cbba948861baa1657172 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 0007b2adf3a3ebb85e1d1375f824f638e5c09ee0..774549accd2df34096528255822e61599af1a80b 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 f207f1a94dbcd0d627ca8ab94668dbf791fef847..1110784eb3f772b28efce57d8ea21ca79e2e9180 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 e4d6f1fb1cf765c5ca8e23c3e8438f39ebcc0e2d..a2250f390a292626e9fde6db8ab3edee41e9ea18 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 1a9f9b257551cdf7dcda29b2adce5dd0dfe69a86..d6eb6134abeca4f819427937c9ad3dee380d1360 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 38c79c55b060f3dcccfb4637f9eb33a44668b490..15aa1902a788b4d83fa74833d9ca73a60ff879f7 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 2db746a251f878d84e5cb659df72feed0c1691d8..1a55d61f0d0645a94e1344e8881943623a059e92 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 e5a6368559af900722d896049bd4a60e0a1db2fa..556cce9925488cfec6bbaf0fa86db325b1caff20 100644 (file)
@@ -109,7 +109,6 @@ extern asmlinkage int  gdbstub_intercept(struct pt_regs *, enum exception_code);
 extern asmlinkage void gdbstub_exception(struct pt_regs *, enum exception_code);
 extern asmlinkage void __gdbstub_bug_trap(void);
 extern asmlinkage void __gdbstub_pause(void);
-extern asmlinkage void start_kernel(void);
 
 #ifndef CONFIG_MN10300_CACHE_DISABLED
 extern asmlinkage void gdbstub_purge_cache(void);
index d04fac1da5aa80513f350afc18dd603fc0c0b4dd..8eebf89f5ab17884a98543f3b37a3b710355083b 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 82b40079ad765023310f7e015b6fa66680df616c..02dc7e461fef68e8c505cd4e8eea2ae12bbe2b01 100644 (file)
@@ -85,7 +85,7 @@ void foo(void)
        OFFSET(__rx_buffer,             mn10300_serial_port, rx_buffer);
        OFFSET(__rx_inp,                mn10300_serial_port, rx_inp);
        OFFSET(__rx_outp,               mn10300_serial_port, rx_outp);
-       OFFSET(__tx_info_buffer,        mn10300_serial_port, uart.info);
+       OFFSET(__uart_state,            mn10300_serial_port, uart.state);
        OFFSET(__tx_xchar,              mn10300_serial_port, tx_xchar);
        OFFSET(__tx_break,              mn10300_serial_port, tx_break);
        OFFSET(__intr_flags,            mn10300_serial_port, intr_flags);
index 2244853882283a1070e844e8a8ddc088af19e632..66702d256610cd765785b0b0495388dc8ddf0af3 100644 (file)
@@ -130,7 +130,7 @@ ENTRY(mn10300_serial_vdma_tx_handler)
        or      d2,d2
        bne     mnsc_vdma_tx_xchar
 
-       mov     (__tx_info_buffer,a3),a2 # get the uart_info struct for Tx
+       mov     (__uart_state,a3),a2    # see if the TTY Tx queue has anything in it
        mov     (__xmit_tail,a2),d3
        mov     (__xmit_head,a2),d2
        cmp     d3,d2
index 2fd59664d00ab1b60cd782ab31d4647a559387d6..229b710fc5d5a65c0c6ed20f269fbb60dc709e31 100644 (file)
@@ -391,7 +391,7 @@ static int mask_test_and_clear(volatile u8 *ptr, u8 mask)
 static void mn10300_serial_receive_interrupt(struct mn10300_serial_port *port)
 {
        struct uart_icount *icount = &port->uart.icount;
-       struct tty_struct *tty = port->uart.info->port.tty;
+       struct tty_struct *tty = port->uart.state->port.tty;
        unsigned ix;
        int count;
        u8 st, ch, push, status, overrun;
@@ -566,16 +566,16 @@ static void mn10300_serial_transmit_interrupt(struct mn10300_serial_port *port)
 {
        _enter("%s", port->name);
 
-       if (!port->uart.info || !port->uart.info->port.tty) {
+       if (!port->uart.state || !port->uart.state->port.tty) {
                mn10300_serial_dis_tx_intr(port);
                return;
        }
 
        if (uart_tx_stopped(&port->uart) ||
-           uart_circ_empty(&port->uart.info->xmit))
+           uart_circ_empty(&port->uart.state->xmit))
                mn10300_serial_dis_tx_intr(port);
 
-       if (uart_circ_chars_pending(&port->uart.info->xmit) < WAKEUP_CHARS)
+       if (uart_circ_chars_pending(&port->uart.state->xmit) < WAKEUP_CHARS)
                uart_write_wakeup(&port->uart);
 }
 
@@ -596,7 +596,7 @@ static void mn10300_serial_cts_changed(struct mn10300_serial_port *port, u8 st)
        *port->_control = ctr;
 
        uart_handle_cts_change(&port->uart, st & SC2STR_CTS);
-       wake_up_interruptible(&port->uart.info->delta_msr_wait);
+       wake_up_interruptible(&port->uart.state->port.delta_msr_wait);
 }
 
 /*
@@ -705,8 +705,8 @@ static void mn10300_serial_start_tx(struct uart_port *_port)
 
        _enter("%s{%lu}",
               port->name,
-              CIRC_CNT(&port->uart.info->xmit.head,
-                       &port->uart.info->xmit.tail,
+              CIRC_CNT(&port->uart.state->xmit.head,
+                       &port->uart.state->xmit.tail,
                        UART_XMIT_SIZE));
 
        /* kick the virtual DMA controller */
index 79890edfd67a6ce98389a009926c49243e2fb45d..3f24c298a3af1cb583f66a809598cfbbbdde6faa 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 8cee387a24fd95ab9a3d65ab0bd0f9f0fdbb5dc1..ec1420562dc7d5e2789a025fa246abf1a5608e61 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 defe752cc996011164ee1600bd04e67441561fed..9749c8afe83ae6a5c198e0bb8520d0ffa71656fa 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
index b0831d9e35cba677d153af1ac7efd0583fc618aa..d5aca31fddbb5a59e8d8100750167c12fb13f38c 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 f32c2811c6d9afa2cde60c2d8b3d77885cbf37a6..855782c5e5ecc4043329f6edfa50ccc6fea078c3 100644 (file)
                                reg = <0x2e000 0x1000>;
                                interrupts = <42 0x8>;
                                interrupt-parent = <&ipic>;
+                               sdhci,wp-inverted;
                                /* Filled in by U-Boot */
                                clock-frequency = <0>;
                        };
index 28e022ac41796fb83d057060d61c8728de4d238a..9e2264b100080b69e3a33e3d30b1ec33766ae3b9 100644 (file)
                                reg = <0x2e000 0x1000>;
                                interrupts = <42 0x8>;
                                interrupt-parent = <&ipic>;
+                               sdhci,wp-inverted;
                                /* Filled in by U-Boot */
                                clock-frequency = <111111111>;
                        };
index 3febc4e91b104b7c1d4426f9eb9e0aecdbaad3be..9a603695723be25eca0216d76f5bd077f6859585 100644 (file)
                                reg = <0x2e000 0x1000>;
                                interrupts = <42 0x8>;
                                interrupt-parent = <&ipic>;
+                               sdhci,wp-inverted;
                                clock-frequency = <133333333>;
                        };
                };
index f720ab9af30dcc474eb7c255b21b6ce1e08c02a5..f70cf6000839bee050e0808ccfdf65c5dc5d988c 100644 (file)
                                reg = <0x2e000 0x1000>;
                                interrupts = <42 0x8>;
                                interrupt-parent = <&ipic>;
+                               sdhci,wp-inverted;
                                /* Filled in by U-Boot */
                                clock-frequency = <0>;
                        };
index a11ead8214b4d699ef2e6e6740c19cbc08f4bb61..4e6a1a407bbd093bcf56cc553d0033c693b361bb 100644 (file)
                                reg = <0x2e000 0x1000>;
                                interrupts = <42 0x8>;
                                interrupt-parent = <&ipic>;
+                               sdhci,wp-inverted;
                                /* Filled in by U-Boot */
                                clock-frequency = <111111111>;
                        };
index 4fa221fd9bdc9d7f1236f08e61f1354517525904..645ec51cc6e1efe4579756acb727424e2dad20a6 100644 (file)
                                reg = <0x2e000 0x1000>;
                                interrupts = <42 0x8>;
                                interrupt-parent = <&ipic>;
+                               sdhci,wp-inverted;
                                /* Filled in by U-Boot */
                                clock-frequency = <0>;
                        };
index e35dfba587c8d33425d80eb940f0d63a3fe38ba2..72336d504528b284fd70e854b6141a55f38d68a1 100644 (file)
                                reg = <0x2e000 0x1000>;
                                interrupts = <42 0x8>;
                                interrupt-parent = <&ipic>;
+                               sdhci,wp-inverted;
                                /* Filled in by U-Boot */
                                clock-frequency = <111111111>;
                        };
index f42e623030eece0edb4a8f30c37db795c44f2395..fa19f3fe05ff95cf8a6b9e4e89c2d4d7dcbd7c57 100644 (file)
@@ -18,6 +18,9 @@
 
 #ifndef CONFIG_VIRT_CPU_ACCOUNTING
 #include <asm-generic/cputime.h>
+#ifdef __KERNEL__
+static inline void setup_cputime_one_jiffy(void) { }
+#endif
 #else
 
 #include <linux/types.h>
@@ -48,6 +51,11 @@ typedef u64 cputime64_t;
 
 #ifdef __KERNEL__
 
+/*
+ * One jiffy in timebase units computed during initialization
+ */
+extern cputime_t cputime_one_jiffy;
+
 /*
  * Convert cputime <-> jiffies
  */
@@ -89,6 +97,11 @@ static inline cputime_t jiffies_to_cputime(const unsigned long jif)
        return ct;
 }
 
+static inline void setup_cputime_one_jiffy(void)
+{
+       cputime_one_jiffy = jiffies_to_cputime(1);
+}
+
 static inline cputime64_t jiffies64_to_cputime64(const u64 jif)
 {
        cputime_t ct;
index 7b1c49811a2439cb195aa3d311da2e2493b612f9..d4a7f645c5db69155250a24e82a64c7974a49ec8 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 2499aaadaeb94de9e54d402dacc603a7e309ad96..3288ce3997e0d380e299575883ccf37588f72c96 100644 (file)
@@ -14,7 +14,7 @@
 
 #define MAX_HWEVENTS           8
 #define MAX_EVENT_ALTERNATIVES 8
-#define MAX_LIMITED_HWEVENTS   2
+#define MAX_LIMITED_HWCOUNTERS 2
 
 /*
  * This struct provides the constants and functions needed to
@@ -22,7 +22,7 @@
  */
 struct power_pmu {
        const char      *name;
-       int             n_event;
+       int             n_counter;
        int             max_alternatives;
        unsigned long   add_fields;
        unsigned long   test_adder;
index 197b7d958796687e6f045e6aa8f8b5397e8d7eca..bbcbae183e92fce861fd800bdfa3647dae8ff31e 100644 (file)
@@ -30,8 +30,8 @@ struct cpu_hw_events {
        u64 events[MAX_HWEVENTS];
        unsigned int flags[MAX_HWEVENTS];
        unsigned long mmcr[3];
-       struct perf_event *limited_event[MAX_LIMITED_HWEVENTS];
-       u8  limited_hwidx[MAX_LIMITED_HWEVENTS];
+       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];
@@ -253,7 +253,7 @@ static int power_check_constraints(struct cpu_hw_events *cpuhw,
        unsigned long addf = ppmu->add_fields;
        unsigned long tadd = ppmu->test_adder;
 
-       if (n_ev > ppmu->n_event)
+       if (n_ev > ppmu->n_counter)
                return -1;
 
        /* First see if the events will go on as-is */
@@ -426,7 +426,7 @@ static int is_limited_pmc(int pmcnum)
                && (pmcnum == 5 || pmcnum == 6);
 }
 
-static void freeze_limited_events(struct cpu_hw_events *cpuhw,
+static void freeze_limited_counters(struct cpu_hw_events *cpuhw,
                                    unsigned long pmc5, unsigned long pmc6)
 {
        struct perf_event *event;
@@ -434,7 +434,7 @@ static void freeze_limited_events(struct cpu_hw_events *cpuhw,
        int i;
 
        for (i = 0; i < cpuhw->n_limited; ++i) {
-               event = cpuhw->limited_event[i];
+               event = cpuhw->limited_counter[i];
                if (!event->hw.idx)
                        continue;
                val = (event->hw.idx == 5) ? pmc5 : pmc6;
@@ -445,7 +445,7 @@ static void freeze_limited_events(struct cpu_hw_events *cpuhw,
        }
 }
 
-static void thaw_limited_events(struct cpu_hw_events *cpuhw,
+static void thaw_limited_counters(struct cpu_hw_events *cpuhw,
                                  unsigned long pmc5, unsigned long pmc6)
 {
        struct perf_event *event;
@@ -453,7 +453,7 @@ static void thaw_limited_events(struct cpu_hw_events *cpuhw,
        int i;
 
        for (i = 0; i < cpuhw->n_limited; ++i) {
-               event = cpuhw->limited_event[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);
@@ -495,9 +495,9 @@ static void write_mmcr0(struct cpu_hw_events *cpuhw, unsigned long mmcr0)
                       "i" (SPRN_PMC5), "i" (SPRN_PMC6));
 
        if (mmcr0 & MMCR0_FC)
-               freeze_limited_events(cpuhw, pmc5, pmc6);
+               freeze_limited_counters(cpuhw, pmc5, pmc6);
        else
-               thaw_limited_events(cpuhw, pmc5, pmc6);
+               thaw_limited_counters(cpuhw, pmc5, pmc6);
 
        /*
         * Write the full MMCR0 including the event overflow interrupt
@@ -653,7 +653,7 @@ void hw_perf_enable(void)
                        continue;
                idx = hwc_index[i] + 1;
                if (is_limited_pmc(idx)) {
-                       cpuhw->limited_event[n_lim] = event;
+                       cpuhw->limited_counter[n_lim] = event;
                        cpuhw->limited_hwidx[n_lim] = idx;
                        ++n_lim;
                        continue;
@@ -702,7 +702,7 @@ static int collect_events(struct perf_event *group, int max_count,
                flags[n] = group->hw.event_base;
                events[n++] = group->hw.config;
        }
-       list_for_each_entry(event, &group->sibling_list, list_entry) {
+       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)
@@ -742,7 +742,7 @@ int hw_perf_group_sched_in(struct perf_event *group_leader,
                return 0;
        cpuhw = &__get_cpu_var(cpu_hw_events);
        n0 = cpuhw->n_events;
-       n = collect_events(group_leader, ppmu->n_event - n0,
+       n = collect_events(group_leader, ppmu->n_counter - n0,
                           &cpuhw->event[n0], &cpuhw->events[n0],
                           &cpuhw->flags[n0]);
        if (n < 0)
@@ -764,7 +764,7 @@ int hw_perf_group_sched_in(struct perf_event *group_leader,
        cpuctx->active_oncpu += n;
        n = 1;
        event_sched_in(group_leader, cpu);
-       list_for_each_entry(sub, &group_leader->sibling_list, list_entry) {
+       list_for_each_entry(sub, &group_leader->sibling_list, group_entry) {
                if (sub->state != PERF_EVENT_STATE_OFF) {
                        event_sched_in(sub, cpu);
                        ++n;
@@ -797,7 +797,7 @@ static int power_pmu_enable(struct perf_event *event)
         */
        cpuhw = &__get_cpu_var(cpu_hw_events);
        n0 = cpuhw->n_events;
-       if (n0 >= ppmu->n_event)
+       if (n0 >= ppmu->n_counter)
                goto out;
        cpuhw->event[n0] = event;
        cpuhw->events[n0] = event->hw.config;
@@ -848,11 +848,11 @@ static void power_pmu_disable(struct perf_event *event)
                }
        }
        for (i = 0; i < cpuhw->n_limited; ++i)
-               if (event == cpuhw->limited_event[i])
+               if (event == cpuhw->limited_counter[i])
                        break;
        if (i < cpuhw->n_limited) {
                while (++i < cpuhw->n_limited) {
-                       cpuhw->limited_event[i-1] = cpuhw->limited_event[i];
+                       cpuhw->limited_counter[i-1] = cpuhw->limited_counter[i];
                        cpuhw->limited_hwidx[i-1] = cpuhw->limited_hwidx[i];
                }
                --cpuhw->n_limited;
@@ -1078,7 +1078,7 @@ const struct pmu *hw_perf_event_init(struct perf_event *event)
         */
        n = 0;
        if (event->group_leader != event) {
-               n = collect_events(event->group_leader, ppmu->n_event - 1,
+               n = collect_events(event->group_leader, ppmu->n_counter - 1,
                                   ctrs, events, cflags);
                if (n < 0)
                        return ERR_PTR(-EINVAL);
@@ -1230,7 +1230,7 @@ static void perf_event_interrupt(struct pt_regs *regs)
        int nmi;
 
        if (cpuhw->n_limited)
-               freeze_limited_events(cpuhw, mfspr(SPRN_PMC5),
+               freeze_limited_counters(cpuhw, mfspr(SPRN_PMC5),
                                        mfspr(SPRN_PMC6));
 
        perf_read_regs(regs);
@@ -1260,7 +1260,7 @@ static void perf_event_interrupt(struct pt_regs *regs)
         * Any that we processed in the previous loop will not be negative.
         */
        if (!found) {
-               for (i = 0; i < ppmu->n_event; ++i) {
+               for (i = 0; i < ppmu->n_counter; ++i) {
                        if (is_limited_pmc(i + 1))
                                continue;
                        val = read_pmc(i + 1);
index 02fed27af7f64ed72cfad7ed344955721c3d546b..1d5570a1e456abdc1c651dee6c443b2852b00680 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 df45a7449a66bfcfb090714610d2bea3be2db739..92dc844299b65ff5b7d934b14e4e110a6d956547 100644 (file)
@@ -193,6 +193,8 @@ EXPORT_SYMBOL(__cputime_clockt_factor);
 DEFINE_PER_CPU(unsigned long, cputime_last_delta);
 DEFINE_PER_CPU(unsigned long, cputime_scaled_last_delta);
 
+cputime_t cputime_one_jiffy;
+
 static void calc_cputime_factors(void)
 {
        struct div_result res;
@@ -501,6 +503,7 @@ static int __init iSeries_tb_recal(void)
                                tb_to_xs = divres.result_low;
                                vdso_data->tb_ticks_per_sec = tb_ticks_per_sec;
                                vdso_data->tb_to_xs = tb_to_xs;
+                               setup_cputime_one_jiffy();
                        }
                        else {
                                printk( "Titan recalibrate: FAILED (difference > 4 percent)\n"
@@ -960,6 +963,7 @@ void __init time_init(void)
        tb_ticks_per_usec = ppc_tb_freq / 1000000;
        tb_to_us = mulhwu_scale_factor(ppc_tb_freq, 1000000);
        calc_cputime_factors();
+       setup_cputime_one_jiffy();
 
        /*
         * Calculate the length of each tick in ns.  It will not be
index acb74a17bbbfa1bc2a916a872e8296bcd71aa0c1..b4b167b336432f916a4f24f263ae27ce8d885e40 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 3ef5084b90ca0357b002a9eaf8f004b10a223db1..9ddcfb4dc139f058f31a8df44668221bc0e1227b 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 31582329cd6778e0f3dc0b058635ab4015c8d6ad..335c578b9cc324261a29a3a435036ef5178e9f96 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 579382c163a9cd40ca9381d3a0eaf345659ed664..59736317bf0e87a1193910340dd338fb5e75c2ff 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 24b30b6909c4918280f0a914dd63a90a4cf01bde..fc1b1c42b1dce10ff94a8491b788d7a51862350d 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 572771fd84636aaaece971daa9a6648005b862ca..9490157da62e06a066073db4b462890ff16f038c 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 eae51ef9af2441c2b12660ad786e3a318e567436..3631a4f277eb2ab8aaf02676d7124d6a2a430e44 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 a4779912a5caa4d45eacedd3b584d33a2537fafd..88f4ae787832a270053673b4f0ceb7e5fe1b62cf 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 4e91a2573cc42e78952985e0ad70d4bc2ece7434..ab4464486b7ae5bb86a310650f0312a692de67c0 100644 (file)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.30
-# Mon Jun 22 11:08:16 2009
+# Linux kernel version: 2.6.31
+# Tue Sep 22 17:43:13 2009
 #
 CONFIG_SCHED_MC=y
 CONFIG_MMU=y
@@ -24,6 +24,7 @@ CONFIG_PGSTE=y
 CONFIG_VIRT_CPU_ACCOUNTING=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_S390=y
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 CONFIG_CONSTRUCTORS=y
 
@@ -48,11 +49,12 @@ CONFIG_AUDIT=y
 #
 # RCU Subsystem
 #
-CONFIG_CLASSIC_RCU=y
-# CONFIG_TREE_RCU is not set
-# CONFIG_PREEMPT_RCU is not set
+CONFIG_TREE_RCU=y
+# CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_RCU_TRACE is not set
+CONFIG_RCU_FANOUT=64
+# CONFIG_RCU_FANOUT_EXACT is not set
 # CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_PREEMPT_RCU_TRACE is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=17
@@ -103,11 +105,12 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_AIO=y
-CONFIG_HAVE_PERF_COUNTERS=y
+CONFIG_HAVE_PERF_EVENTS=y
 
 #
-# Performance Counters
+# Kernel Performance Events And Counters
 #
+# CONFIG_PERF_EVENTS is not set
 # CONFIG_PERF_COUNTERS is not set
 CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_STRIP_ASM_SYMS is not set
@@ -116,7 +119,6 @@ CONFIG_SLAB=y
 # CONFIG_SLUB is not set
 # CONFIG_SLOB is not set
 # CONFIG_PROFILING is not set
-# CONFIG_MARKERS is not set
 CONFIG_HAVE_OPROFILE=y
 CONFIG_KPROBES=y
 CONFIG_HAVE_SYSCALL_WRAPPERS=y
@@ -176,6 +178,7 @@ CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_64BIT=y
+# CONFIG_KTIME_SCALAR is not set
 CONFIG_SMP=y
 CONFIG_NR_CPUS=32
 CONFIG_HOTPLUG_CPU=y
@@ -257,7 +260,6 @@ CONFIG_FORCE_MAX_ZONEORDER=9
 CONFIG_PFAULT=y
 # CONFIG_SHARED_KERNEL is not set
 # CONFIG_CMM is not set
-# CONFIG_PAGE_STATES is not set
 # CONFIG_APPLDATA_BASE is not set
 CONFIG_HZ_100=y
 # CONFIG_HZ_250 is not set
@@ -280,6 +282,7 @@ CONFIG_PM_SLEEP_SMP=y
 CONFIG_PM_SLEEP=y
 CONFIG_HIBERNATION=y
 CONFIG_PM_STD_PARTITION=""
+# CONFIG_PM_RUNTIME is not set
 CONFIG_NET=y
 
 #
@@ -394,6 +397,7 @@ CONFIG_IP_SCTP=m
 # CONFIG_SCTP_HMAC_NONE is not set
 # CONFIG_SCTP_HMAC_SHA1 is not set
 CONFIG_SCTP_HMAC_MD5=y
+# CONFIG_RDS is not set
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -487,6 +491,7 @@ CONFIG_CCW=y
 # Generic Driver Options
 #
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+# CONFIG_DEVTMPFS is not set
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
@@ -501,6 +506,7 @@ CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_LOOP=m
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
 CONFIG_BLK_DEV_NBD=m
+# CONFIG_BLK_DEV_OSD is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=4096
@@ -594,8 +600,11 @@ CONFIG_BLK_DEV_DM=y
 CONFIG_DM_CRYPT=y
 CONFIG_DM_SNAPSHOT=y
 CONFIG_DM_MIRROR=y
+# CONFIG_DM_LOG_USERSPACE is not set
 CONFIG_DM_ZERO=y
 CONFIG_DM_MULTIPATH=m
+# CONFIG_DM_MULTIPATH_QL is not set
+# CONFIG_DM_MULTIPATH_ST is not set
 # CONFIG_DM_DELAY is not set
 # CONFIG_DM_UEVENT is not set
 CONFIG_NETDEVICES=y
@@ -615,7 +624,6 @@ CONFIG_NET_ETHERNET=y
 # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
 # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
 # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
-# CONFIG_KS8842 is not set
 CONFIG_NETDEV_1000=y
 CONFIG_NETDEV_10000=y
 # CONFIG_TR is not set
@@ -678,6 +686,7 @@ CONFIG_SCLP_CONSOLE=y
 CONFIG_SCLP_VT220_TTY=y
 CONFIG_SCLP_VT220_CONSOLE=y
 CONFIG_SCLP_CPI=m
+CONFIG_SCLP_ASYNC=m
 CONFIG_S390_TAPE=m
 
 #
@@ -737,6 +746,7 @@ CONFIG_FS_POSIX_ACL=y
 # CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 # CONFIG_BTRFS_FS is not set
+# CONFIG_NILFS2_FS is not set
 CONFIG_FILE_LOCKING=y
 CONFIG_FSNOTIFY=y
 CONFIG_DNOTIFY=y
@@ -798,7 +808,6 @@ CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
 # CONFIG_EXOFS_FS is not set
-# CONFIG_NILFS2_FS is not set
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
@@ -885,11 +894,13 @@ CONFIG_DEBUG_MEMORY_INIT=y
 # CONFIG_DEBUG_LIST is not set
 # CONFIG_DEBUG_SG is not set
 # CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_RCU_CPU_STALL_DETECTOR is not set
 # CONFIG_KPROBES_SANITY_TEST is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
 # CONFIG_LKDTM is not set
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_LATENCYTOP is not set
@@ -979,11 +990,13 @@ CONFIG_CRYPTO_PCBC=m
 #
 CONFIG_CRYPTO_HMAC=m
 # CONFIG_CRYPTO_XCBC is not set
+CONFIG_CRYPTO_VMAC=m
 
 #
 # Digest
 #
 CONFIG_CRYPTO_CRC32C=m
+CONFIG_CRYPTO_GHASH=m
 # CONFIG_CRYPTO_MD4 is not set
 CONFIG_CRYPTO_MD5=m
 # CONFIG_CRYPTO_MICHAEL_MIC is not set
index bd9914b8948837e11e589288a174295ebb4a0999..341aff2687a5f7453781d3483462e1e4b9c2863a 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 7a3817a656df721a9e85f2104c7c0e374358b3ee..24b1244aadb9b632a5d605dababe7bff86f89893 100644 (file)
@@ -42,6 +42,7 @@ __div(unsigned long long n, unsigned int base)
 #endif /* __s390x__ */
 
 #define cputime_zero                   (0ULL)
+#define cputime_one_jiffy              jiffies_to_cputime(1)
 #define cputime_max                    ((~0UL >> 1) - 1)
 #define cputime_add(__a, __b)          ((__a) +  (__b))
 #define cputime_sub(__a, __b)          ((__a) -  (__b))
index 6bc9426a6fbf95b732d3d03a4c8397baa28ebd65..f2ef4b619ce1a7415966169b89b5cb3779b198ab 100644 (file)
@@ -86,6 +86,7 @@
 #define __LC_PGM_OLD_PSW               0x0150
 #define __LC_MCK_OLD_PSW               0x0160
 #define __LC_IO_OLD_PSW                        0x0170
+#define __LC_RESTART_PSW               0x01a0
 #define __LC_EXT_NEW_PSW               0x01b0
 #define __LC_SVC_NEW_PSW               0x01c0
 #define __LC_PGM_NEW_PSW               0x01d0
@@ -189,6 +190,14 @@ union save_area {
 #define SAVE_AREA_BASE SAVE_AREA_BASE_S390X
 #endif
 
+#ifndef __s390x__
+#define LC_ORDER 0
+#else
+#define LC_ORDER 1
+#endif
+
+#define LC_PAGES (1UL << LC_ORDER)
+
 struct _lowcore
 {
 #ifndef __s390x__
index f63fe7b431ed4ee8a967305cb129b6b0ad8b0314..4e9c8ae0a6375211d10119c8be241ac1543c68d0 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);
index cf8eed3fa7797f55c4d03a0f7e1466e22794274e..b42715458312d185e49f51cabfa7ac866cfa7bf9 100644 (file)
@@ -295,7 +295,7 @@ static inline void ATTRIB_NORET disabled_wait(unsigned long code)
                "       oi      0x384(1),0x10\n"/* fake protection bit */
                "       lpswe   0(%1)"
                : "=m" (ctl_buf)
-               : "a" (&dw_psw), "a" (&ctl_buf), "m" (dw_psw) : "cc", "0");
+               : "a" (&dw_psw), "a" (&ctl_buf), "m" (dw_psw) : "cc", "0", "1");
 #endif /* __s390x__ */
        while (1);
 }
index fa9905ce7d0b088bb5e0c1143d30bce03038af75..63e46433e81d2637d9c36670d023b9e2c95817be 100644 (file)
@@ -7,6 +7,7 @@
 #include <linux/sched.h>
 #include <linux/kbuild.h>
 #include <asm/vdso.h>
+#include <asm/sigp.h>
 
 int main(void)
 {
@@ -59,6 +60,10 @@ int main(void)
        DEFINE(CLOCK_REALTIME, CLOCK_REALTIME);
        DEFINE(CLOCK_MONOTONIC, CLOCK_MONOTONIC);
        DEFINE(CLOCK_REALTIME_RES, MONOTONIC_RES_NSEC);
-
+       /* constants for SIGP */
+       DEFINE(__SIGP_STOP, sigp_stop);
+       DEFINE(__SIGP_RESTART, sigp_restart);
+       DEFINE(__SIGP_SENSE, sigp_sense);
+       DEFINE(__SIGP_INITIAL_CPU_RESET, sigp_initial_cpu_reset);
        return 0;
 }
index 9ab188d67a3d872df26095cf15e530afaed2a31d..5519cb7451065595baddd0ef027ef6e5e1f64305 100644 (file)
@@ -443,66 +443,28 @@ sys32_rt_sigqueueinfo(int pid, int sig, compat_siginfo_t __user *uinfo)
  * sys32_execve() executes a new program after the asm stub has set
  * things up for us.  This should basically do what I want it to.
  */
-asmlinkage long sys32_execve(void)
+asmlinkage long sys32_execve(char __user *name, compat_uptr_t __user *argv,
+                            compat_uptr_t __user *envp)
 {
        struct pt_regs *regs = task_pt_regs(current);
        char *filename;
-       unsigned long result;
-       int rc;
-
-       filename = getname(compat_ptr(regs->orig_gpr2));
-       if (IS_ERR(filename)) {
-               result = PTR_ERR(filename);
-                goto out;
-       }
-       rc = compat_do_execve(filename, compat_ptr(regs->gprs[3]),
-                             compat_ptr(regs->gprs[4]), regs);
-       if (rc) {
-               result = rc;
-               goto out_putname;
-       }
+       long rc;
+
+       filename = getname(name);
+       rc = PTR_ERR(filename);
+       if (IS_ERR(filename))
+               return rc;
+       rc = compat_do_execve(filename, argv, envp, regs);
+       if (rc)
+               goto out;
        current->thread.fp_regs.fpc=0;
        asm volatile("sfpc %0,0" : : "d" (0));
-       result = regs->gprs[2];
-out_putname:
-        putname(filename);
+       rc = regs->gprs[2];
 out:
-       return result;
-}
-
-
-#ifdef CONFIG_MODULES
-
-asmlinkage long
-sys32_init_module(void __user *umod, unsigned long len,
-               const char __user *uargs)
-{
-       return sys_init_module(umod, len, uargs);
-}
-
-asmlinkage long
-sys32_delete_module(const char __user *name_user, unsigned int flags)
-{
-       return sys_delete_module(name_user, flags);
-}
-
-#else /* CONFIG_MODULES */
-
-asmlinkage long
-sys32_init_module(void __user *umod, unsigned long len,
-               const char __user *uargs)
-{
-       return -ENOSYS;
+       putname(filename);
+       return rc;
 }
 
-asmlinkage long
-sys32_delete_module(const char __user *name_user, unsigned int flags)
-{
-       return -ENOSYS;
-}
-
-#endif  /* CONFIG_MODULES */
-
 asmlinkage long sys32_pread64(unsigned int fd, char __user *ubuf,
                                size_t count, u32 poshi, u32 poslo)
 {
@@ -801,23 +763,6 @@ asmlinkage long sys32_write(unsigned int fd, char __user * buf, size_t count)
        return sys_write(fd, buf, count);
 }
 
-asmlinkage long sys32_clone(void)
-{
-       struct pt_regs *regs = task_pt_regs(current);
-       unsigned long clone_flags;
-       unsigned long newsp;
-       int __user *parent_tidptr, *child_tidptr;
-
-       clone_flags = regs->gprs[3] & 0xffffffffUL;
-       newsp = regs->orig_gpr2 & 0x7fffffffUL;
-       parent_tidptr = compat_ptr(regs->gprs[4]);
-       child_tidptr = compat_ptr(regs->gprs[5]);
-       if (!newsp)
-               newsp = regs->gprs[15];
-       return do_fork(clone_flags, newsp, regs, 0,
-                      parent_tidptr, child_tidptr);
-}
-
 /*
  * 31 bit emulation wrapper functions for sys_fadvise64/fadvise64_64.
  * These need to rewrite the advise values for POSIX_FADV_{DONTNEED,NOREUSE}
index 836a28842900eee9b6c6e1f038a9a6d124e55707..c07f9ca05ade397082959750babd146f495a0a39 100644 (file)
@@ -198,7 +198,8 @@ long sys32_rt_sigprocmask(int how, compat_sigset_t __user *set,
                          compat_sigset_t __user *oset, size_t sigsetsize);
 long sys32_rt_sigpending(compat_sigset_t __user *set, size_t sigsetsize);
 long sys32_rt_sigqueueinfo(int pid, int sig, compat_siginfo_t __user *uinfo);
-long sys32_execve(void);
+long sys32_execve(char __user *name, compat_uptr_t __user *argv,
+                 compat_uptr_t __user *envp);
 long sys32_init_module(void __user *umod, unsigned long len,
                       const char __user *uargs);
 long sys32_delete_module(const char __user *name_user, unsigned int flags);
@@ -222,7 +223,6 @@ unsigned long old32_mmap(struct mmap_arg_struct_emu31 __user *arg);
 long sys32_mmap2(struct mmap_arg_struct_emu31 __user *arg);
 long sys32_read(unsigned int fd, char __user * buf, size_t count);
 long sys32_write(unsigned int fd, char __user * buf, size_t count);
-long sys32_clone(void);
 long sys32_fadvise64(int fd, loff_t offset, size_t len, int advise);
 long sys32_fadvise64_64(struct fadvise64_64_args __user *args);
 long sys32_sigaction(int sig, const struct old_sigaction32 __user *act,
index 624790042d41077c99e1f90f895178ab2d5bf3a8..682fb69dba21388842051635dda6d21b8f52850f 100644 (file)
@@ -568,18 +568,18 @@ compat_sys_sigprocmask_wrapper:
        llgtr   %r4,%r4                 # compat_old_sigset_t *
        jg      compat_sys_sigprocmask          # branch to system call
 
-       .globl  sys32_init_module_wrapper
-sys32_init_module_wrapper:
+       .globl  sys_init_module_wrapper
+sys_init_module_wrapper:
        llgtr   %r2,%r2                 # void *
        llgfr   %r3,%r3                 # unsigned long
        llgtr   %r4,%r4                 # char *
-       jg      sys32_init_module       # branch to system call
+       jg      sys_init_module         # branch to system call
 
-       .globl  sys32_delete_module_wrapper
-sys32_delete_module_wrapper:
+       .globl  sys_delete_module_wrapper
+sys_delete_module_wrapper:
        llgtr   %r2,%r2                 # const char *
        llgfr   %r3,%r3                 # unsigned int
-       jg      sys32_delete_module     # branch to system call
+       jg      sys_delete_module       # branch to system call
 
        .globl  sys32_quotactl_wrapper
 sys32_quotactl_wrapper:
@@ -1840,3 +1840,18 @@ sys_perf_event_open_wrapper:
        lgfr    %r5,%r5                 # int
        llgfr   %r6,%r6                 # unsigned long
        jg      sys_perf_event_open     # branch to system call
+
+       .globl  sys_clone_wrapper
+sys_clone_wrapper:
+       llgfr   %r2,%r2                 # unsigned long
+       llgfr   %r3,%r3                 # unsigned long
+       llgtr   %r4,%r4                 # int *
+       llgtr   %r5,%r5                 # int *
+       jg      sys_clone               # branch to system call
+
+       .globl  sys32_execve_wrapper
+sys32_execve_wrapper:
+       llgtr   %r2,%r2                 # char *
+       llgtr   %r3,%r3                 # compat_uptr_t *
+       llgtr   %r4,%r4                 # compat_uptr_t *
+       jg      sys32_execve            # branch to system call
index 950c59c6688bf2cc3f6e2157f6115b5180f5b188..e1e5e767ab56d1499e46aed54f420f218d7fa3aa 100644 (file)
@@ -42,10 +42,12 @@ long sys_s390_fadvise64_64(struct fadvise64_64_args __user *args);
 long sys_s390_fallocate(int fd, int mode, loff_t offset, u32 len_high,
                        u32 len_low);
 long sys_fork(void);
-long sys_clone(void);
+long sys_clone(unsigned long newsp, unsigned long clone_flags,
+              int __user *parent_tidptr, int __user *child_tidptr);
 long sys_vfork(void);
 void execve_tail(void);
-long sys_execve(void);
+long sys_execve(char __user *name, char __user * __user *argv,
+               char __user * __user *envp);
 long sys_sigsuspend(int history0, int history1, old_sigset_t mask);
 long sys_sigaction(int sig, const struct old_sigaction __user *act,
                   struct old_sigaction __user *oact);
index 5a43f27eec13eafd4ecf36d4c5c82fd4f533e349..59fe6ecc6ed33389fed8947f996b2a9cd5c39e6f 100644 (file)
@@ -32,6 +32,7 @@
 #include <linux/elfcore.h>
 #include <linux/kernel_stat.h>
 #include <linux/syscalls.h>
+#include <linux/compat.h>
 #include <asm/compat.h>
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
@@ -230,17 +231,11 @@ SYSCALL_DEFINE0(fork)
        return do_fork(SIGCHLD, regs->gprs[15], regs, 0, NULL, NULL);
 }
 
-SYSCALL_DEFINE0(clone)
+SYSCALL_DEFINE4(clone, unsigned long, newsp, unsigned long, clone_flags,
+               int __user *, parent_tidptr, int __user *, child_tidptr)
 {
        struct pt_regs *regs = task_pt_regs(current);
-       unsigned long clone_flags;
-       unsigned long newsp;
-       int __user *parent_tidptr, *child_tidptr;
 
-       clone_flags = regs->gprs[3];
-       newsp = regs->orig_gpr2;
-       parent_tidptr = (int __user *) regs->gprs[4];
-       child_tidptr = (int __user *) regs->gprs[5];
        if (!newsp)
                newsp = regs->gprs[15];
        return do_fork(clone_flags, newsp, regs, 0,
@@ -274,30 +269,25 @@ asmlinkage void execve_tail(void)
 /*
  * sys_execve() executes a new program.
  */
-SYSCALL_DEFINE0(execve)
+SYSCALL_DEFINE3(execve, char __user *, name, char __user * __user *, argv,
+               char __user * __user *, envp)
 {
        struct pt_regs *regs = task_pt_regs(current);
        char *filename;
-       unsigned long result;
-       int rc;
+       long rc;
 
-       filename = getname((char __user *) regs->orig_gpr2);
-       if (IS_ERR(filename)) {
-               result = PTR_ERR(filename);
+       filename = getname(name);
+       rc = PTR_ERR(filename);
+       if (IS_ERR(filename))
+               return rc;
+       rc = do_execve(filename, argv, envp, regs);
+       if (rc)
                goto out;
-       }
-       rc = do_execve(filename, (char __user * __user *) regs->gprs[3],
-                      (char __user * __user *) regs->gprs[4], regs);
-       if (rc) {
-               result = rc;
-               goto out_putname;
-       }
        execve_tail();
-       result = regs->gprs[2];
-out_putname:
-       putname(filename);
+       rc = regs->gprs[2];
 out:
-       return result;
+       putname(filename);
+       return rc;
 }
 
 /*
index f3ddd7ac06c55b76a198eaebeae5abf2ad626910..a8738676b26c51baee9059c6391f0504133c7590 100644 (file)
@@ -339,24 +339,10 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
        int copied, ret;
 
        switch (request) {
-       case PTRACE_PEEKTEXT:
-       case PTRACE_PEEKDATA:
-               /* Remove high order bit from address (only for 31 bit). */
-               addr &= PSW_ADDR_INSN;
-               /* read word at location addr. */
-               return generic_ptrace_peekdata(child, addr, data);
-
        case PTRACE_PEEKUSR:
                /* read the word at location addr in the USER area. */
                return peek_user(child, addr, data);
 
-       case PTRACE_POKETEXT:
-       case PTRACE_POKEDATA:
-               /* Remove high order bit from address (only for 31 bit). */
-               addr &= PSW_ADDR_INSN;
-               /* write the word at location addr. */
-               return generic_ptrace_pokedata(child, addr, data);
-
        case PTRACE_POKEUSR:
                /* write the word at location addr in the USER area */
                return poke_user(child, addr, data);
@@ -386,8 +372,11 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                        copied += sizeof(unsigned long);
                }
                return 0;
+       default:
+               /* Removing high order bit from addr (only for 31 bit). */
+               addr &= PSW_ADDR_INSN;
+               return ptrace_request(child, request, addr, data);
        }
-       return ptrace_request(child, request, addr, data);
 }
 
 #ifdef CONFIG_COMPAT
index 20639dfe0c42217c31fd360610bdec512cd5eb24..e27ca63076d1d1946ee5c6518d074b1cce6d0f9f 100644 (file)
@@ -24,8 +24,6 @@ LC_EXT_INT_CODE               = 0x86                  # addr of ext int code
 #   R3 = external interruption parameter if R2=0
 #
 
-.section ".init.text","ax"
-
 _sclp_wait_int:
        stm     %r6,%r15,24(%r15)               # save registers
        basr    %r13,0                          # get base register
@@ -318,9 +316,8 @@ _sclp_print_early:
        .long   _sclp_work_area
 .Lascebc:
        .long   _ascebc
-.previous
 
-.section ".init.data","a"
+.section .data,"aw",@progbits
        .balign 4096
 _sclp_work_area:
        .fill   4096
index 56c16876b9190b067e71ddde1865566e6d17261f..b4b6396e6cf00fcc97347362eb882ae15d7d386f 100644 (file)
@@ -475,10 +475,8 @@ static int __cpuinit smp_alloc_lowcore(int cpu)
 {
        unsigned long async_stack, panic_stack;
        struct _lowcore *lowcore;
-       int lc_order;
 
-       lc_order = sizeof(long) == 8 ? 1 : 0;
-       lowcore = (void *) __get_free_pages(GFP_KERNEL | GFP_DMA, lc_order);
+       lowcore = (void *) __get_free_pages(GFP_KERNEL | GFP_DMA, LC_ORDER);
        if (!lowcore)
                return -ENOMEM;
        async_stack = __get_free_pages(GFP_KERNEL, ASYNC_ORDER);
@@ -509,16 +507,14 @@ static int __cpuinit smp_alloc_lowcore(int cpu)
 out:
        free_page(panic_stack);
        free_pages(async_stack, ASYNC_ORDER);
-       free_pages((unsigned long) lowcore, lc_order);
+       free_pages((unsigned long) lowcore, LC_ORDER);
        return -ENOMEM;
 }
 
 static void smp_free_lowcore(int cpu)
 {
        struct _lowcore *lowcore;
-       int lc_order;
 
-       lc_order = sizeof(long) == 8 ? 1 : 0;
        lowcore = lowcore_ptr[cpu];
 #ifndef CONFIG_64BIT
        if (MACHINE_HAS_IEEE)
@@ -528,7 +524,7 @@ static void smp_free_lowcore(int cpu)
 #endif
        free_page(lowcore->panic_stack - PAGE_SIZE);
        free_pages(lowcore->async_stack - ASYNC_SIZE, ASYNC_ORDER);
-       free_pages((unsigned long) lowcore, lc_order);
+       free_pages((unsigned long) lowcore, LC_ORDER);
        lowcore_ptr[cpu] = NULL;
 }
 
@@ -664,7 +660,6 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
        unsigned long async_stack, panic_stack;
        struct _lowcore *lowcore;
        unsigned int cpu;
-       int lc_order;
 
        smp_detect_cpus();
 
@@ -674,8 +669,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
        print_cpu_info();
 
        /* Reallocate current lowcore, but keep its contents. */
-       lc_order = sizeof(long) == 8 ? 1 : 0;
-       lowcore = (void *) __get_free_pages(GFP_KERNEL | GFP_DMA, lc_order);
+       lowcore = (void *) __get_free_pages(GFP_KERNEL | GFP_DMA, LC_ORDER);
        panic_stack = __get_free_page(GFP_KERNEL);
        async_stack = __get_free_pages(GFP_KERNEL, ASYNC_ORDER);
        BUG_ON(!lowcore || !panic_stack || !async_stack);
@@ -1047,42 +1041,6 @@ out:
 static SYSDEV_CLASS_ATTR(dispatching, 0644, dispatching_show,
                         dispatching_store);
 
-/*
- * If the resume kernel runs on another cpu than the suspended kernel,
- * we have to switch the cpu IDs in the logical map.
- */
-void smp_switch_boot_cpu_in_resume(u32 resume_phys_cpu_id,
-                                  struct _lowcore *suspend_lowcore)
-{
-       int cpu, suspend_cpu_id, resume_cpu_id;
-       u32 suspend_phys_cpu_id;
-
-       suspend_phys_cpu_id = __cpu_logical_map[suspend_lowcore->cpu_nr];
-       suspend_cpu_id = suspend_lowcore->cpu_nr;
-
-       for_each_present_cpu(cpu) {
-               if (__cpu_logical_map[cpu] == resume_phys_cpu_id) {
-                       resume_cpu_id = cpu;
-                       goto found;
-               }
-       }
-       panic("Could not find resume cpu in logical map.\n");
-
-found:
-       printk("Resume  cpu ID: %i/%i\n", resume_phys_cpu_id, resume_cpu_id);
-       printk("Suspend cpu ID: %i/%i\n", suspend_phys_cpu_id, suspend_cpu_id);
-
-       __cpu_logical_map[resume_cpu_id] = suspend_phys_cpu_id;
-       __cpu_logical_map[suspend_cpu_id] = resume_phys_cpu_id;
-
-       lowcore_ptr[suspend_cpu_id]->cpu_addr = resume_phys_cpu_id;
-}
-
-u32 smp_get_phys_cpu_id(void)
-{
-       return __cpu_logical_map[smp_processor_id()];
-}
-
 static int __init topology_init(void)
 {
        int cpu;
index 086bee970cae501fbe579e0dda107c2438c13623..cf9e5c6d55274ce2da221e5f258fab08c58ee21e 100644 (file)
@@ -6,36 +6,26 @@
  * Author(s): Hans-Joachim Picht <hans@linux.vnet.ibm.com>
  */
 
-#include <linux/suspend.h>
-#include <linux/reboot.h>
 #include <linux/pfn.h>
-#include <linux/mm.h>
-#include <asm/sections.h>
 #include <asm/system.h>
-#include <asm/ipl.h>
 
 /*
  * References to section boundaries
  */
 extern const void __nosave_begin, __nosave_end;
 
-/*
- *  check if given pfn is in the 'nosave' or in the read only NSS section
- */
 int pfn_is_nosave(unsigned long pfn)
 {
-       unsigned long nosave_begin_pfn = __pa(&__nosave_begin) >> PAGE_SHIFT;
-       unsigned long nosave_end_pfn = PAGE_ALIGN(__pa(&__nosave_end))
-                                       >> PAGE_SHIFT;
-       unsigned long eshared_pfn = PFN_DOWN(__pa(&_eshared)) - 1;
-       unsigned long stext_pfn = PFN_DOWN(__pa(&_stext));
+       unsigned long nosave_begin_pfn = PFN_DOWN(__pa(&__nosave_begin));
+       unsigned long nosave_end_pfn = PFN_DOWN(__pa(&__nosave_end));
 
+       /* Always save lowcore pages (LC protection might be enabled). */
+       if (pfn <= LC_PAGES)
+               return 0;
        if (pfn >= nosave_begin_pfn && pfn < nosave_end_pfn)
                return 1;
-       if (pfn >= stext_pfn && pfn <= eshared_pfn) {
-               if (ipl_info.type == IPL_TYPE_NSS)
-                       return 1;
-       } else if ((tprot(pfn * PAGE_SIZE) && pfn > 0))
+       /* Skip memory holes and read-only pages (NSS, DCSS, ...). */
+       if (tprot(PFN_PHYS(pfn)))
                return 1;
        return 0;
 }
index 7cd6b096f0d16dd52ebc9234f827b373d8296c62..fe927d0bc20b73b6bf1a8a0c5355de6f440404e1 100644 (file)
@@ -9,6 +9,7 @@
 
 #include <asm/page.h>
 #include <asm/ptrace.h>
+#include <asm/thread_info.h>
 #include <asm/asm-offsets.h>
 
 /*
@@ -41,6 +42,9 @@ swsusp_arch_suspend:
        /* Get pointer to save area */
        lghi    %r1,0x1000
 
+       /* Save CPU address */
+       stap    __LC_CPU_ADDRESS(%r1)
+
        /* Store registers */
        mvc     0x318(4,%r1),__SF_EMPTY(%r15)   /* move prefix to lowcore */
        stfpc   0x31c(%r1)                      /* store fpu control */
@@ -102,11 +106,10 @@ swsusp_arch_resume:
        aghi    %r15,-STACK_FRAME_OVERHEAD
        stg     %r1,__SF_BACKCHAIN(%r15)
 
-#ifdef CONFIG_SMP
-       /* Save boot cpu number */
-       brasl   %r14,smp_get_phys_cpu_id
-       lgr     %r10,%r2
-#endif
+       /* Make all free pages stable */
+       lghi    %r2,1
+       brasl   %r14,arch_set_page_states
+
        /* Deactivate DAT */
        stnsm   __SF_EMPTY(%r15),0xfb
 
@@ -133,6 +136,69 @@ swsusp_arch_resume:
 2:
        ptlb                            /* flush tlb */
 
+       /* Reset System */
+       larl    %r1,restart_entry
+       larl    %r2,.Lrestart_diag308_psw
+       og      %r1,0(%r2)
+       stg     %r1,0(%r0)
+       larl    %r1,.Lnew_pgm_check_psw
+       epsw    %r2,%r3
+       stm     %r2,%r3,0(%r1)
+       mvc     __LC_PGM_NEW_PSW(16,%r0),0(%r1)
+       lghi    %r0,0
+       diag    %r0,%r0,0x308
+restart_entry:
+       lhi     %r1,1
+       sigp    %r1,%r0,0x12
+       sam64
+       larl    %r1,.Lnew_pgm_check_psw
+       lpswe   0(%r1)
+pgm_check_entry:
+
+       /* Switch to original suspend CPU */
+       larl    %r1,.Lresume_cpu                /* Resume CPU address: r2 */
+       stap    0(%r1)
+       llgh    %r2,0(%r1)
+       lghi    %r3,0x1000
+       llgh    %r1,__LC_CPU_ADDRESS(%r3)       /* Suspend CPU address: r1 */
+       cgr     %r1,%r2
+       je      restore_registers               /* r1 = r2 -> nothing to do */
+       larl    %r4,.Lrestart_suspend_psw       /* Set new restart PSW */
+       mvc     __LC_RESTART_PSW(16,%r0),0(%r4)
+3:
+       sigp    %r9,%r1,__SIGP_INITIAL_CPU_RESET
+       brc     8,4f    /* accepted */
+       brc     2,3b    /* busy, try again */
+
+       /* Suspend CPU not available -> panic */
+       larl    %r15,init_thread_union
+       ahi     %r15,1<<(PAGE_SHIFT+THREAD_ORDER)
+       larl    %r2,.Lpanic_string
+       larl    %r3,_sclp_print_early
+       lghi    %r1,0
+       sam31
+       sigp    %r1,%r0,0x12
+       basr    %r14,%r3
+       larl    %r3,.Ldisabled_wait_31
+       lpsw    0(%r3)
+4:
+       /* Switch to suspend CPU */
+       sigp    %r9,%r1,__SIGP_RESTART  /* start suspend CPU */
+       brc     2,4b                    /* busy, try again */
+5:
+       sigp    %r9,%r2,__SIGP_STOP     /* stop resume (current) CPU */
+6:     j       6b
+
+restart_suspend:
+       larl    %r1,.Lresume_cpu
+       llgh    %r2,0(%r1)
+7:
+       sigp    %r9,%r2,__SIGP_SENSE    /* Wait for resume CPU */
+       brc     2,7b                    /* busy, try again */
+       tmll    %r9,0x40                /* Test if resume CPU is stopped */
+       jz      7b
+
+restore_registers:
        /* Restore registers */
        lghi    %r13,0x1000             /* %r1 = pointer to save arae */
 
@@ -166,19 +232,33 @@ swsusp_arch_resume:
        /* Pointer to save area */
        lghi    %r13,0x1000
 
-#ifdef CONFIG_SMP
-       /* Switch CPUs */
-       lgr     %r2,%r10                /* get cpu id */
-       llgf    %r3,0x318(%r13)
-       brasl   %r14,smp_switch_boot_cpu_in_resume
-#endif
        /* Restore prefix register */
        spx     0x318(%r13)
 
        /* Activate DAT */
        stosm   __SF_EMPTY(%r15),0x04
 
+       /* Make all free pages unstable */
+       lghi    %r2,0
+       brasl   %r14,arch_set_page_states
+
        /* Return 0 */
        lmg     %r6,%r15,STACK_FRAME_OVERHEAD + __SF_GPRS(%r15)
        lghi    %r2,0
        br      %r14
+
+       .section .data.nosave,"aw",@progbits
+       .align  8
+.Ldisabled_wait_31:
+       .long  0x000a0000,0x00000000
+.Lpanic_string:
+       .asciz  "Resume not possible because suspend CPU is no longer available"
+       .align  8
+.Lrestart_diag308_psw:
+       .long   0x00080000,0x80000000
+.Lrestart_suspend_psw:
+       .quad   0x0000000180000000,restart_suspend
+.Lnew_pgm_check_psw:
+       .quad   0,pgm_check_entry
+.Lresume_cpu:
+       .byte   0,0
index 0b5083681e770812ef6142f2ecded3bc40bbc77c..30eca070d4268953d209b54394c99806afced91e 100644 (file)
@@ -19,7 +19,7 @@ SYSCALL(sys_restart_syscall,sys_restart_syscall,sys_restart_syscall)
 SYSCALL(sys_creat,sys_creat,sys32_creat_wrapper)
 SYSCALL(sys_link,sys_link,sys32_link_wrapper)
 SYSCALL(sys_unlink,sys_unlink,sys32_unlink_wrapper)            /* 10 */
-SYSCALL(sys_execve,sys_execve,sys32_execve)
+SYSCALL(sys_execve,sys_execve,sys32_execve_wrapper)
 SYSCALL(sys_chdir,sys_chdir,sys32_chdir_wrapper)
 SYSCALL(sys_time,sys_ni_syscall,sys32_time_wrapper)            /* old time syscall */
 SYSCALL(sys_mknod,sys_mknod,sys32_mknod_wrapper)
@@ -128,7 +128,7 @@ SYSCALL(sys_sysinfo,sys_sysinfo,compat_sys_sysinfo_wrapper)
 SYSCALL(sys_ipc,sys_ipc,sys32_ipc_wrapper)
 SYSCALL(sys_fsync,sys_fsync,sys32_fsync_wrapper)
 SYSCALL(sys_sigreturn,sys_sigreturn,sys32_sigreturn)
-SYSCALL(sys_clone,sys_clone,sys32_clone)                       /* 120 */
+SYSCALL(sys_clone,sys_clone,sys_clone_wrapper)                 /* 120 */
 SYSCALL(sys_setdomainname,sys_setdomainname,sys32_setdomainname_wrapper)
 SYSCALL(sys_newuname,sys_s390_newuname,sys32_newuname_wrapper)
 NI_SYSCALL                                                     /* modify_ldt for i386 */
@@ -136,8 +136,8 @@ SYSCALL(sys_adjtimex,sys_adjtimex,compat_sys_adjtimex_wrapper)
 SYSCALL(sys_mprotect,sys_mprotect,sys32_mprotect_wrapper)      /* 125 */
 SYSCALL(sys_sigprocmask,sys_sigprocmask,compat_sys_sigprocmask_wrapper)
 NI_SYSCALL                                                     /* old "create module" */
-SYSCALL(sys_init_module,sys_init_module,sys32_init_module_wrapper)
-SYSCALL(sys_delete_module,sys_delete_module,sys32_delete_module_wrapper)
+SYSCALL(sys_init_module,sys_init_module,sys_init_module_wrapper)
+SYSCALL(sys_delete_module,sys_delete_module,sys_delete_module_wrapper)
 NI_SYSCALL                                                     /* 130: old get_kernel_syms */
 SYSCALL(sys_quotactl,sys_quotactl,sys32_quotactl_wrapper)
 SYSCALL(sys_getpgid,sys_getpgid,sys32_getpgid_wrapper)
index 2c2f983534154230219f8ce8a24c2807fae6caf9..43486c2408e1c571c1b933d1105f23dd06e2e2db 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 c634dfbe92e9ad680f245617db440be322fcad27..76564795222161d882c90d08899f6ecce905969b 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 f92ec203ad92ee58e92f293026266e0d314c4604..098923ae458fb04563c72a541e0cd7b287870343 100644 (file)
@@ -50,28 +50,64 @@ void __init cmma_init(void)
                cmma_flag = 0;
 }
 
-void arch_free_page(struct page *page, int order)
+static inline void set_page_unstable(struct page *page, int order)
 {
        int i, rc;
 
-       if (!cmma_flag)
-               return;
        for (i = 0; i < (1 << order); i++)
                asm volatile(".insn rrf,0xb9ab0000,%0,%1,%2,0"
                             : "=&d" (rc)
-                            : "a" ((page_to_pfn(page) + i) << PAGE_SHIFT),
+                            : "a" (page_to_phys(page + i)),
                               "i" (ESSA_SET_UNUSED));
 }
 
-void arch_alloc_page(struct page *page, int order)
+void arch_free_page(struct page *page, int order)
 {
-       int i, rc;
-
        if (!cmma_flag)
                return;
+       set_page_unstable(page, order);
+}
+
+static inline void set_page_stable(struct page *page, int order)
+{
+       int i, rc;
+
        for (i = 0; i < (1 << order); i++)
                asm volatile(".insn rrf,0xb9ab0000,%0,%1,%2,0"
                             : "=&d" (rc)
-                            : "a" ((page_to_pfn(page) + i) << PAGE_SHIFT),
+                            : "a" (page_to_phys(page + i)),
                               "i" (ESSA_SET_STABLE));
 }
+
+void arch_alloc_page(struct page *page, int order)
+{
+       if (!cmma_flag)
+               return;
+       set_page_stable(page, order);
+}
+
+void arch_set_page_states(int make_stable)
+{
+       unsigned long flags, order, t;
+       struct list_head *l;
+       struct page *page;
+       struct zone *zone;
+
+       if (!cmma_flag)
+               return;
+       if (make_stable)
+               drain_local_pages(NULL);
+       for_each_populated_zone(zone) {
+               spin_lock_irqsave(&zone->lock, flags);
+               for_each_migratetype_order(order, t) {
+                       list_for_each(l, &zone->free_area[order].free_list[t]) {
+                               page = list_entry(l, struct page, lru);
+                               if (make_stable)
+                                       set_page_stable(page, order);
+                               else
+                                       set_page_unstable(page, order);
+                       }
+               }
+               spin_unlock_irqrestore(&zone->lock, flags);
+       }
+}
index c70215247071b7f435a6404a13563834e7254548..c60bfb309ce60c3a92bebcf5817b6de60d96ae4a 100644 (file)
@@ -314,21 +314,18 @@ int s390_enable_sie(void)
 }
 EXPORT_SYMBOL_GPL(s390_enable_sie);
 
-#ifdef CONFIG_DEBUG_PAGEALLOC
-#ifdef CONFIG_HIBERNATION
+#if defined(CONFIG_DEBUG_PAGEALLOC) && defined(CONFIG_HIBERNATION)
 bool kernel_page_present(struct page *page)
 {
        unsigned long addr;
        int cc;
 
        addr = page_to_phys(page);
-       asm("lra %1,0(%1)\n"
-           "ipm %0\n"
-           "srl %0,28"
-           :"=d"(cc),"+a"(addr)::"cc");
+       asm volatile(
+               "       lra     %1,0(%1)\n"
+               "       ipm     %0\n"
+               "       srl     %0,28"
+               : "=d" (cc), "+a" (addr) : : "cc");
        return cc == 0;
 }
-
-#endif /* CONFIG_HIBERNATION */
-#endif /* CONFIG_DEBUG_PAGEALLOC */
-
+#endif /* CONFIG_HIBERNATION && CONFIG_DEBUG_PAGEALLOC */
index ee5821042fcc947d0994a9c6c6c7a6118cf84d4f..d92a5a2d36d40c434ee833543275b6e296ef192b 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 3a1122885528b97cee66228d1eb2192357e0764e..55939992c27db5c74f402cb5ea6ef6abb55b5494 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 f85569831d5c3014ccb5a181f71d5ae0097e4d1f..eebcbaa4e9783b1685c856fa794c63123344131a 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 edc842ff61ed7ea48f40437b4d00867a9c53568d..8173e38afd38f4ecbf9e6c7a5bfae805a50cba48 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 988192e8e95657d366e558a97954dda6cfba027f..c3029ad6619a31d7984138a3183432b9a7f59a2b 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__
index d4de32f0f8afdb849495f29aff26f3c0f004f7d3..6cdbf7e7351d2acae1bf34d209707e52496878e4 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 8daab33fc17d1808a0abd55bce2d4ac98af0a5c7..8ab1d4728a4bf433f80b5d6ca9a283697f007f67 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 54114ad0bdeeae01f48a292954d94238b206f787..dc7c3b17a15f2badfbdc03dc3a1c2cac77ed0818 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 f114813ae258eabe782048061b2ed2b44631e2b8..a74245ae3a84db98443460ed794ec70ce15eb15a 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 8f05d4d9da128788d0b5b7d5f39ac5fe2741bd61..635d16d90a80d4158df7769ec11df5ab6c64c38d 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 313ebb8a256615be39566b1eba42b8caaf37a9a0..fb3c05a0cbbf11e48551550270d354b0e0eb7dc1 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 4bce6e0128895ddad042c7959526a0e9f67eaf92..7fd8539bc19a1ab0be7b9f9cfe29270d577a05d6 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 61d7e6138ff51ba8bcb10ca1ac12880aa197ccb5..a5d5e70cf6f55bb0db78971b1bce19cab31abeec 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 0cd9a7a05e777bf79447af2338a9f6aaa784281d..8bfd1e90581225eb0e19fada92611399d2a1d4c8 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 e4ff5d1280ca826bba1d0d640052acda2cb3ce92..93698794aa3a7b3189ee427a105e1b20e88ef103 100644 (file)
@@ -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
@@ -1662,6 +1666,8 @@ source "kernel/power/Kconfig"
 
 source "drivers/acpi/Kconfig"
 
+source "drivers/sfi/Kconfig"
+
 config X86_APM_BOOT
        bool
        default y
@@ -1857,7 +1863,7 @@ config PCI_DIRECT
 
 config PCI_MMCONFIG
        def_bool y
-       depends on X86_32 && PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY)
+       depends on X86_32 && PCI && (ACPI || SFI) && (PCI_GOMMCONFIG || PCI_GOANY)
 
 config PCI_OLPC
        def_bool y
@@ -1895,7 +1901,7 @@ config DMAR_DEFAULT_ON
 config DMAR_BROKEN_GFX_WA
        def_bool n
        prompt "Workaround broken graphics drivers (going away soon)"
-       depends on DMAR
+       depends on DMAR && BROKEN
        ---help---
          Current Graphics drivers tend to use physical address
          for DMA and avoid using DMA APIs. Setting this config
index 20d1465a2ab046d8956eec43d5f5d4d36a3bd6bb..4518dc50090380b6676074b3f2466709ddea5a4b 100644 (file)
@@ -144,7 +144,6 @@ static inline unsigned int acpi_processor_cstate_check(unsigned int max_cstate)
 
 #else /* !CONFIG_ACPI */
 
-#define acpi_disabled 1
 #define acpi_lapic 0
 #define acpi_ioapic 0
 static inline void acpi_noirq_set(void) { }
index d82f39bb7905e8f14d3cbd1dc0365ba98f03eea6..8d33bc5462d1bd30af43bcb4156fec351149eaa6 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 4ba419b668a5aeb87de1911490e805f7a4be8134..d8e5d0cdd678d3b4396c0e7f859b7c3f6ac0d212 100644 (file)
@@ -56,6 +56,7 @@ obj-$(CONFIG_INTEL_TXT)               += tboot.o
 obj-$(CONFIG_STACKTRACE)       += stacktrace.o
 obj-y                          += cpu/
 obj-y                          += acpi/
+obj-$(CONFIG_SFI)              += sfi.o
 obj-y                          += reboot.o
 obj-$(CONFIG_MCA)              += mca_32.o
 obj-$(CONFIG_X86_MSR)          += msr.o
index f32fa71ccf976ec0551916a075b6cedc69f41ea7..c910a716a71ce103b878154b24b2813917624716 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 a3210ce1eccd4c0c8ef4e541d583ac6b839c7cca..85419bb7d4ab5c0e72f479c834a61d582f887d19 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 b11cab3c323ad9f7f354ae03981037f9588d7edb..2acfd3fdc0cc0b37c139595e77c8558754c62ea9 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 = 100000;
-       /* 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 681c3fda73916ff842566799a76cbd8bb0d138e1..b5c061f8f358489fee828e48b836d18c3bd6da79 100644 (file)
@@ -536,20 +536,13 @@ sysret_signal:
        bt $TIF_SYSCALL_AUDIT,%edx
        jc sysret_audit
 #endif
-       /* edx: work flags (arg3) */
-       leaq -ARGOFFSET(%rsp),%rdi # &pt_regs -> arg1
-       xorl %esi,%esi # oldset -> arg2
-       SAVE_REST
-       FIXUP_TOP_OF_STACK %r11
-       call do_notify_resume
-       RESTORE_TOP_OF_STACK %r11
-       RESTORE_REST
-       movl $_TIF_WORK_MASK,%edi
-       /* Use IRET because user could have changed frame. This
-          works because ptregscall_common has called FIXUP_TOP_OF_STACK. */
-       DISABLE_INTERRUPTS(CLBR_NONE)
-       TRACE_IRQS_OFF
-       jmp int_with_check
+       /*
+        * We have a signal, or exit tracing or single-step.
+        * These all wind up with the iret return path anyway,
+        * so just join that path right now.
+        */
+       FIXUP_TOP_OF_STACK %r11, -ARGOFFSET
+       jmp int_check_syscall_exit_work
 
 badsys:
        movq $-ENOSYS,RAX-ARGOFFSET(%rsp)
@@ -654,6 +647,7 @@ int_careful:
 int_very_careful:
        TRACE_IRQS_ON
        ENABLE_INTERRUPTS(CLBR_NONE)
+int_check_syscall_exit_work:
        SAVE_REST
        /* Check for syscall exit trace */
        testl $_TIF_WORK_SYSCALL_EXIT,%edx
index 0db7969b0dde997001c4072ca20571e97ca59949..378e9a8f1bf8b1b338104b822afc74ed18ce0823 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;
        }
 
index e8a35016115f92369663ef7c695cd5c41f45eec7..aaa6b7839f1e3541e2a36bb67c770bf343075de7 100644 (file)
@@ -46,9 +46,8 @@ void __init pci_swiotlb_init(void)
 {
        /* don't initialize swiotlb if iommu=off (no_iommu=1) */
 #ifdef CONFIG_X86_64
-       if ((!iommu_detected && !no_iommu && max_pfn > MAX_DMA32_PFN) ||
-               iommu_pass_through)
-              swiotlb = 1;
+       if ((!iommu_detected && !no_iommu && max_pfn > MAX_DMA32_PFN))
+               swiotlb = 1;
 #endif
        if (swiotlb_force)
                swiotlb = 1;
index 8d7d5c9c1be31058b651101503edc68028e62351..7b058a2dc66afecdaeb58877102957dff77e7d81 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 f327bccf5089530bbdfe9650c90a83d13fd45d2a..e09f0e2c14b5e83487b91a9a02049a802a7830ef 100644 (file)
@@ -27,6 +27,7 @@
 #include <linux/screen_info.h>
 #include <linux/ioport.h>
 #include <linux/acpi.h>
+#include <linux/sfi.h>
 #include <linux/apm_bios.h>
 #include <linux/initrd.h>
 #include <linux/bootmem.h>
@@ -985,6 +986,8 @@ void __init setup_arch(char **cmdline_p)
         */
        acpi_boot_init();
 
+       sfi_init();
+
        /*
         * get boot-time SMP configuration:
         */
diff --git a/arch/x86/kernel/sfi.c b/arch/x86/kernel/sfi.c
new file mode 100644 (file)
index 0000000..34e0993
--- /dev/null
@@ -0,0 +1,122 @@
+/*
+ * sfi.c - x86 architecture SFI support.
+ *
+ * Copyright (c) 2009, Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope 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 St - Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
+#define KMSG_COMPONENT "SFI"
+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
+
+#include <linux/acpi.h>
+#include <linux/init.h>
+#include <linux/sfi.h>
+#include <linux/io.h>
+
+#include <asm/io_apic.h>
+#include <asm/mpspec.h>
+#include <asm/setup.h>
+#include <asm/apic.h>
+
+#ifdef CONFIG_X86_LOCAL_APIC
+static unsigned long sfi_lapic_addr __initdata = APIC_DEFAULT_PHYS_BASE;
+
+void __init mp_sfi_register_lapic_address(unsigned long address)
+{
+       mp_lapic_addr = address;
+
+       set_fixmap_nocache(FIX_APIC_BASE, mp_lapic_addr);
+       if (boot_cpu_physical_apicid == -1U)
+               boot_cpu_physical_apicid = read_apic_id();
+
+       pr_info("Boot CPU = %d\n", boot_cpu_physical_apicid);
+}
+
+/* All CPUs enumerated by SFI must be present and enabled */
+void __cpuinit mp_sfi_register_lapic(u8 id)
+{
+       if (MAX_APICS - id <= 0) {
+               pr_warning("Processor #%d invalid (max %d)\n",
+                       id, MAX_APICS);
+               return;
+       }
+
+       pr_info("registering lapic[%d]\n", id);
+
+       generic_processor_info(id, GET_APIC_VERSION(apic_read(APIC_LVR)));
+}
+
+static int __init sfi_parse_cpus(struct sfi_table_header *table)
+{
+       struct sfi_table_simple *sb;
+       struct sfi_cpu_table_entry *pentry;
+       int i;
+       int cpu_num;
+
+       sb = (struct sfi_table_simple *)table;
+       cpu_num = SFI_GET_NUM_ENTRIES(sb, struct sfi_cpu_table_entry);
+       pentry = (struct sfi_cpu_table_entry *)sb->pentry;
+
+       for (i = 0; i < cpu_num; i++) {
+               mp_sfi_register_lapic(pentry->apic_id);
+               pentry++;
+       }
+
+       smp_found_config = 1;
+       return 0;
+}
+#endif /* CONFIG_X86_LOCAL_APIC */
+
+#ifdef CONFIG_X86_IO_APIC
+static u32 gsi_base;
+
+static int __init sfi_parse_ioapic(struct sfi_table_header *table)
+{
+       struct sfi_table_simple *sb;
+       struct sfi_apic_table_entry *pentry;
+       int i, num;
+
+       sb = (struct sfi_table_simple *)table;
+       num = SFI_GET_NUM_ENTRIES(sb, struct sfi_apic_table_entry);
+       pentry = (struct sfi_apic_table_entry *)sb->pentry;
+
+       for (i = 0; i < num; i++) {
+               mp_register_ioapic(i, pentry->phys_addr, gsi_base);
+               gsi_base += io_apic_get_redir_entries(i);
+               pentry++;
+       }
+
+       WARN(pic_mode, KERN_WARNING
+               "SFI: pic_mod shouldn't be 1 when IOAPIC table is present\n");
+       pic_mode = 0;
+       return 0;
+}
+#endif /* CONFIG_X86_IO_APIC */
+
+/*
+ * sfi_platform_init(): register lapics & io-apics
+ */
+int __init sfi_platform_init(void)
+{
+#ifdef CONFIG_X86_LOCAL_APIC
+       mp_sfi_register_lapic_address(sfi_lapic_addr);
+       sfi_table_parse(SFI_SIG_CPUS, NULL, NULL, sfi_parse_cpus);
+#endif
+#ifdef CONFIG_X86_IO_APIC
+       sfi_table_parse(SFI_SIG_APIC, NULL, NULL, sfi_parse_ioapic);
+#endif
+       return 0;
+}
index 4cb7d5d18b8e691b9a2123060e9d701a3d34472e..7e59dc1d3fc2f6fcba984f1d729c65fb59f44b35 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 3cd7711bb94940d0f19ffb4bac4f4b5f9f6a1a5f..30938c1d8d5d554cd3819887dec0dc31f007a9aa 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 ea56b8cbb6a6dd6de89ec04d9e0543ff6908395f..5a4398a6006bcca5a0bce02e53f06601f399a09e 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 528bf954eb7403c82d0816957b02a653ff9bcf18..8cc183344140cf1503df9efdc87bdad6e9f23bcf 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 712443ec6d43b46aaf05d75e04f2c249f44d20da..602c172d3bd5a5c44685893071b32b2d8827c023 100644 (file)
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/acpi.h>
+#include <linux/sfi_acpi.h>
 #include <linux/bitmap.h>
 #include <linux/sort.h>
 #include <asm/e820.h>
 #include <asm/pci_x86.h>
+#include <asm/acpi.h>
+
+#define PREFIX "PCI: "
 
 /* aperture is up to 256MB but BIOS may reserve less */
 #define MMCONFIG_APER_MIN      (2 * 1024*1024)
@@ -491,7 +495,7 @@ static void __init pci_mmcfg_reject_broken(int early)
                       (unsigned int)cfg->start_bus_number,
                       (unsigned int)cfg->end_bus_number);
 
-               if (!early)
+               if (!early && !acpi_disabled)
                        valid = is_mmconf_reserved(is_acpi_reserved, addr, size, i, cfg, 0);
 
                if (valid)
@@ -606,7 +610,7 @@ static void __init __pci_mmcfg_init(int early)
        }
 
        if (!known_bridge)
-               acpi_table_parse(ACPI_SIG_MCFG, pci_parse_mcfg);
+               acpi_sfi_table_parse(ACPI_SIG_MCFG, pci_parse_mcfg);
 
        pci_mmcfg_reject_broken(early);
 
index 8b2d561046a3bba83ef3953171fb1abdd5a195b5..f10a7e94a84c51d9b87a041a19b3c7b89b283d8b 100644 (file)
@@ -11,9 +11,9 @@
 
 #include <linux/pci.h>
 #include <linux/init.h>
-#include <linux/acpi.h>
 #include <asm/e820.h>
 #include <asm/pci_x86.h>
+#include <acpi/acpi.h>
 
 /* Assume systems with more busses have correct MCFG */
 #define mmcfg_virt_addr ((void __iomem *) fix_to_virt(FIX_PCIE_MCFG))
index 9b92620c8a1ed262d3b10a9cb44dd0b746feacc8..fca4db425f6ec5a694e56c0972aa8f4f9875cf32 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 427e14fa43c5517d8ed583cd2c0c5f40c6026ce2..cdbc27ca9665dea72be443a347120a3c547a8386 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 bc4205d2fc3c5302d3a899ad1b9ded1686536b72..6ee53c7a57a1c5162265156bced43d6364c73237 100644 (file)
@@ -11,6 +11,7 @@ obj-$(CONFIG_PARISC)          += parisc/
 obj-$(CONFIG_RAPIDIO)          += rapidio/
 obj-y                          += video/
 obj-$(CONFIG_ACPI)             += acpi/
+obj-$(CONFIG_SFI)              += sfi/
 # PnP must come after ACPI since it will eventually need to check if acpi
 # was used and do nothing if so
 obj-$(CONFIG_PNP)              += pnp/
@@ -42,6 +43,8 @@ obj-y                         += macintosh/
 obj-$(CONFIG_IDE)              += ide/
 obj-$(CONFIG_SCSI)             += scsi/
 obj-$(CONFIG_ATA)              += ata/
+obj-$(CONFIG_MTD)              += mtd/
+obj-$(CONFIG_SPI)              += spi/
 obj-y                          += net/
 obj-$(CONFIG_ATM)              += atm/
 obj-$(CONFIG_FUSION)           += message/
@@ -50,8 +53,6 @@ obj-y                         += ieee1394/
 obj-$(CONFIG_UIO)              += uio/
 obj-y                          += cdrom/
 obj-y                          += auxdisplay/
-obj-$(CONFIG_MTD)              += mtd/
-obj-$(CONFIG_SPI)              += spi/
 obj-$(CONFIG_PCCARD)           += pcmcia/
 obj-$(CONFIG_DIO)              += dio/
 obj-$(CONFIG_SBUS)             += sbus/
index 7ec7d88c5999573d169233bbf3c82232f6003dbd..dd8729d674e56ef2dfcdc7a7fa320f399b4542c6 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 03a985be3fe3c6554c13b6549fa7b56aac474e49..82cd49dc603b6a5712a380eddbb54237a33a4ec2 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 0df8fcb687d6f00ce400c1b4677019a34af236a1..98b9690b0159abdfb7e1a999553fe916dfa5a4c1 100644 (file)
@@ -37,6 +37,8 @@
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 
+#define PREFIX "ACPI: "
+
 #define ACPI_AC_CLASS                  "ac_adapter"
 #define ACPI_AC_DEVICE_NAME            "AC Adapter"
 #define ACPI_AC_FILE_STATE             "state"
index 9a62224cc27816b039d116cc1732acad7080fdb2..28ccdbc05ac8326420c76488fd85782cb18560c8 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 72ac28da14e392267bb885fb19eebee237f7c210..e7973bc16846847d33a9eefb71400907316dc5f8 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 e6777fb883d25b59d1e5acac89a7ccd24ab09f21..8e679ef5b23153600523c856f6d046ea26977615 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 62c59df3b86c049799e78f280d8a743bbed38aac..a4fb001d96f1742065c29a7b16e233871b47c3eb 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 3d87362d17ed163851c3f5790fb4ecc4976e5c30..29ba66d5a7900ea09ebbcbc1716104aabad361b4 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 4afa3d8e0efb298c6d33970e1d2619cabcdbcf49..36192f142fbb5bdc57997d0600c48284c56878c0 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 e8db7a3143a5c1244ee904152be7187d8e1e2e0b..5db9f2916f7c82fa9d3a85166fadda5331f091b9 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 ee986edfa0da32704133b949624aa6ff75f3bea2..81e64f478679be04dafdb1a1786e34e72906c310 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 91ac7d7b4402a07bf9409cd2c7ef97fae9981e3b..3acd9c6760ea59977262d479f00b99798b1c45c5 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 94cdc2b8cb9385d6814005933810afd6d81e8d72..09a2764c734ba9d8aa6ae95677feb446f9f8d941 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 eb6f038b03d9f23d8479fe1a2caa40bab2ee2cb3..b39d682a2140291509423ef6624e3d785d66f639 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 23ee0fbf561970e92c59d6c9e2f8e8324f17d3c0..22881e8ce22983ab71d11ee9177141c4429a9c2e 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 63f656ae3604d6c4acb06049416c9abc3bdcb52d..cd80d1dd195093fc726bc9253a8f1423dc79d4a2 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 897810ba0ccc46462f39e8d8b50a3dc9e0835a77..863a264b829e4234bed3ed9db92eaf4c8f6c2edc 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 067f967eb389cf720b2ee7d9a25b840ca3477443..4940249f252427ef093e2fb93f2d9497c4f07ca6 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 53e27bc5a734214cb9b76e2db9fec5cea0fbdf26..54a225e56a64f33188a8cdd05d31ad157431fb9b 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 14b8b8ed802367c15c814f87695372856d3ca1af..567a4899a0186a2667295bba73a0918ecbb33b1b 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 22b1a3ce2c942361ede66d348137edee3ef4d2d9..7d077bb2f525c1190f291ee9536e37d0c1d3cea4 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 02e6caad4a7610718bb4d52df924a86ef5bf10e4..507e1f0bbdfd942eec8bb0d1b0ecdc2c4b7896e1 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 3023ceaa8d544d8d0c52a53d0dff2dc13facbd6c..6de3a99d4cd4efa3b54fd154ce89bbba0e76b94f 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 b9d8ee69ca6c8d28bd02cd18f813d9a50cc21134..afacf4416c738941287f944d599dd13011b6caf6 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 7b3463639422f387115dd2f07c53110216ac2a53..a60aaa7635f36857777acdc3fd906246c4da56ec 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 284a7becbe96ae814f9dc376a6679ebc75467668..cf29c4953028dbeaf2cd33a25c1a0c8dd184826b 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 277fd609611aec1a92eb5717c21724425ce4f61a..24afef81af39af0781b0735e61d1b4cc96b7c059 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 ec524614e7087c42e3337614b319e2a2f67278ca..de3446372ddc04cf4c7aa037703a82fa8d022ae8 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 546dcdd8678562b3795c31eb3e0248caa5c828ab..0b33d6c887b91a3600e9b26bdee1b2e1d825f112 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 6687be167f5f67c6d6b30c5c6b24d3cfd19a7346..d7b3b418fb45739e82efdc20a6a2477270511842 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 87730e944132b9b11455c31cd363a0d51418fcfb..7d41f99f70522b4683803c84485b74c081da2724 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 d3b7e37c9eedb0f64df524be51d597fad1e8eba8..c28c41b3180bc585dd182aa983cda8abc46ba419 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 23d5505cb1f779cf551730065e36e84580852975..15c9ed2be85326f7fa9bd9d72cdcd70eefed9469 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 b7f522c8f023d48686d40d7267196d6d296b6e44..6b282e85d039553a60e507d8241b36ea78cecd2e 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 9829979f2bddf6b71c4b1d23a31f6db303535832..647c7b6e675616a13fbfd16f5a368a620bf3b9ec 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 efc971ab7d6512dbc47607bd25d6d976f28ddff6..8a58a1b85aa097cd34d5204c6ef1b0dbc043f7df 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 41994fe7fbb8a20c95e4505ad6878938a5381a7f..0fe87f1aef16eeda12bb34545bb44ddeeb5fdf21 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 8e7dec1176c9f06c9d39bc7a16cb7bbbace8d149..846d1132feb1133faf08cbc8f65124d30f783308 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 2adfcf329e159c16795948dde91cc293fb3b35a5..1d5b360eb25be101ff0402f301cfbb163adc7240 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 dcd7a6adbbbcc196c7b8d12a6a57714e85617769..a7234e60e9858c29fbf80cd10bf06a649ee9e898 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 7f8e066b12a3d20b79a986a7e771d65eef3a332c..f8427afeebdfb2017043e753888a9aa8d0250ad7 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 78277ed0833948baffeaabf6fcc9961e2fd4913a..ea55ab4f984924937feca72f00cb056d02bc1993 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 daf4ad37896d1f13c627229070fb6893fc9e8474..4929dbdbc8f0f5082ca157965451a1e413d9f539 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 f23593d6add4857f146527e29b130fed13c47ff9..ddc84af6336e727d5eaa1ec4799e4c38e49a9333 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 c5f6ce19a4019ae87c683f07cc0fbc1ee3b4563d..cd7995b3aed4a3c06096a4e2ae0d56f4a3a3c9c3 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 ff06032c0f061eb0fba27442a13fe5dbb559c214..dd9731c29a79b125a9ea31359822d4b48413df31 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 ef7d2c2d8f0b0067fabf069e547a456afde52fc9..1f15497f00d10dd4319317a0a312ac8be4d2f2f5 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 bc1710315088a7304cfaa86bc9237f7ca0afd75f..96e26e70c63debb1087fe55f0bb7849e49739301 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 006b16c260176d36a1ff445137ff48678ff8be5c..5d54e36ab4536eb151acf54cf4a11c89dd9796de 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 59e46f257c02361c329d9df0af31da6167c95903..3f2c68f4e9598a58df4896c9bb0ea128fb46bbec 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 a54ca84eb3625e15a6fe48fdd0b0469d6b6f5f35..9d0919ebf7b00286153f354bd77a026d6a066c24 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 fbe782348b0bcf0111971398ac0dc752b2f6e92d..61f6315fce9f44cb888c37866aa2743968254f8f 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 078a22728c6b847eb01a6fdb24a64b220d4dfd7e..b1f5f680bc783c7cca12adefd708a5de0ee97272 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 58b4517ce71277b2d7c533d0cc43b0052a58f975..3f4602b8f287252d74b6697d64142229f09e63be 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>
@@ -45,6 +46,8 @@
 #include <linux/power_supply.h>
 #endif
 
+#define PREFIX "ACPI: "
+
 #define ACPI_BATTERY_VALUE_UNKNOWN 0xFFFFFFFF
 
 #define ACPI_BATTERY_CLASS             "battery"
@@ -85,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;
@@ -112,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);
@@ -390,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;
 }
 
@@ -495,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);
@@ -513,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 0c4ca4d318b32b94dcd69d3324d8172d71efa0e7..e56b2a7b53db2dcc4735287edaeb10a7c54a3d56 100644 (file)
@@ -34,6 +34,8 @@
 #include <acpi/acpi_bus.h>
 #include <linux/dmi.h>
 
+#include "internal.h"
+
 enum acpi_blacklist_predicates {
        all_versions,
        less_than_or_equal,
index 2876fc70c3a9b71915ef016f1ade1fa235c8db3f..135fbfe1825c94a5052fef82c0970e6e1f20fdcc 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 9195deba9d945b1ca92d0523ee5053666b8e6c49..d295bdccc09ccc4c8c459dfeb2a10be64ec2f019 100644 (file)
@@ -33,6 +33,8 @@
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 
+#define PREFIX "ACPI: "
+
 #define ACPI_BUTTON_CLASS              "button"
 #define ACPI_BUTTON_FILE_INFO          "info"
 #define ACPI_BUTTON_FILE_STATE         "state"
index 332fe4b217085ea9a188a5b48183df87aafe0636..6c9ee68e46fb0a1873d05d03b2ec4ce74b72921f 100644 (file)
@@ -28,6 +28,8 @@
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 
+#define PREFIX "ACPI: "
+
 ACPI_MODULE_NAME("cm_sbs");
 #define ACPI_AC_CLASS          "ac_adapter"
 #define ACPI_BATTERY_CLASS     "battery"
index fe0cdf83641a3b5a0ddcf022e520941c1be10d92..642bb305cb65a66cc16a84894be9bb11a2175d27 100644 (file)
@@ -35,6 +35,8 @@
 #include <acpi/acpi_drivers.h>
 #include <acpi/container.h>
 
+#define PREFIX "ACPI: "
+
 #define ACPI_CONTAINER_DEVICE_NAME     "ACPI container device"
 #define ACPI_CONTAINER_CLASS           "container"
 
@@ -200,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;
@@ -240,7 +239,7 @@ container_walk_namespace_cb(acpi_handle handle,
        }
 
       end:
-       kfree(buffer.pointer);
+       kfree(info);
 
        return AE_OK;
 }
index a8287be0870e7bc06d7dc21963c32e0996a6e623..8a690c3b8e234734df9ec63d1667c98671bc621a 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 efb959d6c8a98c654e88e8de4ce6056ac26482aa..3a2cfefc71ab1ab5da484b47bd9bd7f28aee988a 100644 (file)
@@ -33,6 +33,8 @@
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 
+#define PREFIX "ACPI: "
+
 #define ACPI_DOCK_DRIVER_DESCRIPTION "ACPI Dock Station Driver"
 
 ACPI_MODULE_NAME("dock");
@@ -231,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 391f331674c74c812fddce14203073ceb083a2dd..f70796081c4c0ad93c0e5c751cc2297b81dea9f4 100644 (file)
 #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"
 #define ACPI_EC_FILE_INFO              "info"
 
-#undef PREFIX
 #define PREFIX                         "ACPI: EC: "
 
 /* EC status register */
@@ -68,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 */
@@ -170,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);
@@ -201,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)
@@ -236,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 */
@@ -281,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;
@@ -295,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);
@@ -314,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;
@@ -345,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);
@@ -354,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;
@@ -365,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)
@@ -375,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)
@@ -386,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;
 }
@@ -398,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);
 }
 
 /*
@@ -466,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);
@@ -487,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;
 
@@ -570,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;
 }
 
@@ -617,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);
@@ -638,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:
@@ -788,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,
@@ -802,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);
 
@@ -837,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)
@@ -851,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);
@@ -888,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))
@@ -1054,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;
 }
@@ -1064,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;
 }
@@ -1077,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 aeb7e5fb4a043b2fbacf8245b3bb4ccabf5a0691..c511071bfd79bfac075012eb52f90d9a45646acc 100644 (file)
@@ -14,6 +14,8 @@
 #include <net/netlink.h>
 #include <net/genetlink.h>
 
+#include "internal.h"
+
 #define _COMPONENT             ACPI_SYSTEM_COMPONENT
 ACPI_MODULE_NAME("event");
 
index 53698ea0837139996e6ae845168cc6e3b2337bdf..f419849a0d3f04d8c0f55585e185e42a7d4fdaa5 100644 (file)
@@ -34,6 +34,8 @@
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 
+#define PREFIX "ACPI: "
+
 #define ACPI_FAN_CLASS                 "fan"
 #define ACPI_FAN_FILE_STATE            "state"
 
index a8a5c29958c81faaea6b007626e40ee225ec0275..c6645f26224b2c820375a1a50d53312e1d541048 100644 (file)
@@ -12,6 +12,8 @@
 #include <linux/rwsem.h>
 #include <linux/acpi.h>
 
+#include "internal.h"
+
 #define ACPI_GLUE_DEBUG        0
 #if ACPI_GLUE_DEBUG
 #define DBG(x...) printk(PREFIX x)
@@ -93,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;
 }
@@ -121,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 11a69b53004e0caed4a8228f60fd2a164da18cb5..074cf8682d525d486306d800dd0283baa1c8017b 100644 (file)
@@ -1,4 +1,24 @@
-/* For use by Linux/ACPI infrastructure, not drivers */
+/*
+ * acpi/internal.h
+ * For use by Linux/ACPI infrastructure, not drivers
+ *
+ * Copyright (c) 2009, Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope 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 St - Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#define PREFIX "ACPI: "
 
 int init_acpi_device_notify(void);
 int acpi_scan_init(void);
index d440ccd27d91485c71d27f966df7697e953a8bc8..202dd0c976a32e4486bb358f90fa078885ac0dbe 100644 (file)
@@ -30,6 +30,8 @@
 #include <linux/acpi.h>
 #include <acpi/acpi_bus.h>
 
+#define PREFIX "ACPI: "
+
 #define ACPI_NUMA      0x80000000
 #define _COMPONENT     ACPI_NUMA
 ACPI_MODULE_NAME("numa");
index 5691f165a9527f209c7fcac6febbd73cae43bb65..56071b67bed58f055150fbf0d23ead4ebe369bb5 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 b794eb88ab9030506873ab6879ab05860cc083b8..843699ed93f25b9ce5613c6ca250f9509bfecf07 100644 (file)
@@ -40,6 +40,8 @@
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 
+#define PREFIX "ACPI: "
+
 #define _COMPONENT             ACPI_PCI_COMPONENT
 ACPI_MODULE_NAME("pci_irq");
 
index 16e0f9d3d17cb49a25cf76f68e04ff9042ece566..394ae89409c2bdee53ddaf0f5045787bba6e3401 100644 (file)
@@ -43,6 +43,8 @@
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 
+#define PREFIX "ACPI: "
+
 #define _COMPONENT                     ACPI_PCI_COMPONENT
 ACPI_MODULE_NAME("pci_link");
 #define ACPI_PCI_LINK_CLASS            "pci_irq_routing"
index 31b961c2f22f483f61222ac75a426ca2b701a367..31122214e0ec68c92b7da6020789fcb61daed48e 100644 (file)
@@ -36,6 +36,8 @@
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 
+#define PREFIX "ACPI: "
+
 #define _COMPONENT             ACPI_PCI_COMPONENT
 ACPI_MODULE_NAME("pci_root");
 #define ACPI_PCI_ROOT_CLASS            "pci_bridge"
index 12158e0d009bc9fe8cd9fee9867500a84a0804a3..45da2bae36c8fabb4e7ced5023c7e6c10aca5b60 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));
index 5a09bf392ec1c815da28d1d1d69b5f963578b3f3..22b297916519d5fe6580c986cfe54b522aad5beb 100644 (file)
 #include <linux/seq_file.h>
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
-
 #include "sleep.h"
 
+#define PREFIX "ACPI: "
+
 #define _COMPONENT                     ACPI_POWER_COMPONENT
 ACPI_MODULE_NAME("power");
 #define ACPI_POWER_CLASS               "power_resource"
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 2cc4b3033872979bd7a1fbeeae055ca077aba227..c2d4d6e0936469a8ef5e80a11dd36a99d7be761e 100644 (file)
@@ -59,6 +59,8 @@
 #include <acpi/acpi_drivers.h>
 #include <acpi/processor.h>
 
+#define PREFIX "ACPI: "
+
 #define ACPI_PROCESSOR_CLASS           "processor"
 #define ACPI_PROCESSOR_DEVICE_NAME     "Processor"
 #define ACPI_PROCESSOR_FILE_INFO       "info"
@@ -79,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);
@@ -101,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,
@@ -110,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,
@@ -118,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;
@@ -316,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)
@@ -388,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)
 {
 
@@ -405,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 */
 
@@ -698,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);
@@ -846,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)
@@ -865,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)
@@ -942,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)) {
@@ -957,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;
 }
 
@@ -995,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,
@@ -1030,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,
@@ -1161,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.
@@ -1193,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;
 }
@@ -1213,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 66393d5c4c7c9ccff78ea22f4635f6e1a14694f7..cc61a6220102e50e73d89163ce94a4e762f72f3d 100644 (file)
@@ -60,6 +60,8 @@
 #include <acpi/processor.h>
 #include <asm/processor.h>
 
+#define PREFIX "ACPI: "
+
 #define ACPI_PROCESSOR_CLASS            "processor"
 #define _COMPONENT              ACPI_PROCESSOR_COMPONENT
 ACPI_MODULE_NAME("processor_idle");
@@ -680,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;
@@ -759,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
@@ -1160,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)
@@ -1217,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),
@@ -1225,6 +1230,7 @@ int __cpuinit acpi_processor_power_init(struct acpi_processor *pr,
                                 acpi_driver_data(device));
        if (!entry)
                return -EIO;
+#endif
        return 0;
 }
 
@@ -1237,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 60e543d3234ea8528b2e55537511690ee3be0d96..11088cf103197895e79a94359692d16552c4be73 100644 (file)
@@ -39,6 +39,8 @@
 #include <acpi/acpi_drivers.h>
 #include <acpi/processor.h>
 
+#define PREFIX "ACPI: "
+
 #define ACPI_PROCESSOR_CLASS           "processor"
 #define ACPI_PROCESSOR_FILE_PERFORMANCE        "performance"
 #define _COMPONENT             ACPI_PROCESSOR_COMPONENT
index 31adda1099e0d451f68ef399b8f8c0f5832f21c5..140c5c5b423c6361fabb3535e362eb9c18e71fb3 100644 (file)
@@ -40,6 +40,8 @@
 #include <acpi/processor.h>
 #include <acpi/acpi_drivers.h>
 
+#define PREFIX "ACPI: "
+
 #define ACPI_PROCESSOR_CLASS            "processor"
 #define _COMPONENT              ACPI_PROCESSOR_COMPONENT
 ACPI_MODULE_NAME("processor_thermal");
@@ -438,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;
@@ -517,3 +519,4 @@ const struct file_operations acpi_processor_limit_fops = {
        .llseek = seq_lseek,
        .release = single_release,
 };
+#endif
index ae39797aab55cc860debf1a749a1cf858edd9b64..ce7cf3bc5101fb37743740f9c9b34def03ac82ae 100644 (file)
@@ -41,6 +41,8 @@
 #include <acpi/acpi_drivers.h>
 #include <acpi/processor.h>
 
+#define PREFIX "ACPI: "
+
 #define ACPI_PROCESSOR_CLASS            "processor"
 #define _COMPONENT              ACPI_PROCESSOR_COMPONENT
 ACPI_MODULE_NAME("processor_throttling");
@@ -1216,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)
 {
@@ -1324,3 +1326,4 @@ const struct file_operations acpi_processor_throttling_fops = {
        .llseek = seq_lseek,
        .release = single_release,
 };
+#endif
index 4b214b74ebaa71c69fb1e3ed8193fdebd5c80d3d..52b9db8afc20296ba11ec32ec7a10f5041f653dc 100644 (file)
@@ -46,6 +46,8 @@
 
 #include "sbshc.h"
 
+#define PREFIX "ACPI: "
+
 #define ACPI_SBS_CLASS                 "sbs"
 #define ACPI_AC_CLASS                  "ac_adapter"
 #define ACPI_BATTERY_CLASS             "battery"
index 0619734895b29232d8f3b1e960efb8b777e808c5..d9339806df45d86da6fcf2a3713edb070d8b0c45 100644 (file)
@@ -15,6 +15,8 @@
 #include <linux/interrupt.h>
 #include "sbshc.h"
 
+#define PREFIX "ACPI: "
+
 #define ACPI_SMB_HC_CLASS      "smbus_host_controller"
 #define ACPI_SMB_HC_DEVICE_NAME        "ACPI SMBus HC"
 
index 318b1ea7a5bf4c9df8a35bb251d7773a5a296b39..408ebde18986d95d47ac6dbbe33e23d1fb58e349 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 feece693d773be300959d1bb1f8b58c975d05e79..a90afcc723ab396d9dc1b215553f14ba47f51fcd 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 9c61ab2177cf11a558f67877cff45709c3698a06..d11282975f353a277863ea6315a5b31a8447e07d 100644 (file)
@@ -31,6 +31,8 @@
 
 #include <acpi/acpi_drivers.h>
 
+#define PREFIX "ACPI: "
+
 #define _COMPONENT             ACPI_SYSTEM_COMPONENT
 ACPI_MODULE_NAME("system");
 
index 646d39c031caa4cc6de4a9884fea83fdf945e92a..f336bca7c4503ec1d03d7741ee8185afae942381 100644 (file)
@@ -213,6 +213,9 @@ acpi_table_parse_entries(char *id,
        unsigned long table_end;
        acpi_size tbl_size;
 
+       if (acpi_disabled)
+               return -ENODEV;
+
        if (!handler)
                return -EINVAL;
 
@@ -277,6 +280,9 @@ int __init acpi_table_parse(char *id, acpi_table_handler handler)
        struct acpi_table_header *table = NULL;
        acpi_size tbl_size;
 
+       if (acpi_disabled)
+               return -ENODEV;
+
        if (!handler)
                return -EINVAL;
 
index 564ea14242880f161cdea6a3aec51967b923427b..65f67815902a2d18c0f1df09e48210af86002568 100644 (file)
@@ -47,6 +47,8 @@
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 
+#define PREFIX "ACPI: "
+
 #define ACPI_THERMAL_CLASS             "thermal_zone"
 #define ACPI_THERMAL_DEVICE_NAME       "Thermal Zone"
 #define ACPI_THERMAL_FILE_STATE                "state"
index f844941089bb30786b143bee118e9e1e9b1cac54..811fec10462b7f41b89bcc0735b3b99c1819a6b3 100644 (file)
@@ -30,6 +30,8 @@
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 
+#include "internal.h"
+
 #define _COMPONENT             ACPI_BUS_COMPONENT
 ACPI_MODULE_NAME("utils");
 
index 60ea984c84a02c651b606d6d42aa4b3610c21882..94b1a4c5abab26978503835e4b5a9bf965776c6d 100644 (file)
 #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>
 
+#define PREFIX "ACPI: "
+
 #define ACPI_VIDEO_CLASS               "video"
 #define ACPI_VIDEO_BUS_NAME            "Video Bus"
 #define ACPI_VIDEO_DEVICE_NAME         "Video Device"
@@ -198,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;
 };
 
@@ -387,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;
@@ -417,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;
 
@@ -603,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";
@@ -618,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?
@@ -870,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;
@@ -892,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;
 
@@ -934,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;
        }
@@ -990,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");
@@ -1039,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;
        }
@@ -2009,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 7cd2b63435ea1bf1464d2a8dbac17650cbd12dc4..7032f25da9b5d1e5d919c9b702c20efceb395cbb 100644 (file)
@@ -38,6 +38,8 @@
 #include <linux/dmi.h>
 #include <linux/pci.h>
 
+#define PREFIX "ACPI: "
+
 ACPI_MODULE_NAME("video");
 #define _COMPONENT             ACPI_VIDEO_COMPONENT
 
index 122c786449a90d1c2f401232b127dfa9d26d10b5..d0a7df2e5ca78472e888f7d04169313e9930d5cc 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 91d4087b4039490a844d23e909ffe34eaa0ff0f9..1fe5536d404f134e53b61324f9350c11080337dc 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 1e6b7c14f697c58b7ad5f551e6f947d2fe7719a2..6fa7b0fdbdfd172f2e10f27bc82660c9201f3234 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 2f07b7c99a95b5046b121572f956c1048dc29894..0552258390240ae8f71ebf89d09c4542eff749e9 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 b6cd571adbf20630f1c8920043f32d4e68efa44a..3af97d4da2db7ac30dc808da80b036acbd848256 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 3ff02941b3dd40c57ca9a2cc56d7442c5cd538cb..847a9e57570ae4721b5130fcda9aaf8315219b35 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 4bf8705b3acede5f1558e1f44c168abe5be73d3f..4f688434daf1a220c95050f82bd4a5c9e1a5d277 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 d8372b432826dd49457c1df19691bc06dea7eb3c..24c3e21ab263a6a685356f7d17ac5c0c097e60b6 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 44fa2018f6b027b8b5bb77504bef118a813168e3..b82d438e2607cc2c430e4b170470ac29e47c3fb2 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 2b387c2260d829e9f441ecc08a98b823de10ba52..5c01f747571b9fe34f54de72d5fa5f03641c17d7 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 f9d01608cbe2740d2bbc6e98045f6f1f1b34db22..d5cdce08ffd2765aa1f5b3cc83b399093bbf09e7 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 bbb79441d8956a7d45b56bffd0df769c63639425..edda9ea7c626afeb6ba08b7700dfc8c46f531016 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 6d7fbaa922486dc2731ccb50480a1c2184718ea6..e0339aaa18154303316c8405d72c08af4b036ffd 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 5d23ffad7c77fc31d97ff1d5e3fed081dffe16c3..cc923a5b430c51d11f0cc4fd1b2c32405c72ca6a 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 13c1aee6aa3f47f2f1cc847452257ac88443a958..a808b1530b3bd344c290e0fed84e5d35e72d8338 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 9f3518c515a15c57168f9e5fd57b073812a997ba..8866ca369d5e5e1814c27eab1b3c53fb5ff0777b 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 bf5955b3d873511d25e31c162d7ee4280a6cc14c..569e39e8f1143fd4c896344fa25e3e653f8e6a89 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 68a90834e99388c366874be2fe4ea554e266831f..ea54ea393553831c6ba4a2066e9cb63859cd4e5b 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 fd5bb8ad59a9fc5aaf35fdb93694562dd9d0b061..2ddf03ae034e1aa552d6740ee171c6739f9335bd 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,
index 34cbb7f3efa89e5504920d547b081c86fe9ca4e9..03a130dca8ab541ad81bbb7db2095da6a5a26551 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 c8753a9ed290766c84cf3f7cd9da4b096b789270..3bb7c47c869fa5c3749acc689cfc427920b7caf1 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 cbfd9c0aef034ffd2778aaac37eec3fd4d33a61e..411f064760b41db69a4ffae999b92f24b89fba3b 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 cf7877fb8a7d721b0ddbff0c0cced731e8c3e9fc..8f569e3df8903d3fc8103c824fa212f5ef058948 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 80df93e3cdd05f0d9c219b6d18bbf8b7a6de517d..6380ad8d91bd71a374fd5ace2a63be8b532f48cf 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 f5cd2e83ebcc6757992cd59834d5f2e9ebb1d183..a7c4184f4a63355539976a010e0c50700d4c5318 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 cc54473b8e77fa857d37eff69a053ff16b20c89c..c739b203fe91321b955905b72c3eab3e93f8d821 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 858c34dd032d27d31cadb2112e7bc36ec36fe8de..ad1ba393801ae4fe222d0117a1bd7d6a6fedc187 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 b441ce3832e9ff7a403fed425d79ca354aace97b..a8c8b56b275e546e02819d7889801b5545dbafb7 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 aa1a3d5a3e2bc3f202bb695da2624f4d8cfd03b5..43f19389647a99b4efb7e78ce556e94153189197 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 ce2429219925597edddb597ed88c09ff37c48b75..0877d3628fdae251f48b87d87fffeb1e9d11df29 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 e53284767f7c9e59b89c6fe1611487526dee081c..b8578bb3f4c9c4393c83be80ddaa36eccc073264 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 b20abe102a2b774d66cc4505508762bbed86b8d0..e5c5415eb45eb7a7e8f350427be29fcfe2fb3eec 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 b2590409f25efb1911dc8e87a4d88c2dc0b3d719..64f941e0f14b07180ebe1089786f1842a22b7b94 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 b5621f27c4be8052192a56b29f83bd95820594e9..a762283d2a219a967b0f5aeb18da61ab238da5e9 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 0fff646cc2f0904bc5539d052628420e899a0957..57ca69e0ac553a086ec1751441188c6415f4fe56 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 ad87753f6de44ecb277c2904c214271cd8078d1f..a56ca080e108f20e6680bc774f4fb7eb680edf21 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 501e293e5ad0a1117f5b647f220a002799cef4c3..9047b2714653c54ef3c0130f30e09cd98e0bc534 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 20ef1bf5e726070103e70beb9b71be5424c42dcd..703959eba45a37d9b914fcf0b19e717f7bd88f2b 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 ff647ca1c4895d9f08049ea840496b86b40fbf28..9d589e3144de8f0541ba1cd2399e3c49c18f30e5 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 32216b623248497b1bade240792aa0e77a0c080e..962968f05b9421dd0182677a874be7795cce0990 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 a261bd735dfbddd724974218bc5006c3ccabd30d..2e66b5f773dd052ae4100b1614099f1ab300b83b 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 1ee27cc23426d2f96de2000411cafadb06030c4a..07fa612a58d56efd23a24a3cb7f5ec61052b5190 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,
index 881934c068c84e1c3599b5581a65bc7dca8d1ebf..c250a31efa537c1f15ab8466b20bcc779ba214f3 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 1f32b520ca26c14dc231c69ddd4001d4a5a6eb44..45d58002b06c0087ad5ece5a2bbb14a844f574c0 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");
 
index 0c2f55a38b954d56a1eba026e8b9c65718af1286..bf2170fb1cdd7d1d01581aeb9b5abe129a42d32b 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 c74dacfa67950f870dcc4ffd7a71fa18dc915b27..0d328b59568d46f33c7b6e44c676c6709dea2371 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 85e5dc0431fece279a7324df2a18c01e8808468f..abf4a2529f8011c6d4dbd87dc4412c8925dca41c 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 f1df59f59a37710e4c0370e993ae786f2bddbc4b..68104434ebb51c98c4b3b81e599df006840891ce 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 871c13b4c1489587a91a12a9503aa73ff6dd1670..12f355cafdbedf780283d64efe56bdb0a1a684fc 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 f74edae5cb4cfce68726102cca77711865003bc5..e4864e894e4f84877cb9a6dfa8c9467194ee2e6b 100644 (file)
@@ -444,16 +444,13 @@ int fw_card_add(struct fw_card *card,
        card->guid = guid;
 
        mutex_lock(&card_mutex);
-       config_rom = generate_config_rom(card, &length);
-       list_add_tail(&card->link, &card_list);
-       mutex_unlock(&card_mutex);
 
+       config_rom = generate_config_rom(card, &length);
        ret = card->driver->enable(card, config_rom, length);
-       if (ret < 0) {
-               mutex_lock(&card_mutex);
-               list_del(&card->link);
-               mutex_unlock(&card_mutex);
-       }
+       if (ret == 0)
+               list_add_tail(&card->link, &card_list);
+
+       mutex_unlock(&card_mutex);
 
        return ret;
 }
index 479b22f5a1eb7889162643741357fdd6cd8948b4..da628c72a4621da3db2cdaf1cd564a555d5dde3f 100644 (file)
@@ -834,7 +834,7 @@ static void handle_topology_map(struct fw_card *card, struct fw_request *request
 }
 
 static struct fw_address_handler topology_map = {
-       .length                 = 0x200,
+       .length                 = 0x400,
        .address_callback       = handle_topology_map,
 };
 
index 6052816be353e899b540394afa05747f7dc1d2c0..7ff6e7585152332f7cf261036920555b06c0528c 100644 (file)
@@ -96,6 +96,20 @@ int fw_core_initiate_bus_reset(struct fw_card *card, int short_reset);
 int fw_compute_block_crc(u32 *block);
 void fw_schedule_bm_work(struct fw_card *card, unsigned long delay);
 
+static inline struct fw_card *fw_card_get(struct fw_card *card)
+{
+       kref_get(&card->kref);
+
+       return card;
+}
+
+void fw_card_release(struct kref *kref);
+
+static inline void fw_card_put(struct fw_card *card)
+{
+       kref_put(&card->kref, fw_card_release);
+}
+
 
 /* -cdev */
 
index 76b321bb73f9419aa52c826a944047388d53cd0a..5d524254499ed154b6585c328e6b5a88413792db 100644 (file)
@@ -1279,8 +1279,8 @@ static void bus_reset_tasklet(unsigned long data)
         * the inverted quadlets and a header quadlet, we shift one
         * bit extra to get the actual number of self IDs.
         */
-       self_id_count = (reg >> 3) & 0x3ff;
-       if (self_id_count == 0) {
+       self_id_count = (reg >> 3) & 0xff;
+       if (self_id_count == 0 || self_id_count > 252) {
                fw_notify("inconsistent self IDs\n");
                return;
        }
index e5df822a8130ca99730a009c75cf3ea454bfccab..50f0176de61590e82b5ac2c0420139b8fe3bf1ea 100644 (file)
@@ -354,8 +354,7 @@ static const struct {
        /* DViCO Momobay FX-3A with TSB42AA9A bridge */ {
                .firmware_revision      = 0x002800,
                .model                  = 0x000000,
-               .workarounds            = SBP2_WORKAROUND_DELAY_INQUIRY |
-                                         SBP2_WORKAROUND_POWER_CONDITION,
+               .workarounds            = SBP2_WORKAROUND_POWER_CONDITION,
        },
        /* Initio bridges, actually only needed for some older ones */ {
                .firmware_revision      = 0x000200,
@@ -425,19 +424,20 @@ static void sbp2_status_write(struct fw_card *card, struct fw_request *request,
        struct sbp2_logical_unit *lu = callback_data;
        struct sbp2_orb *orb;
        struct sbp2_status status;
-       size_t header_size;
        unsigned long flags;
 
        if (tcode != TCODE_WRITE_BLOCK_REQUEST ||
-           length == 0 || length > sizeof(status)) {
+           length < 8 || length > sizeof(status)) {
                fw_send_response(card, request, RCODE_TYPE_ERROR);
                return;
        }
 
-       header_size = min(length, 2 * sizeof(u32));
-       fw_memcpy_from_be32(&status, payload, header_size);
-       if (length > header_size)
-               memcpy(status.data, payload + 8, length - header_size);
+       status.status  = be32_to_cpup(payload);
+       status.orb_low = be32_to_cpup(payload + 4);
+       memset(status.data, 0, sizeof(status.data));
+       if (length > 8)
+               memcpy(status.data, payload + 8, length - 8);
+
        if (STATUS_GET_SOURCE(status) == 2 || STATUS_GET_SOURCE(status) == 3) {
                fw_notify("non-orb related status write, not handled\n");
                fw_send_response(card, request, RCODE_COMPLETE);
index d5ea8a68d338ef80996d20dd0bbbf4e27d3fafc0..56f9234781faadc4cbb38813ffefa8d77b781ebe 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 6b4c484a699a9f07ca4caa9a9dbfb2b5e9ab99df..2ad0128c63c6995ab11fa7f3e2896bad968fe9f3 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 ea7c745f26a8066f3216e1bdd967ada09838574c..00a532c9a1e294afcf6c6224d1b32e6bdda8068e 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 984b587f0f96eb796c6b8971d1e5564973a6ae05..2559f2289409f13c431bd60d9ff95a503813b8b1 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 51a8d4103be53beb3dd90bd1328d89935cf6573c..bb11a429394ab865f7e07cfc289d8a32330bd320 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 7b82eaae26218c6edb6195b06fb414c790db2c44..480956f1ca50560c58f2c389b99bdbdf6036f38e 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 f6fae0e50e654731e2fc235b6d562e2a669b3627..cd651ec8d0349e1621e0ef941dea3db489d86c0c 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 cdb6574d25a698a26fd7c428037ae836cc4929dd..6a2fb3fbb3d965bae1956b0bf9b3bc6f307b22c7 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 9525724be731d400f781a36e2354c76b8c5ff699..29f19ce3e80f192b071277a69bf1da9b67b8627f 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 2b914d73207681b15fec693677fa2866d437b77f..f4856a510476bcfc117f60ad334d06293d93cd89 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 b710fab21cb375e946d19ec099a1c1c81208a72a..a53b848e0f17cbbceb062d3b8ff648098deb0985 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,
index dde2ccbf1d152119425ee582666654a0567b8b38..d988eece0187253787397d3265bf07f0a6fe1e89 100644 (file)
@@ -737,7 +737,7 @@ r600_blit_copy(struct drm_device *dev,
 
                        /* dst */
                        set_render_target(dev_priv, COLOR_8_8_8_8,
-                                         dst_x + cur_size, h,
+                                         (dst_x + cur_size) / 4, h,
                                          dst_gpu_addr);
 
                        /* scissors */
index 0a6f4681f468025dc0712d66c729cd4c7a40a90c..acae33e2ad51cd26c9bb2152c4b261b279c0aff7 100644 (file)
@@ -774,7 +774,7 @@ void r600_kms_blit_copy(struct radeon_device *rdev,
 
                        /* dst 23 */
                        set_render_target(rdev, COLOR_8_8_8_8,
-                                         dst_x + cur_size, h,
+                                         (dst_x + cur_size) / 4, h,
                                          dst_gpu_addr);
 
                        /* scissors 12  */
index c839b608970fb4d2bc2d845c4b57a47d3a20ad61..6311b1362594bfa55c8d569464253ffb31299fa8 100644 (file)
@@ -49,6 +49,7 @@
 #include <linux/list.h>
 #include <linux/kref.h>
 
+#include "radeon_family.h"
 #include "radeon_mode.h"
 #include "radeon_reg.h"
 
@@ -77,64 +78,6 @@ extern int radeon_tv;
 #define RADEONFB_CONN_LIMIT            4
 #define RADEON_BIOS_NUM_SCRATCH                8
 
-enum radeon_family {
-       CHIP_R100,
-       CHIP_RV100,
-       CHIP_RS100,
-       CHIP_RV200,
-       CHIP_RS200,
-       CHIP_R200,
-       CHIP_RV250,
-       CHIP_RS300,
-       CHIP_RV280,
-       CHIP_R300,
-       CHIP_R350,
-       CHIP_RV350,
-       CHIP_RV380,
-       CHIP_R420,
-       CHIP_R423,
-       CHIP_RV410,
-       CHIP_RS400,
-       CHIP_RS480,
-       CHIP_RS600,
-       CHIP_RS690,
-       CHIP_RS740,
-       CHIP_RV515,
-       CHIP_R520,
-       CHIP_RV530,
-       CHIP_RV560,
-       CHIP_RV570,
-       CHIP_R580,
-       CHIP_R600,
-       CHIP_RV610,
-       CHIP_RV630,
-       CHIP_RV670,
-       CHIP_RV620,
-       CHIP_RV635,
-       CHIP_RS780,
-       CHIP_RS880,
-       CHIP_RV770,
-       CHIP_RV730,
-       CHIP_RV710,
-       CHIP_RV740,
-       CHIP_LAST,
-};
-
-enum radeon_chip_flags {
-       RADEON_FAMILY_MASK = 0x0000ffffUL,
-       RADEON_FLAGS_MASK = 0xffff0000UL,
-       RADEON_IS_MOBILITY = 0x00010000UL,
-       RADEON_IS_IGP = 0x00020000UL,
-       RADEON_SINGLE_CRTC = 0x00040000UL,
-       RADEON_IS_AGP = 0x00080000UL,
-       RADEON_HAS_HIERZ = 0x00100000UL,
-       RADEON_IS_PCIE = 0x00200000UL,
-       RADEON_NEW_MEMMAP = 0x00400000UL,
-       RADEON_IS_PCI = 0x00800000UL,
-       RADEON_IS_IGPGART = 0x01000000UL,
-};
-
-
 /*
  * Errata workarounds.
  */
index cb0cfe4b3082fe887dd96206606eade22aec644c..350962e0f346f483b02d04d37f48efb3219c2ed0 100644 (file)
@@ -34,6 +34,8 @@
 #include <linux/firmware.h>
 #include <linux/platform_device.h>
 
+#include "radeon_family.h"
+
 /* General customization:
  */
 
 #define DRIVER_MINOR           31
 #define DRIVER_PATCHLEVEL      0
 
-/*
- * Radeon chip families
- */
-enum radeon_family {
-       CHIP_R100,
-       CHIP_RV100,
-       CHIP_RS100,
-       CHIP_RV200,
-       CHIP_RS200,
-       CHIP_R200,
-       CHIP_RV250,
-       CHIP_RS300,
-       CHIP_RV280,
-       CHIP_R300,
-       CHIP_R350,
-       CHIP_RV350,
-       CHIP_RV380,
-       CHIP_R420,
-       CHIP_R423,
-       CHIP_RV410,
-       CHIP_RS400,
-       CHIP_RS480,
-       CHIP_RS600,
-       CHIP_RS690,
-       CHIP_RS740,
-       CHIP_RV515,
-       CHIP_R520,
-       CHIP_RV530,
-       CHIP_RV560,
-       CHIP_RV570,
-       CHIP_R580,
-       CHIP_R600,
-       CHIP_RV610,
-       CHIP_RV630,
-       CHIP_RV620,
-       CHIP_RV635,
-       CHIP_RV670,
-       CHIP_RS780,
-       CHIP_RS880,
-       CHIP_RV770,
-       CHIP_RV730,
-       CHIP_RV710,
-       CHIP_RV740,
-       CHIP_LAST,
-};
-
 enum radeon_cp_microcode_version {
        UCODE_R100,
        UCODE_R200,
        UCODE_R300,
 };
 
-/*
- * Chip flags
- */
-enum radeon_chip_flags {
-       RADEON_FAMILY_MASK = 0x0000ffffUL,
-       RADEON_FLAGS_MASK = 0xffff0000UL,
-       RADEON_IS_MOBILITY = 0x00010000UL,
-       RADEON_IS_IGP = 0x00020000UL,
-       RADEON_SINGLE_CRTC = 0x00040000UL,
-       RADEON_IS_AGP = 0x00080000UL,
-       RADEON_HAS_HIERZ = 0x00100000UL,
-       RADEON_IS_PCIE = 0x00200000UL,
-       RADEON_NEW_MEMMAP = 0x00400000UL,
-       RADEON_IS_PCI = 0x00800000UL,
-       RADEON_IS_IGPGART = 0x01000000UL,
-};
-
 typedef struct drm_radeon_freelist {
        unsigned int age;
        struct drm_buf *buf;
diff --git a/drivers/gpu/drm/radeon/radeon_family.h b/drivers/gpu/drm/radeon/radeon_family.h
new file mode 100644 (file)
index 0000000..797972e
--- /dev/null
@@ -0,0 +1,97 @@
+/*
+ * 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
+ */
+
+/* this file defines the CHIP_  and family flags used in the pciids,
+ * its is common between kms and non-kms because duplicating it and
+ * changing one place is fail.
+ */
+#ifndef RADEON_FAMILY_H
+#define RADEON_FAMILY_H
+/*
+ * Radeon chip families
+ */
+enum radeon_family {
+       CHIP_R100,
+       CHIP_RV100,
+       CHIP_RS100,
+       CHIP_RV200,
+       CHIP_RS200,
+       CHIP_R200,
+       CHIP_RV250,
+       CHIP_RS300,
+       CHIP_RV280,
+       CHIP_R300,
+       CHIP_R350,
+       CHIP_RV350,
+       CHIP_RV380,
+       CHIP_R420,
+       CHIP_R423,
+       CHIP_RV410,
+       CHIP_RS400,
+       CHIP_RS480,
+       CHIP_RS600,
+       CHIP_RS690,
+       CHIP_RS740,
+       CHIP_RV515,
+       CHIP_R520,
+       CHIP_RV530,
+       CHIP_RV560,
+       CHIP_RV570,
+       CHIP_R580,
+       CHIP_R600,
+       CHIP_RV610,
+       CHIP_RV630,
+       CHIP_RV670,
+       CHIP_RV620,
+       CHIP_RV635,
+       CHIP_RS780,
+       CHIP_RS880,
+       CHIP_RV770,
+       CHIP_RV730,
+       CHIP_RV710,
+       CHIP_RV740,
+       CHIP_LAST,
+};
+
+/*
+ * Chip flags
+ */
+enum radeon_chip_flags {
+       RADEON_FAMILY_MASK = 0x0000ffffUL,
+       RADEON_FLAGS_MASK = 0xffff0000UL,
+       RADEON_IS_MOBILITY = 0x00010000UL,
+       RADEON_IS_IGP = 0x00020000UL,
+       RADEON_SINGLE_CRTC = 0x00040000UL,
+       RADEON_IS_AGP = 0x00080000UL,
+       RADEON_HAS_HIERZ = 0x00100000UL,
+       RADEON_IS_PCIE = 0x00200000UL,
+       RADEON_NEW_MEMMAP = 0x00400000UL,
+       RADEON_IS_PCI = 0x00800000UL,
+       RADEON_IS_IGPGART = 0x01000000UL,
+};
+#endif
index 111afbe8de038e949cab63cdf936c63bc4002381..24d90ea246ce95096dd0d74ba3f50b1dcae4b8fc 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 342b7d36d7bbb91d57f33d04f7c00f61dca2ca0b..be34d32906bdd381bb5399e296007a04296f6fd1 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 1b0e07a67d6d079c26848f42b28ce6835bdb6014..03bd703255a3d16311f8d6a50721c7c12ca4b4f0 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 242294db3db6b1d6bca65b9c4208f83f25456df7..5e9e095f11369cc14102ca510a4e0d5ca066d1da 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 b11e06f644b19bb14937c2e5cafcc6e52c898182..afc5943181251404ddd84893f04ef49b8aab3434 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 753b34885f9da3caaa71723e8f3fe3765058d4ed..7ea6a8f66056827970f31f13a3a3cedd135db1fd 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 93c17223b527018271b0febf9b96b4af4d030670..972cf4ba963ce06d8ae2ea65c712ff61e05f74c9 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 9814d51b3af42893b607a5106b2e4030b3b87ecf..2c2cb1ec94c5f1a22ea47a6607c8408a4fe588c7 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 271338bdb6be55e5319349ef90fc127388ded3d9..cf5afb9a10abbd9af3432dce36249a23edfcab0d 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 e320e2f511f160ee7a81dac45fec755575f9ee22..3e1ff46f72d3ac2cdfde3f3bf1b83637513c42b8 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 3827ff04485f9a726c3d5c8f8e6ab1742c309b4e..ecd739534f6a4a76c674fd5323daa8a30fcaf2a7 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 ae6204f33214d4ffa80a61417fe2e4ed669099a5..ab8a5d3c769048a1a15635c09648740bad64e9ef 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 bfaa665ccf324a25d9e40368135f24b876d0b8d6..9ac497271adfa06e160de4811fc8450b0ecf153b 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 6290a259456e8fbae6d5df180cd9825033b46217..303c02694c3ca0b8b07c49786b25c0c1701fe9b4 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 711ca08ab7762ab19f6516c9a5ba24bedcf54c4e..d7ece131b4f4bd64af82fd80160279ffd99a1db5 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 8206442fbabd80eab83424a5997d4c3eeddd2f35..6bedd2fcfc153d231e9fe17572c4c5cdb31c4492 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 e654263bfc01df6442f52b5c39df95589203b698..ff937ac69f5b817c35bf7546006efe4735b8f8b8 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 0249a7d762b94e27ff2ceed3190794ff40ea0dce..a782c7a08f9e1256d40430bf15d050d30791375b 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 ec15cff556b9a9b4d3e8bd12d9d221215bfd0892..6ff6c20f1e78d261d6543b4e633c53aa0f80325c 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 224aa12ee7c85d880118db61cac79a2b564e6af1..dd39c1eb03ed2556537ca38315f9e127dd3cf5bb 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 648ecc6f60e609dc6b0b878c33f4d0e05faa9cc5..cf994bd01d9c2ef34cf0f964578d4c68db12e21a 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 02d746c9c47451ebb0f14f4a28e20735c1185c4f..f9618f4d4e476a3530f6023fe400c1e7e038f835 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 f4680d16ee341fee40cb6d1c3f615ee8a259eb54..749cf360629416bd734c031ce268b6b4254b0a86 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 b96f3025e588245fc498fcaddb78e706bfe03c6e..aa96bd2d27ead9452d08da3bb62065468f1822f2 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 0e45c296d3d22b3230f044a9a75bf360515102b0..8d80fceca6a4aaf8ff9ff1a24851687e684f579e 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 c509c9916464db7c7819a92e2e9888e0340a67a1..c0cf45a11b938cfd4b0d0bb84329535f8151172c 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 b79ca419d8d99f5ad65197adb41462c39ed44bcc..64207df8da82fe5627664777518617bd0facc990 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 214119026b3f4e55eec0c0eb1f60898ecc62e047..753241429c26b4e9b370c72e388a79990a780028 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 8de442cbee948ca7a6fa646654c08c55650d66a4..63c53d65e875222aa0d2cd60c2d9a5f9f1feb0b6 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 9d6f62baac272c94953aec4aa171398cc159f291..58fc920d5c32094c4bddb1be206ebbdf5b2f30c5 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 0608d41fb6d0be24cdccbf58f0eff20c70ab6e5d..60f936e2319cb3fef78dab4f05096f535ebe5b72 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 da5f8829b503d1047c7cb36126033c036ad630ca..0bc3d78ce7b1b8695d3eb25c2aefd216c0277265 100644 (file)
@@ -2272,8 +2272,10 @@ static ssize_t raw1394_write(struct file *file, const char __user * buffer,
                return -EFAULT;
        }
 
-       if (!mutex_trylock(&fi->state_mutex))
+       if (!mutex_trylock(&fi->state_mutex)) {
+               free_pending_request(req);
                return -EAGAIN;
+       }
 
        switch (fi->state) {
        case opened:
index 52b25f8b111d73fad2b4e6b1252b823854190ec2..f199896c41135c7b3117ef96b571dff01f72394c 100644 (file)
@@ -372,8 +372,7 @@ static const struct {
        /* DViCO Momobay FX-3A with TSB42AA9A bridge */ {
                .firmware_revision      = 0x002800,
                .model                  = 0x000000,
-               .workarounds            = SBP2_WORKAROUND_DELAY_INQUIRY |
-                                         SBP2_WORKAROUND_POWER_CONDITION,
+               .workarounds            = SBP2_WORKAROUND_POWER_CONDITION,
        },
        /* Initio bridges, actually only needed for some older ones */ {
                .firmware_revision      = 0x000200,
index 7663a2a9f130430c9ba80a8123d519ca9a1fbad9..7550a534005c9a6d002a8b77284125c9522d6ccd 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 02831ad070b8452ce3a79b3be733d052b4b2b282..4bd39c8af80fe44503dd838d47402f3386e45dd7 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 c9523e48c6ad4240c125e0c168ee77ba1010433c..adb09e2ba3944d8b0649186a14a8221673811429 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 1a50be379cbc6721403f8b0c6a02ac11efa62ccd..76d6751f89a7607784a5293b566d4d3b2f87f36e 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 bf4db626c313ab11fe2d6a52d89c20c6ac8cb13f..a8b84854fb7ba5bed2d0a031763367685b31ea7a 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 ecaeb7e8e75e169c58f0a9c9ef244244e70a38f9..eb83939c705e70141147619b4f550ea368c6b88f 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 5d8a703988077561894a26849a78594b810fc39e..19b4db7e974d75c42eb3f7e9e21e8c19ac8d782e 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 ba9d38c3f412a7a1526f028f5cf2a2c8863f1ed8..09c810999b924137576b8df59e10e5be8feb667b 100644 (file)
@@ -1256,3 +1256,4 @@ module_exit(ads7846_exit);
 
 MODULE_DESCRIPTION("ADS7846 TouchScreen Driver");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("spi:ads7846");
index 252eb11fe9db141118aef9b086c5590eb588d063..f944918466e5bd24d2909a0081b975cb3be770f7 100644 (file)
@@ -561,6 +561,7 @@ static void wm97xx_ts_input_close(struct input_dev *idev)
 static int wm97xx_probe(struct device *dev)
 {
        struct wm97xx *wm;
+       struct wm97xx_pdata *pdata = dev->platform_data;
        int ret = 0, id = 0;
 
        wm = kzalloc(sizeof(struct wm97xx), GFP_KERNEL);
@@ -658,6 +659,7 @@ static int wm97xx_probe(struct device *dev)
        }
        platform_set_drvdata(wm->battery_dev, wm);
        wm->battery_dev->dev.parent = dev;
+       wm->battery_dev->dev.platform_data = pdata;
        ret = platform_device_add(wm->battery_dev);
        if (ret < 0)
                goto batt_reg_err;
@@ -671,6 +673,7 @@ static int wm97xx_probe(struct device *dev)
        }
        platform_set_drvdata(wm->touch_dev, wm);
        wm->touch_dev->dev.parent = dev;
+       wm->touch_dev->dev.platform_data = pdata;
        ret = platform_device_add(wm->touch_dev);
        if (ret < 0)
                goto touch_reg_err;
index bff72d81f2636781d444d7180be11c9937207fa5..9f8f67b6c07f637498fb80813ce3a5d947533f7c 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 16f2e465e5f90df5e24634ddcdf9849c32313780..26626eead82857408fb7729e1f59b530b5a6d2b3 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 50ed778f63fc84cd3c31da19a15b1f6bd60f5754..09d4db764d22736e344085ce9d1b35d71791da5a 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 7188c59a76ff7eda195059786bd4ea7e48a200f5..adb1e8c36b468ad736a3f9846956db8cc722e137 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 098d9aae7259e1a7dc117c6143eb1be57a45b7fa..2913d76ad3d254f45d29a914dc40d8b177f20803 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 1e2cb846b3c9d7b593d3dd6e5b588a1f3f227991..8744d24ac6e639213e4366cc7dd12d06ec039a4e 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 a8d0aee3bc0e3dfa7943cd412137a0d44e2d737d..cf94326f1b597f1b46ccc3ddc996b5aa0ef84f5f 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 a98ab72adf9528f95e5c23d06b27c0d11a83c4a2..93fb32038b14cf2e822708763669dfc855f4e49d 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 eee28fac210ce08769696377f892ec825bc45e52..376f1ab48a245fcdce521bd55a7ceb109f7f8c9e 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 9dd872000cec843db28fd393f2eb3023725c4bf4..6aa497e4baf85d30526ad12ab8a96dbc179d9538 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 f8fc188bc762d4b6fe1ffb5dadc9ac43a36d6dff..f55d2ff9513329b973fe0c6c96ec9434eb53de9c 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 89e76819f61f790ebca186d6b64a3d2b023fa5d7..d2d3fd54cc681184cab146bf90ddc000f3b706de 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 8ffbcecad931b99e72fe504ae8eef36310995c65..81e623a90f09d70905ec1080f545f93e1cdd43ec 100644 (file)
@@ -23,6 +23,7 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/vmalloc.h>
 #include <linux/pci.h>
 #include <linux/kthread.h>
 #include <linux/freezer.h>
index bd9ab9d0d12a27d753f09dd79fcd882d0963d31f..fa6a62369a78361c81e6a06f650308b1ed0d5205 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 f1108c64e895eb4ad2914aebb41cb6ef78a5ab3d..eec18aaf551281e8691f0d6c7943402039417bc7 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 575bf9d894193f83d465ced201bad022f1fb87b6..a1239083472dcb468a8eff54079de25b65f9f918 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 356d6896da3f5877e5961fb4d009309fe68cae33..fbdc1cde56a6b1597cbac7f37d5f44b9677529b0 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 6e5d142b5b000f1f0369e38779ce6aef4c258cf1..518bcfe18bcbf9313201d551d6be5e0cfeb7402c 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 7172dcf2a4fa87ed94c4ac3c41789e1ddafc467d..de9ff0fc741f06611e11bd5220d0c78331b912c5 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 81d2b5dea18e88b91a4ed0388985e9711a2dc2bb..57e6b1241090d7d0a149d9b3e9b4f17c2a6bcc1b 100644 (file)
@@ -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 8a5bba16ff32379c2b0472f25a33cc9e5863a257..7f1e5415850b5569893222b38145486ab7c85a69 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 7847bbc1440d6edd912e918821c248c6e20d0ee7..bd83fa0a4970fb13a5ddef788d1c68a5a7b21300 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 76fa2ee0b574f0deec88a1aad673baf8a23b616a..610e914abe6cfc92bd83b097455f8f2f2e3b5cef 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 335d4c78a775122ea0e6738aed84a31d7dd4d47b..d505b68cd3729df2820de01cc39cef81a58fce91 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 c533f86ff5ea7c5c60399ec4acae583333106530..5447da16a1705c49e9e72c57a58e203ceb4ce1eb 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 016be4938e4c4baac63168e2c478f335ae162ed9..8762889179763eb2a019c7867a72b1cbecd9dbad 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 78c2135c5de65f8717bb92bed2498429bc4df871..2afc08006e6d1db891f995445a351c59186165fd 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 2e535a0ccd5e274c1fc46b700a07a45953022ba8..d902d81dde397a2793f0709b0da9135922050f75 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 de966a6fb7e634d50abce07bfa82a9c47f6f8ac9..aecf40ecb3a4f560a57cc699094c80f7fd194f50 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 1bfe5d16963b9ece644b25c5bb81a411d2c1045f..3648b23d5c92bea5a7697b5a89e81f2cff85c9e6 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 adc205c49fbf1e2b6541aad793addc20fd40dab8..85f0e8cd875bac4f153788ff0012fc0b27e05dd5 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 d84c880fac84f41a0d388540d74d22a4a7649705..7dab2e5f4bc9c87c53779a3d49cf2cb368114ef7 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 c819effa1032c5ccebf896dff58d78f6e7ca13d5..67ae6abc4230928242109df7f5ab2c773f2971a3 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 5e945e64ead7cb64aaf2b1043d53c0d745d66219..a268d12f1af0d0276787642ff4728060a1ab2624 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 c2dc3d2d9f9ace67075146ded5f56d0c6273cd8f..8c87e1109a34322c88a341394ae152800ad950b4 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 2fb9d5f271ea4e2a3eabf4ebdd8dd65021a5025b..bfefce365ae788ea93d73382298c915fba72288e 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 34ce2703d29a4522dbf52ca1b681571a14e0c42a..d2cb5c6343920371e6c6ba367a3b8c14a1282b4c 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 17854bf7cf0d1e36601389d118e178b89f74363e..653eb8e841789d0c440875e07bacbef5cc6877fe 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 7ad646fe077ec796da7a390c8a2a0dfe624f39b1..10b2a4d20f5a1a6b270592d6b048514126bda96a 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 fb99ccff908077f1a5bdf1cdc78099fd0ecd19c2..cdb845b68ab5e37222048b47769014fa32186b8a 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 46284b52739785bbc768c6458214e5c0936323a2..d37464e296a507deb743182c3764714f83cdda9c 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 963f2937c5e37da83819249826995aa098751f99..6636354b48ceac476c3ecbb7a88054dd4047d8d2 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 f61fc2d4cd0a649a02e8e2acc10da53a7ffe7c2a..f9aa8a7deffaff1788955284e3f39dc86f8725a2 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 891ef18bd77be2fb4e6342d6989cf9a92c20d5f0..7cb057f3f883837e1fc05e459eef0f3b8219201f 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 cf153f62845700f225da082115f15e30efcabae1..abcb0400e06d23236b1d1b6cfde623a1bb706abf 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 7b603e4b41dbe9eb60a03e2dd57a13d47f64d94d..065fa818be5750a8b59dc7d12a53cb217933b5d0 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 a461017ce5ce92b6c14c0ca73482f68fd6ad8d7c..d55fe4fb793559430c9557a9e67f2e43c402f9d8 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 bc14bb1b057935816868065972b4e078b090089d..88671529c45d7690061f289d8fe005abd4701a09 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 1cf9cfb3b64fb13f262f652ef74323e4bb1392ec..4487cc0979112ea71e412f2c722ad45282cd3328 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 1e8aa590bb39b0a5e650037f61647860fd2b3ec1..01ab916c2802dc90e21bc7aa7513c2d5c0fa2cb6 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 2f15cc17d88743c42eb116811f5c3b0c6f9c9126..e0356644d1aa4592faa28ccccb485d5cab944087 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 fc96f8cb9c0b154db3464a10acdd834d5ec58fa6..c279fbc4c2e54059d3c06fcec327b59df287bb84 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 c77e9ff30223c44ff86da33a2f8a51c18570c520..ce5f1d73dc04667841c6da99973500e9e3c96e7f 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 b8e35a0b4d72df589446f1ad026f35644d285b22..e4ec3659759a91acc38cedefb0160c3c0640c5e1 100644 (file)
@@ -25,6 +25,14 @@ config MTD_DEBUG_VERBOSE
        help
          Determines the verbosity level of the MTD debugging messages.
 
+config MTD_TESTS
+       tristate "MTD tests support"
+       depends on m
+       help
+         This option includes various MTD tests into compilation. The tests
+         should normally be compiled as kernel modules. The modules perform
+         various checks and verifications when loaded.
+
 config MTD_CONCAT
        tristate "MTD concatenating support"
        help
@@ -45,14 +53,6 @@ config MTD_PARTITIONS
          devices. Partitioning on NFTL 'devices' is a different - that's the
          'normal' form of partitioning used on a block device.
 
-config MTD_TESTS
-       tristate "MTD tests support"
-       depends on m
-       help
-         This option includes various MTD tests into compilation. The tests
-         should normally be compiled as kernel modules. The modules perform
-         various checks and verifications when loaded.
-
 config MTD_REDBOOT_PARTS
        tristate "RedBoot partition table parsing"
        depends on MTD_PARTITIONS
index d072ca5be689a5ee8f1a426e3d1103762fb75283..cec7ab98b2a9d9bed2496a335881469b12b0b0b0 100644 (file)
@@ -239,7 +239,7 @@ static int parse_afs_partitions(struct mtd_info *mtd,
                parts[idx].offset       = img_ptr;
                parts[idx].mask_flags   = 0;
 
-               printk("  mtd%d: at 0x%08x, %5dKB, %8u, %s\n",
+               printk("  mtd%d: at 0x%08x, %5lluKiB, %8u, %s\n",
                        idx, img_ptr, parts[idx].size / 1024,
                        iis.imageNumber, str);
 
index 61ea833e09086e631024f298575678ff3f123ea3..94bb61e19047764ae06dcf91408946219869fa06 100644 (file)
@@ -282,16 +282,6 @@ static void fixup_s29gl032n_sectors(struct mtd_info *mtd, void *param)
        }
 }
 
-static void fixup_M29W128G_write_buffer(struct mtd_info *mtd, void *param)
-{
-       struct map_info *map = mtd->priv;
-       struct cfi_private *cfi = map->fldrv_priv;
-       if (cfi->cfiq->BufWriteTimeoutTyp) {
-               pr_warning("Don't use write buffer on ST flash M29W128G\n");
-               cfi->cfiq->BufWriteTimeoutTyp = 0;
-       }
-}
-
 static struct cfi_fixup cfi_fixup_table[] = {
        { CFI_MFR_ATMEL, CFI_ID_ANY, fixup_convert_atmel_pri, NULL },
 #ifdef AMD_BOOTLOC_BUG
@@ -308,7 +298,6 @@ static struct cfi_fixup cfi_fixup_table[] = {
        { CFI_MFR_AMD, 0x1301, fixup_s29gl064n_sectors, NULL, },
        { CFI_MFR_AMD, 0x1a00, fixup_s29gl032n_sectors, NULL, },
        { CFI_MFR_AMD, 0x1a01, fixup_s29gl032n_sectors, NULL, },
-       { CFI_MFR_ST,  0x227E, fixup_M29W128G_write_buffer, NULL, },
 #if !FORCE_WORD_WRITE
        { CFI_MFR_ANY, CFI_ID_ANY, fixup_use_write_buffers, NULL, },
 #endif
old mode 100644 (file)
new mode 100755 (executable)
index 34d40e2..c5a84fd
@@ -81,6 +81,10 @@ void __xipram cfi_qry_mode_off(uint32_t base, struct map_info *map,
 {
        cfi_send_gen_cmd(0xF0, 0, base, map, cfi, cfi->device_type, NULL);
        cfi_send_gen_cmd(0xFF, 0, base, map, cfi, cfi->device_type, NULL);
+       /* M29W128G flashes require an additional reset command
+          when exit qry mode */
+       if ((cfi->mfr == CFI_MFR_ST) && (cfi->id == 0x227E || cfi->id == 0x7E))
+               cfi_send_gen_cmd(0xF0, 0, base, map, cfi, cfi->device_type, NULL);
 }
 EXPORT_SYMBOL_GPL(cfi_qry_mode_off);
 
index ccc4cfc7e4b5efb415d6887216c137d863ae1cad..736a3be265f2b3da75975dc7af2614b68c58a8ee 100644 (file)
 #define I28F320B3B     0x8897
 #define I28F640B3T     0x8898
 #define I28F640B3B     0x8899
+#define I28F640C3B     0x88CD
+#define I28F160F3T     0x88F3
+#define I28F160F3B     0x88F4
+#define I28F160C3T     0x88C2
+#define I28F160C3B     0x88C3
 #define I82802AB       0x00ad
 #define I82802AC       0x00ac
 
 #define M50LPW080       0x002F
 #define M50FLW080A     0x0080
 #define M50FLW080B     0x0081
+#define PSD4256G6V     0x00e9
 
 /* SST */
 #define SST29EE020     0x0010
@@ -201,6 +207,7 @@ enum uaddr {
        MTD_UADDR_0x0555_0x02AA,
        MTD_UADDR_0x0555_0x0AAA,
        MTD_UADDR_0x5555_0x2AAA,
+       MTD_UADDR_0x0AAA_0x0554,
        MTD_UADDR_0x0AAA_0x0555,
        MTD_UADDR_0xAAAA_0x5555,
        MTD_UADDR_DONT_CARE,            /* Requires an arbitrary address */
@@ -245,6 +252,11 @@ static const struct unlock_addr  unlock_addrs[] = {
                .addr2 = 0x2aaa
        },
 
+       [MTD_UADDR_0x0AAA_0x0554] = {
+               .addr1 = 0x0AAA,
+               .addr2 = 0x0554
+       },
+
        [MTD_UADDR_0x0AAA_0x0555] = {
                .addr1 = 0x0AAA,
                .addr2 = 0x0555
@@ -1101,6 +1113,19 @@ static const struct amd_flash_info jedec_table[] = {
                        ERASEINFO(0x10000, 127),
                        ERASEINFO(0x02000, 8),
                }
+       }, {
+               .mfr_id         = MANUFACTURER_INTEL,
+               .dev_id         = I28F640C3B,
+               .name           = "Intel 28F640C3B",
+               .devtypes       = CFI_DEVICETYPE_X16,
+               .uaddr          = MTD_UADDR_UNNECESSARY,
+               .dev_size       = SIZE_8MiB,
+               .cmd_set        = P_ID_INTEL_STD,
+               .nr_regions     = 2,
+               .regions        = {
+                       ERASEINFO(0x02000, 8),
+                       ERASEINFO(0x10000, 127),
+               }
        }, {
                .mfr_id         = MANUFACTURER_INTEL,
                .dev_id         = I82802AB,
@@ -1156,8 +1181,8 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_NEC,
                .dev_id         = UPD29F064115,
                .name           = "NEC uPD29F064115",
-               .devtypes       = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
-               .uaddr          = MTD_UADDR_0x0555_0x02AA,      /* ???? */
+               .devtypes       = CFI_DEVICETYPE_X16,
+               .uaddr          = MTD_UADDR_0xAAAA_0x5555,
                .dev_size       = SIZE_8MiB,
                .cmd_set        = P_ID_AMD_STD,
                .nr_regions     = 3,
@@ -1725,6 +1750,18 @@ static const struct amd_flash_info jedec_table[] = {
                        ERASEINFO(0x10000,13),
                        ERASEINFO(0x1000,16),
                }
+       }, {
+               .mfr_id         = 0xff00 | MANUFACTURER_ST,
+               .dev_id         = 0xff00 | PSD4256G6V,
+               .name           = "ST PSD4256G6V",
+               .devtypes       = CFI_DEVICETYPE_X16,
+               .uaddr          = MTD_UADDR_0x0AAA_0x0554,
+               .dev_size       = SIZE_1MiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 1,
+               .regions        = {
+                       ERASEINFO(0x10000,16),
+               }
        }, {
                .mfr_id         = MANUFACTURER_TOSHIBA,
                .dev_id         = TC58FVT160,
index 325fab92a62ccec543e013e701667b8013d85649..c222514bb70de1527f1f0c28c5b0bd03fc30fea6 100644 (file)
@@ -104,6 +104,16 @@ config M25PXX_USE_FAST_READ
        help
          This option enables FAST_READ access supported by ST M25Pxx.
 
+config MTD_SST25L
+       tristate "Support SST25L (non JEDEC) SPI Flash chips"
+       depends on SPI_MASTER
+       help
+         This enables access to the non JEDEC SST25L SPI flash chips, used
+         for program and data storage.
+
+         Set up your spi devices with the right board-specific platform data,
+         if you want to specify device partitioning.
+
 config MTD_SLRAM
        tristate "Uncached system RAM"
        help
index 0993d5cf3923f3a4895a6579aa18759bb76a3c72..ab5c9b92ac82ae39f24914a10830691e818b81f4 100644 (file)
@@ -16,3 +16,4 @@ obj-$(CONFIG_MTD_LART)                += lart.o
 obj-$(CONFIG_MTD_BLOCK2MTD)    += block2mtd.o
 obj-$(CONFIG_MTD_DATAFLASH)    += mtd_dataflash.o
 obj-$(CONFIG_MTD_M25P80)       += m25p80.o
+obj-$(CONFIG_MTD_SST25L)       += sst25l.o
index 578de1c67bfe047a78b43c95845fdc6d5aae43e3..f4359fe7150f253ed641361a5a8809e845abef06 100644 (file)
@@ -393,7 +393,8 @@ static int flash_erase (struct mtd_info *mtd,struct erase_info *instr)
        * erase range is aligned with the erase size which is in
        * effect here.
        */
-   if (instr->addr & (mtd->eraseregions[i].erasesize - 1)) return (-EINVAL);
+   if (i < 0 || (instr->addr & (mtd->eraseregions[i].erasesize - 1)))
+      return -EINVAL;
 
    /* Remember the erase region we start on */
    first = i;
@@ -409,7 +410,8 @@ static int flash_erase (struct mtd_info *mtd,struct erase_info *instr)
    i--;
 
    /* is the end aligned on a block boundary? */
-   if ((instr->addr + instr->len) & (mtd->eraseregions[i].erasesize - 1)) return (-EINVAL);
+   if (i < 0 || ((instr->addr + instr->len) & (mtd->eraseregions[i].erasesize - 1)))
+      return -EINVAL;
 
    addr = instr->addr;
    len = instr->len;
index 10ed195c0c1cd2ff02c4fe767e3d13dd574c84b8..379c316f329eb0d054718a12ed1c9111845d68db 100644 (file)
 #define        OPCODE_SE               0xd8    /* Sector erase (usually 64KiB) */
 #define        OPCODE_RDID             0x9f    /* Read JEDEC ID */
 
+/* Used for SST flashes only. */
+#define        OPCODE_BP               0x02    /* Byte program */
+#define        OPCODE_WRDI             0x04    /* Write disable */
+#define        OPCODE_AAI_WP           0xad    /* Auto address increment word program */
+
 /* Status Register bits. */
 #define        SR_WIP                  1       /* Write in progress */
 #define        SR_WEL                  2       /* Write enable latch */
@@ -132,6 +137,15 @@ static inline int write_enable(struct m25p *flash)
        return spi_write_then_read(flash->spi, &code, 1, NULL, 0);
 }
 
+/*
+ * Send write disble instruction to the chip.
+ */
+static inline int write_disable(struct m25p *flash)
+{
+       u8      code = OPCODE_WRDI;
+
+       return spi_write_then_read(flash->spi, &code, 1, NULL, 0);
+}
 
 /*
  * Service routine to read status register until ready, or timeout occurs.
@@ -454,6 +468,111 @@ static int m25p80_write(struct mtd_info *mtd, loff_t to, size_t len,
        return 0;
 }
 
+static int sst_write(struct mtd_info *mtd, loff_t to, size_t len,
+               size_t *retlen, const u_char *buf)
+{
+       struct m25p *flash = mtd_to_m25p(mtd);
+       struct spi_transfer t[2];
+       struct spi_message m;
+       size_t actual;
+       int cmd_sz, ret;
+
+       if (retlen)
+               *retlen = 0;
+
+       /* sanity checks */
+       if (!len)
+               return 0;
+
+       if (to + len > flash->mtd.size)
+               return -EINVAL;
+
+       spi_message_init(&m);
+       memset(t, 0, (sizeof t));
+
+       t[0].tx_buf = flash->command;
+       t[0].len = CMD_SIZE;
+       spi_message_add_tail(&t[0], &m);
+
+       t[1].tx_buf = buf;
+       spi_message_add_tail(&t[1], &m);
+
+       mutex_lock(&flash->lock);
+
+       /* Wait until finished previous write command. */
+       ret = wait_till_ready(flash);
+       if (ret)
+               goto time_out;
+
+       write_enable(flash);
+
+       actual = to % 2;
+       /* Start write from odd address. */
+       if (actual) {
+               flash->command[0] = OPCODE_BP;
+               flash->command[1] = to >> 16;
+               flash->command[2] = to >> 8;
+               flash->command[3] = to;
+
+               /* write one byte. */
+               t[1].len = 1;
+               spi_sync(flash->spi, &m);
+               ret = wait_till_ready(flash);
+               if (ret)
+                       goto time_out;
+               *retlen += m.actual_length - CMD_SIZE;
+       }
+       to += actual;
+
+       flash->command[0] = OPCODE_AAI_WP;
+       flash->command[1] = to >> 16;
+       flash->command[2] = to >> 8;
+       flash->command[3] = to;
+
+       /* Write out most of the data here. */
+       cmd_sz = CMD_SIZE;
+       for (; actual < len - 1; actual += 2) {
+               t[0].len = cmd_sz;
+               /* write two bytes. */
+               t[1].len = 2;
+               t[1].tx_buf = buf + actual;
+
+               spi_sync(flash->spi, &m);
+               ret = wait_till_ready(flash);
+               if (ret)
+                       goto time_out;
+               *retlen += m.actual_length - cmd_sz;
+               cmd_sz = 1;
+               to += 2;
+       }
+       write_disable(flash);
+       ret = wait_till_ready(flash);
+       if (ret)
+               goto time_out;
+
+       /* Write out trailing byte if it exists. */
+       if (actual != len) {
+               write_enable(flash);
+               flash->command[0] = OPCODE_BP;
+               flash->command[1] = to >> 16;
+               flash->command[2] = to >> 8;
+               flash->command[3] = to;
+               t[0].len = CMD_SIZE;
+               t[1].len = 1;
+               t[1].tx_buf = buf + actual;
+
+               spi_sync(flash->spi, &m);
+               ret = wait_till_ready(flash);
+               if (ret)
+                       goto time_out;
+               *retlen += m.actual_length - CMD_SIZE;
+               write_disable(flash);
+       }
+
+time_out:
+       mutex_unlock(&flash->lock);
+       return ret;
+}
 
 /****************************************************************************/
 
@@ -501,7 +620,10 @@ static struct flash_info __devinitdata m25p_data [] = {
        { "at26df321",  0x1f4701, 0, 64 * 1024, 64, SECT_4K, },
 
        /* Macronix */
+       { "mx25l3205d", 0xc22016, 0, 64 * 1024, 64, },
+       { "mx25l6405d", 0xc22017, 0, 64 * 1024, 128, },
        { "mx25l12805d", 0xc22018, 0, 64 * 1024, 256, },
+       { "mx25l12855e", 0xc22618, 0, 64 * 1024, 256, },
 
        /* Spansion -- single (large) sector size only, at least
         * for the chips listed here (without boot sectors).
@@ -511,14 +633,20 @@ static struct flash_info __devinitdata m25p_data [] = {
        { "s25sl016a", 0x010214, 0, 64 * 1024, 32, },
        { "s25sl032a", 0x010215, 0, 64 * 1024, 64, },
        { "s25sl064a", 0x010216, 0, 64 * 1024, 128, },
-        { "s25sl12800", 0x012018, 0x0300, 256 * 1024, 64, },
+       { "s25sl12800", 0x012018, 0x0300, 256 * 1024, 64, },
        { "s25sl12801", 0x012018, 0x0301, 64 * 1024, 256, },
+       { "s25fl129p0", 0x012018, 0x4d00, 256 * 1024, 64, },
+       { "s25fl129p1", 0x012018, 0x4d01, 64 * 1024, 256, },
 
        /* SST -- large erase sizes are "overlays", "sectors" are 4K */
        { "sst25vf040b", 0xbf258d, 0, 64 * 1024, 8, SECT_4K, },
        { "sst25vf080b", 0xbf258e, 0, 64 * 1024, 16, SECT_4K, },
        { "sst25vf016b", 0xbf2541, 0, 64 * 1024, 32, SECT_4K, },
        { "sst25vf032b", 0xbf254a, 0, 64 * 1024, 64, SECT_4K, },
+       { "sst25wf512",  0xbf2501, 0, 64 * 1024, 1, SECT_4K, },
+       { "sst25wf010",  0xbf2502, 0, 64 * 1024, 2, SECT_4K, },
+       { "sst25wf020",  0xbf2503, 0, 64 * 1024, 4, SECT_4K, },
+       { "sst25wf040",  0xbf2504, 0, 64 * 1024, 8, SECT_4K, },
 
        /* ST Microelectronics -- newer production may have feature updates */
        { "m25p05",  0x202010,  0, 32 * 1024, 2, },
@@ -667,7 +795,12 @@ static int __devinit m25p_probe(struct spi_device *spi)
        flash->mtd.size = info->sector_size * info->n_sectors;
        flash->mtd.erase = m25p80_erase;
        flash->mtd.read = m25p80_read;
-       flash->mtd.write = m25p80_write;
+
+       /* sst flash chips use AAI word program */
+       if (info->jedec_id >> 16 == 0xbf)
+               flash->mtd.write = sst_write;
+       else
+               flash->mtd.write = m25p80_write;
 
        /* prefer "small sector" erase if possible */
        if (info->flags & SECT_4K) {
@@ -776,13 +909,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 43976aa4dbb12fd05ce52c63a8a355c947e59205..93e3627be74c76a37117f13883e74d0bd1607f11 100644 (file)
@@ -401,7 +401,7 @@ static int dataflash_write(struct mtd_info *mtd, loff_t to, size_t len,
                (void) dataflash_waitready(priv->spi);
 
 
-#ifdef CONFIG_MTD_DATAFLASH_VERIFY_WRITE
+#ifdef CONFIG_MTD_DATAFLASH_WRITE_VERIFY
 
                /* (3) Compare to Buffer1 */
                addr = pageaddr << priv->page_offset;
@@ -430,7 +430,7 @@ static int dataflash_write(struct mtd_info *mtd, loff_t to, size_t len,
                } else
                        status = 0;
 
-#endif /* CONFIG_MTD_DATAFLASH_VERIFY_WRITE */
+#endif /* CONFIG_MTD_DATAFLASH_WRITE_VERIFY */
 
                remaining = remaining - writelen;
                pageaddr++;
@@ -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 088fbb7595b5adbb5fee1e240ecd605b4a53b51e..1696bbecaa7e0e86b31a2e7126b9bf77faf4d596 100644 (file)
@@ -14,6 +14,9 @@
  * Example:
  *     phram=swap,64Mi,128Mi phram=test,900Mi,1Mi
  */
+
+#define pr_fmt(fmt) "phram: " fmt
+
 #include <asm/io.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
@@ -23,8 +26,6 @@
 #include <linux/slab.h>
 #include <linux/mtd/mtd.h>
 
-#define ERROR(fmt, args...) printk(KERN_ERR "phram: " fmt , ## args)
-
 struct phram_mtd_list {
        struct mtd_info mtd;
        struct list_head list;
@@ -132,7 +133,7 @@ static int register_device(char *name, unsigned long start, unsigned long len)
        ret = -EIO;
        new->mtd.priv = ioremap(start, len);
        if (!new->mtd.priv) {
-               ERROR("ioremap failed\n");
+               pr_err("ioremap failed\n");
                goto out1;
        }
 
@@ -152,7 +153,7 @@ static int register_device(char *name, unsigned long start, unsigned long len)
 
        ret = -EAGAIN;
        if (add_mtd_device(&new->mtd)) {
-               ERROR("Failed to register new device\n");
+               pr_err("Failed to register new device\n");
                goto out2;
        }
 
@@ -227,8 +228,8 @@ static inline void kill_final_newline(char *str)
 
 
 #define parse_err(fmt, args...) do {   \
-       ERROR(fmt , ## args);   \
-       return 0;               \
+       pr_err(fmt , ## args);  \
+       return 1;               \
 } while (0)
 
 static int phram_setup(const char *val, struct kernel_param *kp)
@@ -256,12 +257,8 @@ static int phram_setup(const char *val, struct kernel_param *kp)
                parse_err("not enough arguments\n");
 
        ret = parse_name(&name, token[0]);
-       if (ret == -ENOMEM)
-               parse_err("out of memory\n");
-       if (ret == -ENOSPC)
-               parse_err("name too long\n");
        if (ret)
-               return 0;
+               return ret;
 
        ret = parse_num32(&start, token[1]);
        if (ret) {
@@ -275,9 +272,11 @@ static int phram_setup(const char *val, struct kernel_param *kp)
                parse_err("illegal device length\n");
        }
 
-       register_device(name, start, len);
+       ret = register_device(name, start, len);
+       if (!ret)
+               pr_info("%s device: %#x at %#x\n", name, len, start);
 
-       return 0;
+       return ret;
 }
 
 module_param_call(phram, phram_setup, NULL, NULL, 000);
index 00248e81ecd5b3350a71a3c5e5e79c03be7af088..3aa05cd18ea195878141aabe1669def78bc60dc6 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;
@@ -341,7 +341,7 @@ static int init_slram(void)
 #else
        int count;
 
-       for (count = 0; (map[count]) && (count < SLRAM_MAX_DEVICES_PARAMS);
+       for (count = 0; count < SLRAM_MAX_DEVICES_PARAMS && map[count];
                        count++) {
        }
 
diff --git a/drivers/mtd/devices/sst25l.c b/drivers/mtd/devices/sst25l.c
new file mode 100644 (file)
index 0000000..c2baf33
--- /dev/null
@@ -0,0 +1,512 @@
+/*
+ * sst25l.c
+ *
+ * Driver for SST25L SPI Flash chips
+ *
+ * Copyright Â© 2009 Bluewater Systems Ltd
+ * Author: Andre Renaud <andre@bluewatersys.com>
+ * Author: Ryan Mallon <ryan@bluewatersys.com>
+ *
+ * Based on m25p80.c
+ *
+ * This code 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/init.h>
+#include <linux/module.h>
+#include <linux/device.h>
+#include <linux/mutex.h>
+#include <linux/interrupt.h>
+
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+
+#include <linux/spi/spi.h>
+#include <linux/spi/flash.h>
+
+/* Erases can take up to 3 seconds! */
+#define MAX_READY_WAIT_JIFFIES msecs_to_jiffies(3000)
+
+#define SST25L_CMD_WRSR                0x01    /* Write status register */
+#define SST25L_CMD_WRDI                0x04    /* Write disable */
+#define SST25L_CMD_RDSR                0x05    /* Read status register */
+#define SST25L_CMD_WREN                0x06    /* Write enable */
+#define SST25L_CMD_READ                0x03    /* High speed read */
+
+#define SST25L_CMD_EWSR                0x50    /* Enable write status register */
+#define SST25L_CMD_SECTOR_ERASE        0x20    /* Erase sector */
+#define SST25L_CMD_READ_ID     0x90    /* Read device ID */
+#define SST25L_CMD_AAI_PROGRAM 0xaf    /* Auto address increment */
+
+#define SST25L_STATUS_BUSY     (1 << 0)        /* Chip is busy */
+#define SST25L_STATUS_WREN     (1 << 1)        /* Write enabled */
+#define SST25L_STATUS_BP0      (1 << 2)        /* Block protection 0 */
+#define SST25L_STATUS_BP1      (1 << 3)        /* Block protection 1 */
+
+struct sst25l_flash {
+       struct spi_device       *spi;
+       struct mutex            lock;
+       struct mtd_info         mtd;
+
+       int                     partitioned;
+};
+
+struct flash_info {
+       const char              *name;
+       uint16_t                device_id;
+       unsigned                page_size;
+       unsigned                nr_pages;
+       unsigned                erase_size;
+};
+
+#define to_sst25l_flash(x) container_of(x, struct sst25l_flash, mtd)
+
+static struct flash_info __initdata sst25l_flash_info[] = {
+       {"sst25lf020a", 0xbf43, 256, 1024, 4096},
+       {"sst25lf040a", 0xbf44, 256, 2048, 4096},
+};
+
+static int sst25l_status(struct sst25l_flash *flash, int *status)
+{
+       unsigned char command, response;
+       int err;
+
+       command = SST25L_CMD_RDSR;
+       err = spi_write_then_read(flash->spi, &command, 1, &response, 1);
+       if (err < 0)
+               return err;
+
+       *status = response;
+       return 0;
+}
+
+static int sst25l_write_enable(struct sst25l_flash *flash, int enable)
+{
+       unsigned char command[2];
+       int status, err;
+
+       command[0] = enable ? SST25L_CMD_WREN : SST25L_CMD_WRDI;
+       err = spi_write(flash->spi, command, 1);
+       if (err)
+               return err;
+
+       command[0] = SST25L_CMD_EWSR;
+       err = spi_write(flash->spi, command, 1);
+       if (err)
+               return err;
+
+       command[0] = SST25L_CMD_WRSR;
+       command[1] = enable ? 0 : SST25L_STATUS_BP0 | SST25L_STATUS_BP1;
+       err = spi_write(flash->spi, command, 2);
+       if (err)
+               return err;
+
+       if (enable) {
+               err = sst25l_status(flash, &status);
+               if (err)
+                       return err;
+               if (!(status & SST25L_STATUS_WREN))
+                       return -EROFS;
+       }
+
+       return 0;
+}
+
+static int sst25l_wait_till_ready(struct sst25l_flash *flash)
+{
+       unsigned long deadline;
+       int status, err;
+
+       deadline = jiffies + MAX_READY_WAIT_JIFFIES;
+       do {
+               err = sst25l_status(flash, &status);
+               if (err)
+                       return err;
+               if (!(status & SST25L_STATUS_BUSY))
+                       return 0;
+
+               cond_resched();
+       } while (!time_after_eq(jiffies, deadline));
+
+       return -ETIMEDOUT;
+}
+
+static int sst25l_erase_sector(struct sst25l_flash *flash, uint32_t offset)
+{
+       unsigned char command[4];
+       int err;
+
+       err = sst25l_write_enable(flash, 1);
+       if (err)
+               return err;
+
+       command[0] = SST25L_CMD_SECTOR_ERASE;
+       command[1] = offset >> 16;
+       command[2] = offset >> 8;
+       command[3] = offset;
+       err = spi_write(flash->spi, command, 4);
+       if (err)
+               return err;
+
+       err = sst25l_wait_till_ready(flash);
+       if (err)
+               return err;
+
+       return sst25l_write_enable(flash, 0);
+}
+
+static int sst25l_erase(struct mtd_info *mtd, struct erase_info *instr)
+{
+       struct sst25l_flash *flash = to_sst25l_flash(mtd);
+       uint32_t addr, end;
+       int err;
+
+       /* Sanity checks */
+       if (instr->addr + instr->len > flash->mtd.size)
+               return -EINVAL;
+
+       if ((uint32_t)instr->len % mtd->erasesize)
+               return -EINVAL;
+
+       if ((uint32_t)instr->addr % mtd->erasesize)
+               return -EINVAL;
+
+       addr = instr->addr;
+       end = addr + instr->len;
+
+       mutex_lock(&flash->lock);
+
+       err = sst25l_wait_till_ready(flash);
+       if (err) {
+               mutex_unlock(&flash->lock);
+               return err;
+       }
+
+       while (addr < end) {
+               err = sst25l_erase_sector(flash, addr);
+               if (err) {
+                       mutex_unlock(&flash->lock);
+                       instr->state = MTD_ERASE_FAILED;
+                       dev_err(&flash->spi->dev, "Erase failed\n");
+                       return err;
+               }
+
+               addr += mtd->erasesize;
+       }
+
+       mutex_unlock(&flash->lock);
+
+       instr->state = MTD_ERASE_DONE;
+       mtd_erase_callback(instr);
+       return 0;
+}
+
+static int sst25l_read(struct mtd_info *mtd, loff_t from, size_t len,
+                      size_t *retlen, unsigned char *buf)
+{
+       struct sst25l_flash *flash = to_sst25l_flash(mtd);
+       struct spi_transfer transfer[2];
+       struct spi_message message;
+       unsigned char command[4];
+       int ret;
+
+       /* Sanity checking */
+       if (len == 0)
+               return 0;
+
+       if (from + len > flash->mtd.size)
+               return -EINVAL;
+
+       if (retlen)
+               *retlen = 0;
+
+       spi_message_init(&message);
+       memset(&transfer, 0, sizeof(transfer));
+
+       command[0] = SST25L_CMD_READ;
+       command[1] = from >> 16;
+       command[2] = from >> 8;
+       command[3] = from;
+
+       transfer[0].tx_buf = command;
+       transfer[0].len = sizeof(command);
+       spi_message_add_tail(&transfer[0], &message);
+
+       transfer[1].rx_buf = buf;
+       transfer[1].len = len;
+       spi_message_add_tail(&transfer[1], &message);
+
+       mutex_lock(&flash->lock);
+
+       /* Wait for previous write/erase to complete */
+       ret = sst25l_wait_till_ready(flash);
+       if (ret) {
+               mutex_unlock(&flash->lock);
+               return ret;
+       }
+
+       spi_sync(flash->spi, &message);
+
+       if (retlen && message.actual_length > sizeof(command))
+               *retlen += message.actual_length - sizeof(command);
+
+       mutex_unlock(&flash->lock);
+       return 0;
+}
+
+static int sst25l_write(struct mtd_info *mtd, loff_t to, size_t len,
+                       size_t *retlen, const unsigned char *buf)
+{
+       struct sst25l_flash *flash = to_sst25l_flash(mtd);
+       int i, j, ret, bytes, copied = 0;
+       unsigned char command[5];
+
+       /* Sanity checks */
+       if (!len)
+               return 0;
+
+       if (to + len > flash->mtd.size)
+               return -EINVAL;
+
+       if ((uint32_t)to % mtd->writesize)
+               return -EINVAL;
+
+       mutex_lock(&flash->lock);
+
+       ret = sst25l_write_enable(flash, 1);
+       if (ret)
+               goto out;
+
+       for (i = 0; i < len; i += mtd->writesize) {
+               ret = sst25l_wait_till_ready(flash);
+               if (ret)
+                       goto out;
+
+               /* Write the first byte of the page */
+               command[0] = SST25L_CMD_AAI_PROGRAM;
+               command[1] = (to + i) >> 16;
+               command[2] = (to + i) >> 8;
+               command[3] = (to + i);
+               command[4] = buf[i];
+               ret = spi_write(flash->spi, command, 5);
+               if (ret < 0)
+                       goto out;
+               copied++;
+
+               /*
+                * Write the remaining bytes using auto address
+                * increment mode
+                */
+               bytes = min_t(uint32_t, mtd->writesize, len - i);
+               for (j = 1; j < bytes; j++, copied++) {
+                       ret = sst25l_wait_till_ready(flash);
+                       if (ret)
+                               goto out;
+
+                       command[1] = buf[i + j];
+                       ret = spi_write(flash->spi, command, 2);
+                       if (ret)
+                               goto out;
+               }
+       }
+
+out:
+       ret = sst25l_write_enable(flash, 0);
+
+       if (retlen)
+               *retlen = copied;
+
+       mutex_unlock(&flash->lock);
+       return ret;
+}
+
+static struct flash_info *__init sst25l_match_device(struct spi_device *spi)
+{
+       struct flash_info *flash_info = NULL;
+       unsigned char command[4], response;
+       int i, err;
+       uint16_t id;
+
+       command[0] = SST25L_CMD_READ_ID;
+       command[1] = 0;
+       command[2] = 0;
+       command[3] = 0;
+       err = spi_write_then_read(spi, command, sizeof(command), &response, 1);
+       if (err < 0) {
+               dev_err(&spi->dev, "error reading device id msb\n");
+               return NULL;
+       }
+
+       id = response << 8;
+
+       command[0] = SST25L_CMD_READ_ID;
+       command[1] = 0;
+       command[2] = 0;
+       command[3] = 1;
+       err = spi_write_then_read(spi, command, sizeof(command), &response, 1);
+       if (err < 0) {
+               dev_err(&spi->dev, "error reading device id lsb\n");
+               return NULL;
+       }
+
+       id |= response;
+
+       for (i = 0; i < ARRAY_SIZE(sst25l_flash_info); i++)
+               if (sst25l_flash_info[i].device_id == id)
+                       flash_info = &sst25l_flash_info[i];
+
+       if (!flash_info)
+               dev_err(&spi->dev, "unknown id %.4x\n", id);
+
+       return flash_info;
+}
+
+static int __init sst25l_probe(struct spi_device *spi)
+{
+       struct flash_info *flash_info;
+       struct sst25l_flash *flash;
+       struct flash_platform_data *data;
+       int ret, i;
+
+       flash_info = sst25l_match_device(spi);
+       if (!flash_info)
+               return -ENODEV;
+
+       flash = kzalloc(sizeof(struct sst25l_flash), GFP_KERNEL);
+       if (!flash)
+               return -ENOMEM;
+
+       flash->spi = spi;
+       mutex_init(&flash->lock);
+       dev_set_drvdata(&spi->dev, flash);
+
+       data = spi->dev.platform_data;
+       if (data && data->name)
+               flash->mtd.name = data->name;
+       else
+               flash->mtd.name = dev_name(&spi->dev);
+
+       flash->mtd.type         = MTD_NORFLASH;
+       flash->mtd.flags        = MTD_CAP_NORFLASH;
+       flash->mtd.erasesize    = flash_info->erase_size;
+       flash->mtd.writesize    = flash_info->page_size;
+       flash->mtd.size         = flash_info->page_size * flash_info->nr_pages;
+       flash->mtd.erase        = sst25l_erase;
+       flash->mtd.read         = sst25l_read;
+       flash->mtd.write        = sst25l_write;
+
+       dev_info(&spi->dev, "%s (%lld KiB)\n", flash_info->name,
+                (long long)flash->mtd.size >> 10);
+
+       DEBUG(MTD_DEBUG_LEVEL2,
+             "mtd .name = %s, .size = 0x%llx (%lldMiB) "
+             ".erasesize = 0x%.8x (%uKiB) .numeraseregions = %d\n",
+             flash->mtd.name,
+             (long long)flash->mtd.size, (long long)(flash->mtd.size >> 20),
+             flash->mtd.erasesize, flash->mtd.erasesize / 1024,
+             flash->mtd.numeraseregions);
+
+       if (flash->mtd.numeraseregions)
+               for (i = 0; i < flash->mtd.numeraseregions; i++)
+                       DEBUG(MTD_DEBUG_LEVEL2,
+                             "mtd.eraseregions[%d] = { .offset = 0x%llx, "
+                             ".erasesize = 0x%.8x (%uKiB), "
+                             ".numblocks = %d }\n",
+                             i, (long long)flash->mtd.eraseregions[i].offset,
+                             flash->mtd.eraseregions[i].erasesize,
+                             flash->mtd.eraseregions[i].erasesize / 1024,
+                             flash->mtd.eraseregions[i].numblocks);
+
+       if (mtd_has_partitions()) {
+               struct mtd_partition *parts = NULL;
+               int nr_parts = 0;
+
+               if (mtd_has_cmdlinepart()) {
+                       static const char *part_probes[] =
+                               {"cmdlinepart", NULL};
+
+                       nr_parts = parse_mtd_partitions(&flash->mtd,
+                                                       part_probes,
+                                                       &parts, 0);
+               }
+
+               if (nr_parts <= 0 && data && data->parts) {
+                       parts = data->parts;
+                       nr_parts = data->nr_parts;
+               }
+
+               if (nr_parts > 0) {
+                       for (i = 0; i < nr_parts; i++) {
+                               DEBUG(MTD_DEBUG_LEVEL2, "partitions[%d] = "
+                                     "{.name = %s, .offset = 0x%llx, "
+                                     ".size = 0x%llx (%lldKiB) }\n",
+                                     i, parts[i].name,
+                                     (long long)parts[i].offset,
+                                     (long long)parts[i].size,
+                                     (long long)(parts[i].size >> 10));
+                       }
+
+                       flash->partitioned = 1;
+                       return add_mtd_partitions(&flash->mtd,
+                                                 parts, nr_parts);
+               }
+
+       } else if (data->nr_parts) {
+               dev_warn(&spi->dev, "ignoring %d default partitions on %s\n",
+                        data->nr_parts, data->name);
+       }
+
+       ret = add_mtd_device(&flash->mtd);
+       if (ret == 1) {
+               kfree(flash);
+               dev_set_drvdata(&spi->dev, NULL);
+               return -ENODEV;
+       }
+
+       return 0;
+}
+
+static int __exit sst25l_remove(struct spi_device *spi)
+{
+       struct sst25l_flash *flash = dev_get_drvdata(&spi->dev);
+       int ret;
+
+       if (mtd_has_partitions() && flash->partitioned)
+               ret = del_mtd_partitions(&flash->mtd);
+       else
+               ret = del_mtd_device(&flash->mtd);
+       if (ret == 0)
+               kfree(flash);
+       return ret;
+}
+
+static struct spi_driver sst25l_driver = {
+       .driver = {
+               .name   = "sst25l",
+               .bus    = &spi_bus_type,
+               .owner  = THIS_MODULE,
+       },
+       .probe          = sst25l_probe,
+       .remove         = __exit_p(sst25l_remove),
+};
+
+static int __init sst25l_init(void)
+{
+       return spi_register_driver(&sst25l_driver);
+}
+
+static void __exit sst25l_exit(void)
+{
+       spi_unregister_driver(&sst25l_driver);
+}
+
+module_init(sst25l_init);
+module_exit(sst25l_exit);
+
+MODULE_DESCRIPTION("MTD SPI driver for SST25L Flash chips");
+MODULE_AUTHOR("Andre Renaud <andre@bluewatersys.com>, "
+             "Ryan Mallon <ryan@bluewatersys.com>");
+MODULE_LICENSE("GPL");
index a790c062af1f2688a9f568fec8b62b8194e8d724..e56d6b42f020bb3124cea3f12d5e3d97b32692ad 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);
 }
old mode 100644 (file)
new mode 100755 (executable)
index d8cf29c..8aca552
@@ -550,7 +550,7 @@ hitused:
                         * waiting to be picked up. We're going to have to fold
                         * a chain to make room.
                         */
-                       thisEUN = INFTL_makefreeblock(inftl, BLOCK_NIL);
+                       thisEUN = INFTL_makefreeblock(inftl, block);
 
                        /*
                         * Hopefully we free something, lets try again.
index 7a58bd5522fd736a83584acaf9a9472b4a57e876..3a9a960644b69464c45236803db90b0e832cdf17 100644 (file)
@@ -484,9 +484,19 @@ config MTD_BFIN_ASYNC
 
          If compiled as a module, it will be called bfin-async-flash.
 
+config MTD_GPIO_ADDR
+       tristate "GPIO-assisted Flash Chip Support"
+       depends on MTD_COMPLEX_MAPPINGS
+       select MTD_PARTITIONS
+       help
+         Map driver which allows flashes to be partially physically addressed
+         and assisted by GPIOs.
+
+         If compiled as a module, it will be called gpio-addr-flash.
+
 config MTD_UCLINUX
        bool "Generic uClinux RAM/ROM filesystem support"
-       depends on MTD_PARTITIONS && MTD_RAM && !MMU
+       depends on MTD_PARTITIONS && MTD_RAM=y && !MMU
        help
          Map driver to support image based filesystems for uClinux.
 
index 5beb0662d724b7097d3bb7fd5c62169f715d6a3e..1d5cf8636723104f942a073ef72275c74b0ddaec 100644 (file)
@@ -58,5 +58,4 @@ obj-$(CONFIG_MTD_PLATRAM)     += plat-ram.o
 obj-$(CONFIG_MTD_OMAP_NOR)     += omap_nor.o
 obj-$(CONFIG_MTD_INTEL_VR_NOR) += intel_vr_nor.o
 obj-$(CONFIG_MTD_BFIN_ASYNC)   += bfin-async-flash.o
-obj-$(CONFIG_MTD_RBTX4939)     += rbtx4939-flash.o
-obj-$(CONFIG_MTD_VMU)          += vmu-flash.o
+obj-$(CONFIG_MTD_GPIO_ADDR)    += gpio-addr-flash.o
diff --git a/drivers/mtd/maps/gpio-addr-flash.c b/drivers/mtd/maps/gpio-addr-flash.c
new file mode 100644 (file)
index 0000000..44ef9a4
--- /dev/null
@@ -0,0 +1,311 @@
+/*
+ * drivers/mtd/maps/gpio-addr-flash.c
+ *
+ * Handle the case where a flash device is mostly addressed using physical
+ * line and supplemented by GPIOs.  This way you can hook up say a 8MiB flash
+ * to a 2MiB memory range and use the GPIOs to select a particular range.
+ *
+ * Copyright Â© 2000 Nicolas Pitre <nico@cam.org>
+ * Copyright Â© 2005-2009 Analog Devices Inc.
+ *
+ * Enter bugs at http://blackfin.uclinux.org/
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/map.h>
+#include <linux/mtd/partitions.h>
+#include <linux/mtd/physmap.h>
+#include <linux/platform_device.h>
+#include <linux/types.h>
+
+#include <asm/gpio.h>
+#include <asm/io.h>
+
+#define pr_devinit(fmt, args...) ({ static const __devinitconst char __fmt[] = fmt; printk(__fmt, ## args); })
+
+#define DRIVER_NAME "gpio-addr-flash"
+#define PFX DRIVER_NAME ": "
+
+/**
+ * struct async_state - keep GPIO flash state
+ *     @mtd:         MTD state for this mapping
+ *     @map:         MTD map state for this flash
+ *     @gpio_count:  number of GPIOs used to address
+ *     @gpio_addrs:  array of GPIOs to twiddle
+ *     @gpio_values: cached GPIO values
+ *     @win_size:    dedicated memory size (if no GPIOs)
+ */
+struct async_state {
+       struct mtd_info *mtd;
+       struct map_info map;
+       size_t gpio_count;
+       unsigned *gpio_addrs;
+       int *gpio_values;
+       unsigned long win_size;
+};
+#define gf_map_info_to_state(mi) ((struct async_state *)(mi)->map_priv_1)
+
+/**
+ * gf_set_gpios() - set GPIO address lines to access specified flash offset
+ *     @state: GPIO flash state
+ *     @ofs:   desired offset to access
+ *
+ * Rather than call the GPIO framework every time, cache the last-programmed
+ * value.  This speeds up sequential accesses (which are by far the most common
+ * type).  We rely on the GPIO framework to treat non-zero value as high so
+ * that we don't have to normalize the bits.
+ */
+static void gf_set_gpios(struct async_state *state, unsigned long ofs)
+{
+       size_t i = 0;
+       int value;
+       ofs /= state->win_size;
+       do {
+               value = ofs & (1 << i);
+               if (state->gpio_values[i] != value) {
+                       gpio_set_value(state->gpio_addrs[i], value);
+                       state->gpio_values[i] = value;
+               }
+       } while (++i < state->gpio_count);
+}
+
+/**
+ * gf_read() - read a word at the specified offset
+ *     @map: MTD map state
+ *     @ofs: desired offset to read
+ */
+static map_word gf_read(struct map_info *map, unsigned long ofs)
+{
+       struct async_state *state = gf_map_info_to_state(map);
+       uint16_t word;
+       map_word test;
+
+       gf_set_gpios(state, ofs);
+
+       word = readw(map->virt + (ofs % state->win_size));
+       test.x[0] = word;
+       return test;
+}
+
+/**
+ * gf_copy_from() - copy a chunk of data from the flash
+ *     @map:  MTD map state
+ *     @to:   memory to copy to
+ *     @from: flash offset to copy from
+ *     @len:  how much to copy
+ *
+ * We rely on the MTD layer to chunk up copies such that a single request here
+ * will not cross a window size.  This allows us to only wiggle the GPIOs once
+ * before falling back to a normal memcpy.  Reading the higher layer code shows
+ * that this is indeed the case, but add a BUG_ON() to future proof.
+ */
+static void gf_copy_from(struct map_info *map, void *to, unsigned long from, ssize_t len)
+{
+       struct async_state *state = gf_map_info_to_state(map);
+
+       gf_set_gpios(state, from);
+
+       /* BUG if operation crosses the win_size */
+       BUG_ON(!((from + len) % state->win_size <= (from + len)));
+
+       /* operation does not cross the win_size, so one shot it */
+       memcpy_fromio(to, map->virt + (from % state->win_size), len);
+}
+
+/**
+ * gf_write() - write a word at the specified offset
+ *     @map: MTD map state
+ *     @ofs: desired offset to write
+ */
+static void gf_write(struct map_info *map, map_word d1, unsigned long ofs)
+{
+       struct async_state *state = gf_map_info_to_state(map);
+       uint16_t d;
+
+       gf_set_gpios(state, ofs);
+
+       d = d1.x[0];
+       writew(d, map->virt + (ofs % state->win_size));
+}
+
+/**
+ * gf_copy_to() - copy a chunk of data to the flash
+ *     @map:  MTD map state
+ *     @to:   flash offset to copy to
+ *     @from: memory to copy from
+ *     @len:  how much to copy
+ *
+ * See gf_copy_from() caveat.
+ */
+static void gf_copy_to(struct map_info *map, unsigned long to, const void *from, ssize_t len)
+{
+       struct async_state *state = gf_map_info_to_state(map);
+
+       gf_set_gpios(state, to);
+
+       /* BUG if operation crosses the win_size */
+       BUG_ON(!((to + len) % state->win_size <= (to + len)));
+
+       /* operation does not cross the win_size, so one shot it */
+       memcpy_toio(map->virt + (to % state->win_size), from, len);
+}
+
+#ifdef CONFIG_MTD_PARTITIONS
+static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", NULL };
+#endif
+
+/**
+ * gpio_flash_probe() - setup a mapping for a GPIO assisted flash
+ *     @pdev: platform device
+ *
+ * The platform resource layout expected looks something like:
+ * struct mtd_partition partitions[] = { ... };
+ * struct physmap_flash_data flash_data = { ... };
+ * unsigned flash_gpios[] = { GPIO_XX, GPIO_XX, ... };
+ * struct resource flash_resource[] = {
+ *     {
+ *             .name  = "cfi_probe",
+ *             .start = 0x20000000,
+ *             .end   = 0x201fffff,
+ *             .flags = IORESOURCE_MEM,
+ *     }, {
+ *             .start = (unsigned long)flash_gpios,
+ *             .end   = ARRAY_SIZE(flash_gpios),
+ *             .flags = IORESOURCE_IRQ,
+ *     }
+ * };
+ * struct platform_device flash_device = {
+ *     .name          = "gpio-addr-flash",
+ *     .dev           = { .platform_data = &flash_data, },
+ *     .num_resources = ARRAY_SIZE(flash_resource),
+ *     .resource      = flash_resource,
+ *     ...
+ * };
+ */
+static int __devinit gpio_flash_probe(struct platform_device *pdev)
+{
+       int ret;
+       size_t i, arr_size;
+       struct physmap_flash_data *pdata;
+       struct resource *memory;
+       struct resource *gpios;
+       struct async_state *state;
+
+       pdata = pdev->dev.platform_data;
+       memory = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       gpios = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
+
+       if (!memory || !gpios || !gpios->end)
+               return -EINVAL;
+
+       arr_size = sizeof(int) * gpios->end;
+       state = kzalloc(sizeof(*state) + arr_size, GFP_KERNEL);
+       if (!state)
+               return -ENOMEM;
+
+       state->gpio_count     = gpios->end;
+       state->gpio_addrs     = (void *)gpios->start;
+       state->gpio_values    = (void *)(state + 1);
+       state->win_size       = memory->end - memory->start + 1;
+       memset(state->gpio_values, 0xff, arr_size);
+
+       state->map.name       = DRIVER_NAME;
+       state->map.read       = gf_read;
+       state->map.copy_from  = gf_copy_from;
+       state->map.write      = gf_write;
+       state->map.copy_to    = gf_copy_to;
+       state->map.bankwidth  = pdata->width;
+       state->map.size       = state->win_size * (1 << state->gpio_count);
+       state->map.virt       = (void __iomem *)memory->start;
+       state->map.phys       = NO_XIP;
+       state->map.map_priv_1 = (unsigned long)state;
+
+       platform_set_drvdata(pdev, state);
+
+       i = 0;
+       do {
+               if (gpio_request(state->gpio_addrs[i], DRIVER_NAME)) {
+                       pr_devinit(KERN_ERR PFX "failed to request gpio %d\n",
+                               state->gpio_addrs[i]);
+                       while (i--)
+                               gpio_free(state->gpio_addrs[i]);
+                       kfree(state);
+                       return -EBUSY;
+               }
+               gpio_direction_output(state->gpio_addrs[i], 0);
+       } while (++i < state->gpio_count);
+
+       pr_devinit(KERN_NOTICE PFX "probing %d-bit flash bus\n",
+               state->map.bankwidth * 8);
+       state->mtd = do_map_probe(memory->name, &state->map);
+       if (!state->mtd) {
+               for (i = 0; i < state->gpio_count; ++i)
+                       gpio_free(state->gpio_addrs[i]);
+               kfree(state);
+               return -ENXIO;
+       }
+
+#ifdef CONFIG_MTD_PARTITIONS
+       ret = parse_mtd_partitions(state->mtd, part_probe_types, &pdata->parts, 0);
+       if (ret > 0) {
+               pr_devinit(KERN_NOTICE PFX "Using commandline partition definition\n");
+               add_mtd_partitions(state->mtd, pdata->parts, ret);
+               kfree(pdata->parts);
+
+       } else if (pdata->nr_parts) {
+               pr_devinit(KERN_NOTICE PFX "Using board partition definition\n");
+               add_mtd_partitions(state->mtd, pdata->parts, pdata->nr_parts);
+
+       } else
+#endif
+       {
+               pr_devinit(KERN_NOTICE PFX "no partition info available, registering whole flash at once\n");
+               add_mtd_device(state->mtd);
+       }
+
+       return 0;
+}
+
+static int __devexit gpio_flash_remove(struct platform_device *pdev)
+{
+       struct async_state *state = platform_get_drvdata(pdev);
+       size_t i = 0;
+       do {
+               gpio_free(state->gpio_addrs[i]);
+       } while (++i < state->gpio_count);
+#ifdef CONFIG_MTD_PARTITIONS
+       del_mtd_partitions(state->mtd);
+#endif
+       map_destroy(state->mtd);
+       kfree(state);
+       return 0;
+}
+
+static struct platform_driver gpio_flash_driver = {
+       .probe          = gpio_flash_probe,
+       .remove         = __devexit_p(gpio_flash_remove),
+       .driver         = {
+               .name   = DRIVER_NAME,
+       },
+};
+
+static int __init gpio_flash_init(void)
+{
+       return platform_driver_register(&gpio_flash_driver);
+}
+module_init(gpio_flash_init);
+
+static void __exit gpio_flash_exit(void)
+{
+       platform_driver_unregister(&gpio_flash_driver);
+}
+module_exit(gpio_flash_exit);
+
+MODULE_AUTHOR("Mike Frysinger <vapier@gentoo.org>");
+MODULE_DESCRIPTION("MTD map driver for flashes addressed physically and with gpios");
+MODULE_LICENSE("GPL");
index d4fb9a3ab4dfd88bd4c7a9d456f25d7613b449cc..1bdf0ee6d0b63cb4d4d8e7b396ac01cfb4ba22d9 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 39d357b2eb47fdb24a0b7889cee4adeb46ee3171..61e4eb48bb2d5a37dfad765e3399e3b22d6270f9 100644 (file)
@@ -190,6 +190,7 @@ static int __devinit of_flash_probe(struct of_device *dev,
        const u32 *p;
        int reg_tuple_size;
        struct mtd_info **mtd_list = NULL;
+       resource_size_t res_size;
 
        reg_tuple_size = (of_n_addr_cells(dp) + of_n_size_cells(dp)) * sizeof(u32);
 
@@ -204,7 +205,7 @@ static int __devinit of_flash_probe(struct of_device *dev,
                dev_err(&dev->dev, "Malformed reg property on %s\n",
                                dev->node->full_name);
                err = -EINVAL;
-               goto err_out;
+               goto err_flash_remove;
        }
        count /= reg_tuple_size;
 
@@ -212,14 +213,14 @@ static int __devinit of_flash_probe(struct of_device *dev,
        info = kzalloc(sizeof(struct of_flash) +
                       sizeof(struct of_flash_list) * count, GFP_KERNEL);
        if (!info)
-               goto err_out;
-
-       mtd_list = kzalloc(sizeof(struct mtd_info) * count, GFP_KERNEL);
-       if (!info)
-               goto err_out;
+               goto err_flash_remove;
 
        dev_set_drvdata(&dev->dev, info);
 
+       mtd_list = kzalloc(sizeof(struct mtd_info) * count, GFP_KERNEL);
+       if (!mtd_list)
+               goto err_flash_remove;
+
        for (i = 0; i < count; i++) {
                err = -ENXIO;
                if (of_address_to_resource(dp, i, &res)) {
@@ -233,8 +234,8 @@ static int __devinit of_flash_probe(struct of_device *dev,
                        (unsigned long long)res.end);
 
                err = -EBUSY;
-               info->list[i].res = request_mem_region(res.start, res.end -
-                                                      res.start + 1,
+               res_size = resource_size(&res);
+               info->list[i].res = request_mem_region(res.start, res_size,
                                                       dev_name(&dev->dev));
                if (!info->list[i].res)
                        goto err_out;
@@ -249,7 +250,7 @@ static int __devinit of_flash_probe(struct of_device *dev,
 
                info->list[i].map.name = dev_name(&dev->dev);
                info->list[i].map.phys = res.start;
-               info->list[i].map.size = res.end - res.start + 1;
+               info->list[i].map.size = res_size;
                info->list[i].map.bankwidth = *width;
 
                err = -ENOMEM;
@@ -338,6 +339,7 @@ static int __devinit of_flash_probe(struct of_device *dev,
 
 err_out:
        kfree(mtd_list);
+err_flash_remove:
        of_flash_remove(dev);
 
        return err;
@@ -359,6 +361,10 @@ static struct of_device_id of_flash_match[] = {
                .compatible     = "jedec-flash",
                .data           = (void *)"jedec_probe",
        },
+       {
+               .compatible     = "mtd-ram",
+               .data           = (void *)"map_ram",
+       },
        {
                .type           = "rom",
                .compatible     = "direct-mapped"
index 49c9ece764770e6f8cfddb9d46fd26b94d22bb47..dafb91944e7027db4103ab8d5a51329ac6a69660 100644 (file)
@@ -175,7 +175,7 @@ static int platram_probe(struct platform_device *pdev)
        /* setup map parameters */
 
        info->map.phys = res->start;
-       info->map.size = (res->end - res->start) + 1;
+       info->map.size = resource_size(res);
        info->map.name = pdata->mapname != NULL ?
                        (char *)pdata->mapname : (char *)pdev->name;
        info->map.bankwidth = pdata->bankwidth;
index 4768bd5459d631e4b8a6ee76eb30c03843274b50..c8fd8da4bc8780407b7b5e07a633da68c1909572 100644 (file)
@@ -50,7 +50,7 @@ static int fcnt;
 
 static int __init init_msp_flash(void)
 {
-       int i, j;
+       int i, j, ret = -ENOMEM;
        int offset, coff;
        char *env;
        int pcnt;
@@ -75,14 +75,16 @@ static int __init init_msp_flash(void)
        printk(KERN_NOTICE "Found %d PMC flash devices\n", fcnt);
 
        msp_flash = kmalloc(fcnt * sizeof(struct map_info *), GFP_KERNEL);
+       if (!msp_flash)
+               return -ENOMEM;
+
        msp_parts = kmalloc(fcnt * sizeof(struct mtd_partition *), GFP_KERNEL);
+       if (!msp_parts)
+               goto free_msp_flash;
+
        msp_maps = kcalloc(fcnt, sizeof(struct mtd_info), GFP_KERNEL);
-       if (!msp_flash || !msp_parts || !msp_maps) {
-               kfree(msp_maps);
-               kfree(msp_parts);
-               kfree(msp_flash);
-               return -ENOMEM;
-       }
+       if (!msp_maps)
+               goto free_msp_parts;
 
        /* loop over the flash devices, initializing each */
        for (i = 0; i < fcnt; i++) {
@@ -100,13 +102,18 @@ static int __init init_msp_flash(void)
 
                msp_parts[i] = kcalloc(pcnt, sizeof(struct mtd_partition),
                                       GFP_KERNEL);
+               if (!msp_parts[i])
+                       goto cleanup_loop;
 
                /* now initialize the devices proper */
                flash_name[5] = '0' + i;
                env = prom_getenv(flash_name);
 
-               if (sscanf(env, "%x:%x", &addr, &size) < 2)
-                       return -ENXIO;
+               if (sscanf(env, "%x:%x", &addr, &size) < 2) {
+                       ret = -ENXIO;
+                       kfree(msp_parts[i]);
+                       goto cleanup_loop;
+               }
                addr = CPHYSADDR(addr);
 
                printk(KERN_NOTICE
@@ -122,13 +129,23 @@ static int __init init_msp_flash(void)
                 */
                if (size > CONFIG_MSP_FLASH_MAP_LIMIT)
                        size = CONFIG_MSP_FLASH_MAP_LIMIT;
+
                msp_maps[i].virt = ioremap(addr, size);
+               if (msp_maps[i].virt == NULL) {
+                       ret = -ENXIO;
+                       kfree(msp_parts[i]);
+                       goto cleanup_loop;
+               }
+
                msp_maps[i].bankwidth = 1;
-               msp_maps[i].name = strncpy(kmalloc(7, GFP_KERNEL),
-                                       flash_name, 7);
+               msp_maps[i].name = kmalloc(7, GFP_KERNEL);
+               if (!msp_maps[i].name) {
+                       iounmap(msp_maps[i].virt);
+                       kfree(msp_parts[i]);
+                       goto cleanup_loop;
+               }
 
-               if (msp_maps[i].virt == NULL)
-                       return -ENXIO;
+               msp_maps[i].name = strncpy(msp_maps[i].name, flash_name, 7);
 
                for (j = 0; j < pcnt; j++) {
                        part_name[5] = '0' + i;
@@ -136,8 +153,14 @@ static int __init init_msp_flash(void)
 
                        env = prom_getenv(part_name);
 
-                       if (sscanf(env, "%x:%x:%n", &offset, &size, &coff) < 2)
-                               return -ENXIO;
+                       if (sscanf(env, "%x:%x:%n", &offset, &size,
+                                               &coff) < 2) {
+                               ret = -ENXIO;
+                               kfree(msp_maps[i].name);
+                               iounmap(msp_maps[i].virt);
+                               kfree(msp_parts[i]);
+                               goto cleanup_loop;
+                       }
 
                        msp_parts[i][j].size = size;
                        msp_parts[i][j].offset = offset;
@@ -152,18 +175,37 @@ static int __init init_msp_flash(void)
                        add_mtd_partitions(msp_flash[i], msp_parts[i], pcnt);
                } else {
                        printk(KERN_ERR "map probe failed for flash\n");
-                       return -ENXIO;
+                       ret = -ENXIO;
+                       kfree(msp_maps[i].name);
+                       iounmap(msp_maps[i].virt);
+                       kfree(msp_parts[i]);
+                       goto cleanup_loop;
                }
        }
 
        return 0;
+
+cleanup_loop:
+       while (i--) {
+               del_mtd_partitions(msp_flash[i]);
+               map_destroy(msp_flash[i]);
+               kfree(msp_maps[i].name);
+               iounmap(msp_maps[i].virt);
+               kfree(msp_parts[i]);
+       }
+       kfree(msp_maps);
+free_msp_parts:
+       kfree(msp_parts);
+free_msp_flash:
+       kfree(msp_flash);
+       return ret;
 }
 
 static void __exit cleanup_msp_flash(void)
 {
        int i;
 
-       for (i = 0; i < sizeof(msp_flash) / sizeof(struct mtd_info **); i++) {
+       for (i = 0; i < fcnt; i++) {
                del_mtd_partitions(msp_flash[i]);
                map_destroy(msp_flash[i]);
                iounmap((void *)msp_maps[i].virt);
index d4314fb8821219c78279599a8113efab68f76b4f..35009294b435f33a62c0dbb4496ffe5c8b189174 100644 (file)
@@ -89,7 +89,11 @@ static int __init uclinux_mtd_init(void)
        mtd->priv = mapp;
 
        uclinux_ram_mtdinfo = mtd;
+#ifdef CONFIG_MTD_PARTITIONS
        add_mtd_partitions(mtd, uclinux_romfs, NUM_PARTITIONS);
+#else
+       add_mtd_device(mtd);
+#endif
 
        return(0);
 }
@@ -99,7 +103,11 @@ static int __init uclinux_mtd_init(void)
 static void __exit uclinux_mtd_cleanup(void)
 {
        if (uclinux_ram_mtdinfo) {
+#ifdef CONFIG_MTD_PARTITIONS
                del_mtd_partitions(uclinux_ram_mtdinfo);
+#else
+               del_mtd_device(uclinux_ram_mtdinfo);
+#endif
                map_destroy(uclinux_ram_mtdinfo);
                uclinux_ram_mtdinfo = NULL;
        }
index 7baba40c1ed225f38921e2143514822080bc67ae..0acbf4f5be50d31e31ccbce8d5e51db854e57f22 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 2d70295a5fa350ae7e541948bfc9623b634b18fa..9f41b1a853c1f051e447f84fea5ec472ab986754 100644 (file)
@@ -84,7 +84,7 @@ static int erase_write (struct mtd_info *mtd, unsigned long pos,
        remove_wait_queue(&wait_q, &wait);
 
        /*
-        * Next, writhe data to flash.
+        * Next, write the data to flash.
         */
 
        ret = mtd->write(mtd, pos, len, &retlen, buf);
index 792b547786b8fdf6c4122f28240b1458c0d80f66..db6de74082ad647d0540b0904e35dacec9c707c9 100644 (file)
@@ -427,7 +427,7 @@ static int concat_erase(struct mtd_info *mtd, struct erase_info *instr)
                 * to-be-erased area begins. Verify that the starting
                 * offset is aligned to this region's erase size:
                 */
-               if (instr->addr & (erase_regions[i].erasesize - 1))
+               if (i < 0 || instr->addr & (erase_regions[i].erasesize - 1))
                        return -EINVAL;
 
                /*
@@ -440,8 +440,8 @@ static int concat_erase(struct mtd_info *mtd, struct erase_info *instr)
                /*
                 * check if the ending offset is aligned to this region's erase size
                 */
-               if ((instr->addr + instr->len) & (erase_regions[i].erasesize -
-                                                 1))
+               if (i < 0 || ((instr->addr + instr->len) &
+                                       (erase_regions[i].erasesize - 1)))
                        return -EINVAL;
        }
 
index 69007a6eff50c3014c10677af1aea8f84a9fde81..467a4f177bfb269d684029954fb1731a011a12ce 100644 (file)
@@ -213,11 +213,11 @@ static struct attribute *mtd_attrs[] = {
        NULL,
 };
 
-struct attribute_group mtd_group = {
+static struct attribute_group mtd_group = {
        .attrs          = mtd_attrs,
 };
 
-const struct attribute_group *mtd_groups[] = {
+static const struct attribute_group *mtd_groups[] = {
        &mtd_group,
        NULL,
 };
index 742504ea96f5de11cfb377a8c82126675958fe62..b8043a9ba32d43329080b3664a8ae8678f7c7693 100644 (file)
@@ -453,7 +453,8 @@ static struct mtd_part *add_one_partition(struct mtd_info *master,
                for (i = 0; i < max && regions[i].offset <= slave->offset; i++)
                        ;
                /* The loop searched for the region _behind_ the first one */
-               i--;
+               if (i > 0)
+                       i--;
 
                /* Pick biggest erasesize */
                for (; i < max && regions[i].offset < end; i++) {
index ce96c091f01be39b23b7b255b84779bfe58e8f32..2fda0b6152463087afd896f66db2703c9bec5920 100644 (file)
@@ -80,6 +80,23 @@ config MTD_NAND_OMAP2
        help
           Support for NAND flash on Texas Instruments OMAP2 and OMAP3 platforms.
 
+config MTD_NAND_OMAP_PREFETCH
+       bool "GPMC prefetch support for NAND Flash device"
+       depends on MTD_NAND && MTD_NAND_OMAP2
+       default y
+       help
+        The NAND device can be accessed for Read/Write using GPMC PREFETCH engine
+        to improve the performance.
+
+config MTD_NAND_OMAP_PREFETCH_DMA
+       depends on MTD_NAND_OMAP_PREFETCH
+       bool "DMA mode"
+       default n
+       help
+        The GPMC PREFETCH engine can be configured eigther in MPU interrupt mode
+        or in DMA interrupt mode.
+        Say y for DMA mode or MPU mode will be used
+
 config MTD_NAND_TS7250
        tristate "NAND Flash device on TS-7250 board"
        depends on MACH_TS72XX
@@ -426,6 +443,12 @@ config MTD_NAND_MXC
          This enables the driver for the NAND flash controller on the
          MXC processors.
 
+config MTD_NAND_NOMADIK
+       tristate "ST Nomadik 8815 NAND support"
+       depends on ARCH_NOMADIK
+       help
+         Driver for the NAND flash controller on the Nomadik, with ECC.
+
 config MTD_NAND_SH_FLCTL
        tristate "Support for NAND on Renesas SuperH FLCTL"
        depends on MTD_NAND && SUPERH && CPU_SUBTYPE_SH7723
@@ -452,4 +475,11 @@ config MTD_NAND_SOCRATES
        help
          Enables support for NAND Flash chips wired onto Socrates board.
 
+config MTD_NAND_W90P910
+       tristate "Support for NAND on w90p910 evaluation board."
+       depends on ARCH_W90X900 && MTD_PARTITIONS
+       help
+         This enables the driver for the NAND Flash on evaluation board based
+         on w90p910.
+
 endif # MTD_NAND
index f3a786b3cff377b182a15ac41ad88546ca4fa940..6950d3dabf104a1815fa5699183633d36b4ae955 100644 (file)
@@ -40,5 +40,7 @@ obj-$(CONFIG_MTD_NAND_SH_FLCTL)               += sh_flctl.o
 obj-$(CONFIG_MTD_NAND_MXC)             += mxc_nand.o
 obj-$(CONFIG_MTD_NAND_SOCRATES)                += socrates_nand.o
 obj-$(CONFIG_MTD_NAND_TXX9NDFMC)       += txx9ndfmc.o
+obj-$(CONFIG_MTD_NAND_W90P910)         += w90p910_nand.o
+obj-$(CONFIG_MTD_NAND_NOMADIK)         += nomadik_nand.o
 
 nand-objs := nand_base.o nand_bbt.o
index 20c828ba94052daae1e7a79ac4b4edb8f6e51104..f8e9975c86e562ca471601ca5f129ee9f402e7cc 100644 (file)
@@ -218,7 +218,7 @@ static int atmel_nand_calculate(struct mtd_info *mtd,
  * buf:        buffer to store read data
  */
 static int atmel_nand_read_page(struct mtd_info *mtd,
-               struct nand_chip *chip, uint8_t *buf)
+               struct nand_chip *chip, uint8_t *buf, int page)
 {
        int eccsize = chip->ecc.size;
        int eccbytes = chip->ecc.bytes;
index 29acd06b1c39709000b65973d29a75f41dfd347d..c828d9ac7bd71a7709fac3ea16bd1e9419e062f6 100644 (file)
@@ -381,7 +381,7 @@ static int cafe_nand_read_oob(struct mtd_info *mtd, struct nand_chip *chip,
  * we need a special oob layout and handling.
  */
 static int cafe_nand_read_page(struct mtd_info *mtd, struct nand_chip *chip,
-                              uint8_t *buf)
+                              uint8_t *buf, int page)
 {
        struct cafe_priv *cafe = mtd->priv;
 
@@ -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 10081e656a6f11d63d76e99544e98e0a5dfd7249..826cacffcefc81b94229bcb77334603839b3460c 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 0fad6487e6f4bcb062334ae082126d73ad41cd59..f13f5b9afaf744f0ef6e234bf45115c01a83b219 100644 (file)
@@ -348,6 +348,12 @@ compare:
        if (!(syndrome[0] | syndrome[1] | syndrome[2] | syndrome[3]))
                return 0;
 
+       /*
+        * Clear any previous address calculation by doing a dummy read of an
+        * error address register.
+        */
+       davinci_nand_readl(info, NAND_ERR_ADD1_OFFSET);
+
        /* Start address calculation, and wait for it to complete.
         * We _could_ start reading more data while this is working,
         * to speed up the overall page read.
@@ -359,8 +365,10 @@ compare:
 
                switch ((fsr >> 8) & 0x0f) {
                case 0:         /* no error, should not happen */
+                       davinci_nand_readl(info, NAND_ERR_ERRVAL1_OFFSET);
                        return 0;
                case 1:         /* five or more errors detected */
+                       davinci_nand_readl(info, NAND_ERR_ERRVAL1_OFFSET);
                        return -EIO;
                case 2:         /* error addresses computed */
                case 3:
@@ -500,6 +508,26 @@ static struct nand_ecclayout hwecc4_small __initconst = {
        },
 };
 
+/* An ECC layout for using 4-bit ECC with large-page (2048bytes) flash,
+ * storing ten ECC bytes plus the manufacturer's bad block marker byte,
+ * and not overlapping the default BBT markers.
+ */
+static struct nand_ecclayout hwecc4_2048 __initconst = {
+       .eccbytes = 40,
+       .eccpos = {
+               /* at the end of spare sector */
+               24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
+               34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
+               44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
+               54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+               },
+       .oobfree = {
+               /* 2 bytes at offset 0 hold manufacturer badblock markers */
+               {.offset = 2, .length = 22, },
+               /* 5 bytes at offset 8 hold BBT markers */
+               /* 8 bytes at offset 16 hold JFFS2 clean markers */
+       },
+};
 
 static int __init nand_davinci_probe(struct platform_device *pdev)
 {
@@ -690,15 +718,20 @@ static int __init nand_davinci_probe(struct platform_device *pdev)
                                info->mtd.oobsize - 16;
                        goto syndrome_done;
                }
+               if (chunks == 4) {
+                       info->ecclayout = hwecc4_2048;
+                       info->chip.ecc.mode = NAND_ECC_HW_OOB_FIRST;
+                       goto syndrome_done;
+               }
 
-               /* For large page chips we'll be wanting to use a
-                * not-yet-implemented mode that reads OOB data
-                * before reading the body of the page, to avoid
-                * the "infix OOB" model of NAND_ECC_HW_SYNDROME
-                * (and preserve manufacturer badblock markings).
+               /* 4KiB page chips are not yet supported. The eccpos from
+                * nand_ecclayout cannot hold 80 bytes and change to eccpos[]
+                * breaks userspace ioctl interface with mtd-utils. Once we
+                * resolve this issue, NAND_ECC_HW_OOB_FIRST mode can be used
+                * for the 4KiB page chips.
                 */
                dev_warn(&pdev->dev, "no 4-bit ECC support yet "
-                               "for large page NAND\n");
+                               "for 4KiB-page NAND\n");
                ret = -EIO;
                goto err_scan;
 
index 1f6eb2578717e479904efad7387164e18d702547..ddd37d2554ede02c08044642d4f30c2d3307ee57 100644 (file)
@@ -739,7 +739,8 @@ static int fsl_elbc_chip_init_tail(struct mtd_info *mtd)
 
 static int fsl_elbc_read_page(struct mtd_info *mtd,
                               struct nand_chip *chip,
-                              uint8_t *buf)
+                             uint8_t *buf,
+                             int page)
 {
        fsl_elbc_read_buf(mtd, buf, mtd->writesize);
        fsl_elbc_read_buf(mtd, chip->oob_poi, mtd->oobsize);
index 76beea40d2cf2d35d6f0f5b32f3b45f404a5704b..65b26d5a5c0d391cf72559f6d6f38eadb7b089a1 100644 (file)
@@ -857,6 +857,17 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command,
        }
 }
 
+/* Define some generic bad / good block scan pattern which are used
+ * while scanning a device for factory marked good / bad blocks. */
+static uint8_t scan_ff_pattern[] = { 0xff, 0xff };
+
+static struct nand_bbt_descr smallpage_memorybased = {
+       .options = NAND_BBT_SCAN2NDPAGE,
+       .offs = 5,
+       .len = 1,
+       .pattern = scan_ff_pattern
+};
+
 static int __init mxcnd_probe(struct platform_device *pdev)
 {
        struct nand_chip *this;
@@ -973,7 +984,10 @@ static int __init mxcnd_probe(struct platform_device *pdev)
                goto escan;
        }
 
-       host->pagesize_2k = (mtd->writesize == 2048) ? 1 : 0;
+       if (mtd->writesize == 2048) {
+               host->pagesize_2k = 1;
+               this->badblock_pattern = &smallpage_memorybased;
+       }
 
        if (this->ecc.mode == NAND_ECC_HW) {
                switch (mtd->oobsize) {
index 8c21b89d2d0c2a7ea79eccf0d9c840771c68a58a..22113865438b83eab930c9aa839a127c6a5c8de3 100644 (file)
@@ -688,8 +688,7 @@ nand_get_device(struct nand_chip *chip, struct mtd_info *mtd, int new_state)
  retry:
        spin_lock(lock);
 
-       /* Hardware controller shared among independend devices */
-       /* Hardware controller shared among independend devices */
+       /* Hardware controller shared among independent devices */
        if (!chip->controller->active)
                chip->controller->active = chip;
 
@@ -766,7 +765,7 @@ static int nand_wait(struct mtd_info *mtd, struct nand_chip *chip)
  * Not for syndrome calculating ecc controllers, which use a special oob layout
  */
 static int nand_read_page_raw(struct mtd_info *mtd, struct nand_chip *chip,
-                             uint8_t *buf)
+                             uint8_t *buf, int page)
 {
        chip->read_buf(mtd, buf, mtd->writesize);
        chip->read_buf(mtd, chip->oob_poi, mtd->oobsize);
@@ -782,7 +781,7 @@ static int nand_read_page_raw(struct mtd_info *mtd, struct nand_chip *chip,
  * We need a special oob layout and handling even when OOB isn't used.
  */
 static int nand_read_page_raw_syndrome(struct mtd_info *mtd, struct nand_chip *chip,
-                             uint8_t *buf)
+                             uint8_t *buf, int page)
 {
        int eccsize = chip->ecc.size;
        int eccbytes = chip->ecc.bytes;
@@ -821,7 +820,7 @@ static int nand_read_page_raw_syndrome(struct mtd_info *mtd, struct nand_chip *c
  * @buf:       buffer to store read data
  */
 static int nand_read_page_swecc(struct mtd_info *mtd, struct nand_chip *chip,
-                               uint8_t *buf)
+                               uint8_t *buf, int page)
 {
        int i, eccsize = chip->ecc.size;
        int eccbytes = chip->ecc.bytes;
@@ -831,7 +830,7 @@ static int nand_read_page_swecc(struct mtd_info *mtd, struct nand_chip *chip,
        uint8_t *ecc_code = chip->buffers->ecccode;
        uint32_t *eccpos = chip->ecc.layout->eccpos;
 
-       chip->ecc.read_page_raw(mtd, chip, buf);
+       chip->ecc.read_page_raw(mtd, chip, buf, page);
 
        for (i = 0; eccsteps; eccsteps--, i += eccbytes, p += eccsize)
                chip->ecc.calculate(mtd, p, &ecc_calc[i]);
@@ -944,7 +943,7 @@ static int nand_read_subpage(struct mtd_info *mtd, struct nand_chip *chip, uint3
  * Not for syndrome calculating ecc controllers which need a special oob layout
  */
 static int nand_read_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip,
-                               uint8_t *buf)
+                               uint8_t *buf, int page)
 {
        int i, eccsize = chip->ecc.size;
        int eccbytes = chip->ecc.bytes;
@@ -979,6 +978,54 @@ static int nand_read_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip,
        return 0;
 }
 
+/**
+ * nand_read_page_hwecc_oob_first - [REPLACABLE] hw ecc, read oob first
+ * @mtd:       mtd info structure
+ * @chip:      nand chip info structure
+ * @buf:       buffer to store read data
+ *
+ * Hardware ECC for large page chips, require OOB to be read first.
+ * For this ECC mode, the write_page method is re-used from ECC_HW.
+ * These methods read/write ECC from the OOB area, unlike the
+ * ECC_HW_SYNDROME support with multiple ECC steps, follows the
+ * "infix ECC" scheme and reads/writes ECC from the data area, by
+ * overwriting the NAND manufacturer bad block markings.
+ */
+static int nand_read_page_hwecc_oob_first(struct mtd_info *mtd,
+       struct nand_chip *chip, uint8_t *buf, int page)
+{
+       int i, eccsize = chip->ecc.size;
+       int eccbytes = chip->ecc.bytes;
+       int eccsteps = chip->ecc.steps;
+       uint8_t *p = buf;
+       uint8_t *ecc_code = chip->buffers->ecccode;
+       uint32_t *eccpos = chip->ecc.layout->eccpos;
+       uint8_t *ecc_calc = chip->buffers->ecccalc;
+
+       /* Read the OOB area first */
+       chip->cmdfunc(mtd, NAND_CMD_READOOB, 0, page);
+       chip->read_buf(mtd, chip->oob_poi, mtd->oobsize);
+       chip->cmdfunc(mtd, NAND_CMD_READ0, 0, page);
+
+       for (i = 0; i < chip->ecc.total; i++)
+               ecc_code[i] = chip->oob_poi[eccpos[i]];
+
+       for (i = 0; eccsteps; eccsteps--, i += eccbytes, p += eccsize) {
+               int stat;
+
+               chip->ecc.hwctl(mtd, NAND_ECC_READ);
+               chip->read_buf(mtd, p, eccsize);
+               chip->ecc.calculate(mtd, p, &ecc_calc[i]);
+
+               stat = chip->ecc.correct(mtd, p, &ecc_code[i], NULL);
+               if (stat < 0)
+                       mtd->ecc_stats.failed++;
+               else
+                       mtd->ecc_stats.corrected += stat;
+       }
+       return 0;
+}
+
 /**
  * nand_read_page_syndrome - [REPLACABLE] hardware ecc syndrom based page read
  * @mtd:       mtd info structure
@@ -989,7 +1036,7 @@ static int nand_read_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip,
  * we need a special oob layout and handling.
  */
 static int nand_read_page_syndrome(struct mtd_info *mtd, struct nand_chip *chip,
-                                  uint8_t *buf)
+                                  uint8_t *buf, int page)
 {
        int i, eccsize = chip->ecc.size;
        int eccbytes = chip->ecc.bytes;
@@ -1131,11 +1178,13 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from,
 
                        /* Now read the page into the buffer */
                        if (unlikely(ops->mode == MTD_OOB_RAW))
-                               ret = chip->ecc.read_page_raw(mtd, chip, bufpoi);
+                               ret = chip->ecc.read_page_raw(mtd, chip,
+                                                             bufpoi, page);
                        else if (!aligned && NAND_SUBPAGE_READ(chip) && !oob)
                                ret = chip->ecc.read_subpage(mtd, chip, col, bytes, bufpoi);
                        else
-                               ret = chip->ecc.read_page(mtd, chip, bufpoi);
+                               ret = chip->ecc.read_page(mtd, chip, bufpoi,
+                                                         page);
                        if (ret < 0)
                                break;
 
@@ -1413,8 +1462,8 @@ static int nand_do_read_oob(struct mtd_info *mtd, loff_t from,
        int len;
        uint8_t *buf = ops->oobbuf;
 
-       DEBUG(MTD_DEBUG_LEVEL3, "nand_read_oob: from = 0x%08Lx, len = %i\n",
-             (unsigned long long)from, readlen);
+       DEBUG(MTD_DEBUG_LEVEL3, "%s: from = 0x%08Lx, len = %i\n",
+                       __func__, (unsigned long long)from, readlen);
 
        if (ops->mode == MTD_OOB_AUTO)
                len = chip->ecc.layout->oobavail;
@@ -1422,8 +1471,8 @@ static int nand_do_read_oob(struct mtd_info *mtd, loff_t from,
                len = mtd->oobsize;
 
        if (unlikely(ops->ooboffs >= len)) {
-               DEBUG(MTD_DEBUG_LEVEL0, "nand_read_oob: "
-                       "Attempt to start read outside oob\n");
+               DEBUG(MTD_DEBUG_LEVEL0, "%s: Attempt to start read "
+                                       "outside oob\n", __func__);
                return -EINVAL;
        }
 
@@ -1431,8 +1480,8 @@ static int nand_do_read_oob(struct mtd_info *mtd, loff_t from,
        if (unlikely(from >= mtd->size ||
                     ops->ooboffs + readlen > ((mtd->size >> chip->page_shift) -
                                        (from >> chip->page_shift)) * len)) {
-               DEBUG(MTD_DEBUG_LEVEL0, "nand_read_oob: "
-                       "Attempt read beyond end of device\n");
+               DEBUG(MTD_DEBUG_LEVEL0, "%s: Attempt read beyond end "
+                                       "of device\n", __func__);
                return -EINVAL;
        }
 
@@ -1506,8 +1555,8 @@ static int nand_read_oob(struct mtd_info *mtd, loff_t from,
 
        /* Do not allow reads past end of device */
        if (ops->datbuf && (from + ops->len) > mtd->size) {
-               DEBUG(MTD_DEBUG_LEVEL0, "nand_read_oob: "
-                     "Attempt read beyond end of device\n");
+               DEBUG(MTD_DEBUG_LEVEL0, "%s: Attempt read "
+                               "beyond end of device\n", __func__);
                return -EINVAL;
        }
 
@@ -1816,8 +1865,8 @@ static int nand_do_write_ops(struct mtd_info *mtd, loff_t to,
 
        /* reject writes, which are not page aligned */
        if (NOTALIGNED(to) || NOTALIGNED(ops->len)) {
-               printk(KERN_NOTICE "nand_write: "
-                      "Attempt to write not page aligned data\n");
+               printk(KERN_NOTICE "%s: Attempt to write not "
+                               "page aligned data\n", __func__);
                return -EINVAL;
        }
 
@@ -1944,8 +1993,8 @@ static int nand_do_write_oob(struct mtd_info *mtd, loff_t to,
        int chipnr, page, status, len;
        struct nand_chip *chip = mtd->priv;
 
-       DEBUG(MTD_DEBUG_LEVEL3, "nand_write_oob: to = 0x%08x, len = %i\n",
-             (unsigned int)to, (int)ops->ooblen);
+       DEBUG(MTD_DEBUG_LEVEL3, "%s: to = 0x%08x, len = %i\n",
+                        __func__, (unsigned int)to, (int)ops->ooblen);
 
        if (ops->mode == MTD_OOB_AUTO)
                len = chip->ecc.layout->oobavail;
@@ -1954,14 +2003,14 @@ static int nand_do_write_oob(struct mtd_info *mtd, loff_t to,
 
        /* Do not allow write past end of page */
        if ((ops->ooboffs + ops->ooblen) > len) {
-               DEBUG(MTD_DEBUG_LEVEL0, "nand_write_oob: "
-                     "Attempt to write past end of page\n");
+               DEBUG(MTD_DEBUG_LEVEL0, "%s: Attempt to write "
+                               "past end of page\n", __func__);
                return -EINVAL;
        }
 
        if (unlikely(ops->ooboffs >= len)) {
-               DEBUG(MTD_DEBUG_LEVEL0, "nand_do_write_oob: "
-                       "Attempt to start write outside oob\n");
+               DEBUG(MTD_DEBUG_LEVEL0, "%s: Attempt to start "
+                               "write outside oob\n", __func__);
                return -EINVAL;
        }
 
@@ -1970,8 +2019,8 @@ static int nand_do_write_oob(struct mtd_info *mtd, loff_t to,
                     ops->ooboffs + ops->ooblen >
                        ((mtd->size >> chip->page_shift) -
                         (to >> chip->page_shift)) * len)) {
-               DEBUG(MTD_DEBUG_LEVEL0, "nand_do_write_oob: "
-                       "Attempt write beyond end of device\n");
+               DEBUG(MTD_DEBUG_LEVEL0, "%s: Attempt write beyond "
+                               "end of device\n", __func__);
                return -EINVAL;
        }
 
@@ -2026,8 +2075,8 @@ static int nand_write_oob(struct mtd_info *mtd, loff_t to,
 
        /* Do not allow writes past end of device */
        if (ops->datbuf && (to + ops->len) > mtd->size) {
-               DEBUG(MTD_DEBUG_LEVEL0, "nand_write_oob: "
-                     "Attempt write beyond end of device\n");
+               DEBUG(MTD_DEBUG_LEVEL0, "%s: Attempt write beyond "
+                               "end of device\n", __func__);
                return -EINVAL;
        }
 
@@ -2117,26 +2166,27 @@ int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr,
        unsigned int bbt_masked_page = 0xffffffff;
        loff_t len;
 
-       DEBUG(MTD_DEBUG_LEVEL3, "nand_erase: start = 0x%012llx, len = %llu\n",
-             (unsigned long long)instr->addr, (unsigned long long)instr->len);
+       DEBUG(MTD_DEBUG_LEVEL3, "%s: start = 0x%012llx, len = %llu\n",
+                               __func__, (unsigned long long)instr->addr,
+                               (unsigned long long)instr->len);
 
        /* Start address must align on block boundary */
        if (instr->addr & ((1 << chip->phys_erase_shift) - 1)) {
-               DEBUG(MTD_DEBUG_LEVEL0, "nand_erase: Unaligned address\n");
+               DEBUG(MTD_DEBUG_LEVEL0, "%s: Unaligned address\n", __func__);
                return -EINVAL;
        }
 
        /* Length must align on block boundary */
        if (instr->len & ((1 << chip->phys_erase_shift) - 1)) {
-               DEBUG(MTD_DEBUG_LEVEL0, "nand_erase: "
-                     "Length not block aligned\n");
+               DEBUG(MTD_DEBUG_LEVEL0, "%s: Length not block aligned\n",
+                                       __func__);
                return -EINVAL;
        }
 
        /* Do not allow erase past end of device */
        if ((instr->len + instr->addr) > mtd->size) {
-               DEBUG(MTD_DEBUG_LEVEL0, "nand_erase: "
-                     "Erase past end of device\n");
+               DEBUG(MTD_DEBUG_LEVEL0, "%s: Erase past end of device\n",
+                                       __func__);
                return -EINVAL;
        }
 
@@ -2157,8 +2207,8 @@ int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr,
 
        /* Check, if it is write protected */
        if (nand_check_wp(mtd)) {
-               DEBUG(MTD_DEBUG_LEVEL0, "nand_erase: "
-                     "Device is write protected!!!\n");
+               DEBUG(MTD_DEBUG_LEVEL0, "%s: Device is write protected!!!\n",
+                                       __func__);
                instr->state = MTD_ERASE_FAILED;
                goto erase_exit;
        }
@@ -2183,8 +2233,8 @@ int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr,
                 */
                if (nand_block_checkbad(mtd, ((loff_t) page) <<
                                        chip->page_shift, 0, allowbbt)) {
-                       printk(KERN_WARNING "nand_erase: attempt to erase a "
-                              "bad block at page 0x%08x\n", page);
+                       printk(KERN_WARNING "%s: attempt to erase a bad block "
+                                       "at page 0x%08x\n", __func__, page);
                        instr->state = MTD_ERASE_FAILED;
                        goto erase_exit;
                }
@@ -2211,8 +2261,8 @@ int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr,
 
                /* See if block erase succeeded */
                if (status & NAND_STATUS_FAIL) {
-                       DEBUG(MTD_DEBUG_LEVEL0, "nand_erase: "
-                             "Failed erase, page 0x%08x\n", page);
+                       DEBUG(MTD_DEBUG_LEVEL0, "%s: Failed erase, "
+                                       "page 0x%08x\n", __func__, page);
                        instr->state = MTD_ERASE_FAILED;
                        instr->fail_addr =
                                ((loff_t)page << chip->page_shift);
@@ -2272,9 +2322,9 @@ int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr,
                if (!rewrite_bbt[chipnr])
                        continue;
                /* update the BBT for chip */
-               DEBUG(MTD_DEBUG_LEVEL0, "nand_erase_nand: nand_update_bbt "
-                     "(%d:0x%0llx 0x%0x)\n", chipnr, rewrite_bbt[chipnr],
-                     chip->bbt_td->pages[chipnr]);
+               DEBUG(MTD_DEBUG_LEVEL0, "%s: nand_update_bbt "
+                       "(%d:0x%0llx 0x%0x)\n", __func__, chipnr,
+                       rewrite_bbt[chipnr], chip->bbt_td->pages[chipnr]);
                nand_update_bbt(mtd, rewrite_bbt[chipnr]);
        }
 
@@ -2292,7 +2342,7 @@ static void nand_sync(struct mtd_info *mtd)
 {
        struct nand_chip *chip = mtd->priv;
 
-       DEBUG(MTD_DEBUG_LEVEL3, "nand_sync: called\n");
+       DEBUG(MTD_DEBUG_LEVEL3, "%s: called\n", __func__);
 
        /* Grab the lock and see if the device is available */
        nand_get_device(chip, mtd, FL_SYNCING);
@@ -2356,8 +2406,8 @@ static void nand_resume(struct mtd_info *mtd)
        if (chip->state == FL_PM_SUSPENDED)
                nand_release_device(mtd);
        else
-               printk(KERN_ERR "nand_resume() called for a chip which is not "
-                      "in suspended state\n");
+               printk(KERN_ERR "%s called for a chip which is not "
+                      "in suspended state\n", __func__);
 }
 
 /*
@@ -2671,6 +2721,17 @@ int nand_scan_tail(struct mtd_info *mtd)
         */
 
        switch (chip->ecc.mode) {
+       case NAND_ECC_HW_OOB_FIRST:
+               /* Similar to NAND_ECC_HW, but a separate read_page handle */
+               if (!chip->ecc.calculate || !chip->ecc.correct ||
+                    !chip->ecc.hwctl) {
+                       printk(KERN_WARNING "No ECC functions supplied; "
+                              "Hardware ECC not possible\n");
+                       BUG();
+               }
+               if (!chip->ecc.read_page)
+                       chip->ecc.read_page = nand_read_page_hwecc_oob_first;
+
        case NAND_ECC_HW:
                /* Use standard hwecc read page function ? */
                if (!chip->ecc.read_page)
@@ -2693,7 +2754,7 @@ int nand_scan_tail(struct mtd_info *mtd)
                     chip->ecc.read_page == nand_read_page_hwecc ||
                     !chip->ecc.write_page ||
                     chip->ecc.write_page == nand_write_page_hwecc)) {
-                       printk(KERN_WARNING "No ECC functions supplied, "
+                       printk(KERN_WARNING "No ECC functions supplied; "
                               "Hardware ECC not possible\n");
                        BUG();
                }
@@ -2728,7 +2789,8 @@ int nand_scan_tail(struct mtd_info *mtd)
                chip->ecc.write_page_raw = nand_write_page_raw;
                chip->ecc.read_oob = nand_read_oob_std;
                chip->ecc.write_oob = nand_write_oob_std;
-               chip->ecc.size = 256;
+               if (!chip->ecc.size)
+                       chip->ecc.size = 256;
                chip->ecc.bytes = 3;
                break;
 
@@ -2858,7 +2920,8 @@ int nand_scan(struct mtd_info *mtd, int maxchips)
 
        /* Many callers got this wrong, so check for it for a while... */
        if (!mtd->owner && caller_is_module()) {
-               printk(KERN_CRIT "nand_scan() called with NULL mtd->owner!\n");
+               printk(KERN_CRIT "%s called with NULL mtd->owner!\n",
+                               __func__);
                BUG();
        }
 
index c0cb87d6d16e27ec697c77e719e6723eae9ce6de..db7ae9d6a29656d3f1826e64f175e3989ec3ad05 100644 (file)
@@ -417,22 +417,22 @@ int nand_calculate_ecc(struct mtd_info *mtd, const unsigned char *buf,
 EXPORT_SYMBOL(nand_calculate_ecc);
 
 /**
- * nand_correct_data - [NAND Interface] Detect and correct bit error(s)
- * @mtd:       MTD block structure
+ * __nand_correct_data - [NAND Interface] Detect and correct bit error(s)
  * @buf:       raw data read from the chip
  * @read_ecc:  ECC from the chip
  * @calc_ecc:  the ECC calculated from raw data
+ * @eccsize:   data bytes per ecc step (256 or 512)
  *
- * Detect and correct a 1 bit error for 256/512 byte block
+ * Detect and correct a 1 bit error for eccsize byte block
  */
-int nand_correct_data(struct mtd_info *mtd, unsigned char *buf,
-                     unsigned char *read_ecc, unsigned char *calc_ecc)
+int __nand_correct_data(unsigned char *buf,
+                       unsigned char *read_ecc, unsigned char *calc_ecc,
+                       unsigned int eccsize)
 {
        unsigned char b0, b1, b2, bit_addr;
        unsigned int byte_addr;
        /* 256 or 512 bytes/ecc  */
-       const uint32_t eccsize_mult =
-                       (((struct nand_chip *)mtd->priv)->ecc.size) >> 8;
+       const uint32_t eccsize_mult = eccsize >> 8;
 
        /*
         * b0 to b2 indicate which bit is faulty (if any)
@@ -495,6 +495,23 @@ int nand_correct_data(struct mtd_info *mtd, unsigned char *buf,
        printk(KERN_ERR "uncorrectable error : ");
        return -1;
 }
+EXPORT_SYMBOL(__nand_correct_data);
+
+/**
+ * nand_correct_data - [NAND Interface] Detect and correct bit error(s)
+ * @mtd:       MTD block structure
+ * @buf:       raw data read from the chip
+ * @read_ecc:  ECC from the chip
+ * @calc_ecc:  the ECC calculated from raw data
+ *
+ * Detect and correct a 1 bit error for 256/512 byte block
+ */
+int nand_correct_data(struct mtd_info *mtd, unsigned char *buf,
+                     unsigned char *read_ecc, unsigned char *calc_ecc)
+{
+       return __nand_correct_data(buf, read_ecc, calc_ecc,
+                                  ((struct nand_chip *)mtd->priv)->ecc.size);
+}
 EXPORT_SYMBOL(nand_correct_data);
 
 MODULE_LICENSE("GPL");
index 89bf85af642cb630b641a73ff966dd73aa60811a..40b5658bdbe6f39ae574fb8b41257c64c17c14b5 100644 (file)
@@ -102,8 +102,8 @@ static int ndfc_calculate_ecc(struct mtd_info *mtd,
        wmb();
        ecc = in_be32(ndfc->ndfcbase + NDFC_ECC);
        /* The NDFC uses Smart Media (SMC) bytes order */
-       ecc_code[0] = p[2];
-       ecc_code[1] = p[1];
+       ecc_code[0] = p[1];
+       ecc_code[1] = p[2];
        ecc_code[2] = p[3];
 
        return 0;
diff --git a/drivers/mtd/nand/nomadik_nand.c b/drivers/mtd/nand/nomadik_nand.c
new file mode 100644 (file)
index 0000000..7c302d5
--- /dev/null
@@ -0,0 +1,250 @@
+/*
+ *  drivers/mtd/nand/nomadik_nand.c
+ *
+ *  Overview:
+ *     Driver for on-board NAND flash on Nomadik Platforms
+ *
+ * Copyright Â© 2007 STMicroelectronics Pvt. Ltd.
+ * Author: Sachin Verma <sachin.verma@st.com>
+ *
+ * Copyright Â© 2009 Alessandro Rubini
+ *
+ * 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/types.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/nand.h>
+#include <linux/mtd/nand_ecc.h>
+#include <linux/platform_device.h>
+#include <linux/mtd/partitions.h>
+#include <linux/io.h>
+#include <mach/nand.h>
+#include <mach/fsmc.h>
+
+#include <mtd/mtd-abi.h>
+
+struct nomadik_nand_host {
+       struct mtd_info         mtd;
+       struct nand_chip        nand;
+       void __iomem *data_va;
+       void __iomem *cmd_va;
+       void __iomem *addr_va;
+       struct nand_bbt_descr *bbt_desc;
+};
+
+static struct nand_ecclayout nomadik_ecc_layout = {
+       .eccbytes = 3 * 4,
+       .eccpos = { /* each subpage has 16 bytes: pos 2,3,4 hosts ECC */
+               0x02, 0x03, 0x04,
+               0x12, 0x13, 0x14,
+               0x22, 0x23, 0x24,
+               0x32, 0x33, 0x34},
+       /* let's keep bytes 5,6,7 for us, just in case we change ECC algo */
+       .oobfree = { {0x08, 0x08}, {0x18, 0x08}, {0x28, 0x08}, {0x38, 0x08} },
+};
+
+static void nomadik_ecc_control(struct mtd_info *mtd, int mode)
+{
+       /* No need to enable hw ecc, it's on by default */
+}
+
+static void nomadik_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)
+{
+       struct nand_chip *nand = mtd->priv;
+       struct nomadik_nand_host *host = nand->priv;
+
+       if (cmd == NAND_CMD_NONE)
+               return;
+
+       if (ctrl & NAND_CLE)
+               writeb(cmd, host->cmd_va);
+       else
+               writeb(cmd, host->addr_va);
+}
+
+static int nomadik_nand_probe(struct platform_device *pdev)
+{
+       struct nomadik_nand_platform_data *pdata = pdev->dev.platform_data;
+       struct nomadik_nand_host *host;
+       struct mtd_info *mtd;
+       struct nand_chip *nand;
+       struct resource *res;
+       int ret = 0;
+
+       /* Allocate memory for the device structure (and zero it) */
+       host = kzalloc(sizeof(struct nomadik_nand_host), GFP_KERNEL);
+       if (!host) {
+               dev_err(&pdev->dev, "Failed to allocate device structure.\n");
+               return -ENOMEM;
+       }
+
+       /* Call the client's init function, if any */
+       if (pdata->init)
+               ret = pdata->init();
+       if (ret < 0) {
+               dev_err(&pdev->dev, "Init function failed\n");
+               goto err;
+       }
+
+       /* ioremap three regions */
+       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "nand_addr");
+       if (!res) {
+               ret = -EIO;
+               goto err_unmap;
+       }
+       host->addr_va = ioremap(res->start, res->end - res->start + 1);
+
+       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "nand_data");
+       if (!res) {
+               ret = -EIO;
+               goto err_unmap;
+       }
+       host->data_va = ioremap(res->start, res->end - res->start + 1);
+
+       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "nand_cmd");
+       if (!res) {
+               ret = -EIO;
+               goto err_unmap;
+       }
+       host->cmd_va = ioremap(res->start, res->end - res->start + 1);
+
+       if (!host->addr_va || !host->data_va || !host->cmd_va) {
+               ret = -ENOMEM;
+               goto err_unmap;
+       }
+
+       /* Link all private pointers */
+       mtd = &host->mtd;
+       nand = &host->nand;
+       mtd->priv = nand;
+       nand->priv = host;
+
+       host->mtd.owner = THIS_MODULE;
+       nand->IO_ADDR_R = host->data_va;
+       nand->IO_ADDR_W = host->data_va;
+       nand->cmd_ctrl = nomadik_cmd_ctrl;
+
+       /*
+        * This stanza declares ECC_HW but uses soft routines. It's because
+        * HW claims to make the calculation but not the correction. However,
+        * I haven't managed to get the desired data out of it until now.
+        */
+       nand->ecc.mode = NAND_ECC_SOFT;
+       nand->ecc.layout = &nomadik_ecc_layout;
+       nand->ecc.hwctl = nomadik_ecc_control;
+       nand->ecc.size = 512;
+       nand->ecc.bytes = 3;
+
+       nand->options = pdata->options;
+
+       /*
+        * Scan to find existance of the device
+        */
+       if (nand_scan(&host->mtd, 1)) {
+               ret = -ENXIO;
+               goto err_unmap;
+       }
+
+#ifdef CONFIG_MTD_PARTITIONS
+       add_mtd_partitions(&host->mtd, pdata->parts, pdata->nparts);
+#else
+       pr_info("Registering %s as whole device\n", mtd->name);
+       add_mtd_device(mtd);
+#endif
+
+       platform_set_drvdata(pdev, host);
+       return 0;
+
+ err_unmap:
+       if (host->cmd_va)
+               iounmap(host->cmd_va);
+       if (host->data_va)
+               iounmap(host->data_va);
+       if (host->addr_va)
+               iounmap(host->addr_va);
+ err:
+       kfree(host);
+       return ret;
+}
+
+/*
+ * Clean up routine
+ */
+static int nomadik_nand_remove(struct platform_device *pdev)
+{
+       struct nomadik_nand_host *host = platform_get_drvdata(pdev);
+       struct nomadik_nand_platform_data *pdata = pdev->dev.platform_data;
+
+       if (pdata->exit)
+               pdata->exit();
+
+       if (host) {
+               iounmap(host->cmd_va);
+               iounmap(host->data_va);
+               iounmap(host->addr_va);
+               kfree(host);
+       }
+       return 0;
+}
+
+static int nomadik_nand_suspend(struct device *dev)
+{
+       struct nomadik_nand_host *host = dev_get_drvdata(dev);
+       int ret = 0;
+       if (host)
+               ret = host->mtd.suspend(&host->mtd);
+       return ret;
+}
+
+static int nomadik_nand_resume(struct device *dev)
+{
+       struct nomadik_nand_host *host = dev_get_drvdata(dev);
+       if (host)
+               host->mtd.resume(&host->mtd);
+       return 0;
+}
+
+static struct dev_pm_ops nomadik_nand_pm_ops = {
+       .suspend = nomadik_nand_suspend,
+       .resume = nomadik_nand_resume,
+};
+
+static struct platform_driver nomadik_nand_driver = {
+       .probe = nomadik_nand_probe,
+       .remove = nomadik_nand_remove,
+       .driver = {
+               .owner = THIS_MODULE,
+               .name = "nomadik_nand",
+               .pm = &nomadik_nand_pm_ops,
+       },
+};
+
+static int __init nand_nomadik_init(void)
+{
+       pr_info("Nomadik NAND driver\n");
+       return platform_driver_register(&nomadik_nand_driver);
+}
+
+static void __exit nand_nomadik_exit(void)
+{
+       platform_driver_unregister(&nomadik_nand_driver);
+}
+
+module_init(nand_nomadik_init);
+module_exit(nand_nomadik_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("ST Microelectronics (sachin.verma@st.com)");
+MODULE_DESCRIPTION("NAND driver for Nomadik Platform");
index ebd07e95b8140354ae8c51061ef7cb9b7945d153..090ab87086b5245ed522ed940658c2db0f825503 100644 (file)
@@ -18,8 +18,7 @@
 #include <linux/mtd/partitions.h>
 #include <linux/io.h>
 
-#include <asm/dma.h>
-
+#include <mach/dma.h>
 #include <mach/gpmc.h>
 #include <mach/nand.h>
 
 static const char *part_probes[] = { "cmdlinepart", NULL };
 #endif
 
+#ifdef CONFIG_MTD_NAND_OMAP_PREFETCH
+static int use_prefetch = 1;
+
+/* "modprobe ... use_prefetch=0" etc */
+module_param(use_prefetch, bool, 0);
+MODULE_PARM_DESC(use_prefetch, "enable/disable use of PREFETCH");
+
+#ifdef CONFIG_MTD_NAND_OMAP_PREFETCH_DMA
+static int use_dma = 1;
+
+/* "modprobe ... use_dma=0" etc */
+module_param(use_dma, bool, 0);
+MODULE_PARM_DESC(use_dma, "enable/disable use of DMA");
+#else
+const int use_dma;
+#endif
+#else
+const int use_prefetch;
+const int use_dma;
+#endif
+
 struct omap_nand_info {
        struct nand_hw_control          controller;
        struct omap_nand_platform_data  *pdata;
@@ -124,6 +144,9 @@ struct omap_nand_info {
        unsigned long                   phys_base;
        void __iomem                    *gpmc_cs_baseaddr;
        void __iomem                    *gpmc_baseaddr;
+       void __iomem                    *nand_pref_fifo_add;
+       struct completion               comp;
+       int                             dma_ch;
 };
 
 /**
@@ -188,6 +211,38 @@ static void omap_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int ctrl)
                __raw_writeb(cmd, info->nand.IO_ADDR_W);
 }
 
+/**
+ * omap_read_buf8 - read data from NAND controller into buffer
+ * @mtd: MTD device structure
+ * @buf: buffer to store date
+ * @len: number of bytes to read
+ */
+static void omap_read_buf8(struct mtd_info *mtd, u_char *buf, int len)
+{
+       struct nand_chip *nand = mtd->priv;
+
+       ioread8_rep(nand->IO_ADDR_R, buf, len);
+}
+
+/**
+ * omap_write_buf8 - write buffer to NAND controller
+ * @mtd: MTD device structure
+ * @buf: data buffer
+ * @len: number of bytes to write
+ */
+static void omap_write_buf8(struct mtd_info *mtd, const u_char *buf, int len)
+{
+       struct omap_nand_info *info = container_of(mtd,
+                                               struct omap_nand_info, mtd);
+       u_char *p = (u_char *)buf;
+
+       while (len--) {
+               iowrite8(*p++, info->nand.IO_ADDR_W);
+               while (GPMC_BUF_EMPTY == (readl(info->gpmc_baseaddr +
+                                               GPMC_STATUS) & GPMC_BUF_FULL));
+       }
+}
+
 /**
  * omap_read_buf16 - read data from NAND controller into buffer
  * @mtd: MTD device structure
@@ -198,7 +253,7 @@ static void omap_read_buf16(struct mtd_info *mtd, u_char *buf, int len)
 {
        struct nand_chip *nand = mtd->priv;
 
-       __raw_readsw(nand->IO_ADDR_R, buf, len / 2);
+       ioread16_rep(nand->IO_ADDR_R, buf, len / 2);
 }
 
 /**
@@ -217,13 +272,242 @@ static void omap_write_buf16(struct mtd_info *mtd, const u_char * buf, int len)
        len >>= 1;
 
        while (len--) {
-               writew(*p++, info->nand.IO_ADDR_W);
+               iowrite16(*p++, info->nand.IO_ADDR_W);
 
                while (GPMC_BUF_EMPTY == (readl(info->gpmc_baseaddr +
                                                GPMC_STATUS) & GPMC_BUF_FULL))
                        ;
        }
 }
+
+/**
+ * omap_read_buf_pref - read data from NAND controller into buffer
+ * @mtd: MTD device structure
+ * @buf: buffer to store date
+ * @len: number of bytes to read
+ */
+static void omap_read_buf_pref(struct mtd_info *mtd, u_char *buf, int len)
+{
+       struct omap_nand_info *info = container_of(mtd,
+                                               struct omap_nand_info, mtd);
+       uint32_t pfpw_status = 0, r_count = 0;
+       int ret = 0;
+       u32 *p = (u32 *)buf;
+
+       /* take care of subpage reads */
+       for (; len % 4 != 0; ) {
+               *buf++ = __raw_readb(info->nand.IO_ADDR_R);
+               len--;
+       }
+       p = (u32 *) buf;
+
+       /* configure and start prefetch transfer */
+       ret = gpmc_prefetch_enable(info->gpmc_cs, 0x0, len, 0x0);
+       if (ret) {
+               /* PFPW engine is busy, use cpu copy method */
+               if (info->nand.options & NAND_BUSWIDTH_16)
+                       omap_read_buf16(mtd, buf, len);
+               else
+                       omap_read_buf8(mtd, buf, len);
+       } else {
+               do {
+                       pfpw_status = gpmc_prefetch_status();
+                       r_count = ((pfpw_status >> 24) & 0x7F) >> 2;
+                       ioread32_rep(info->nand_pref_fifo_add, p, r_count);
+                       p += r_count;
+                       len -= r_count << 2;
+               } while (len);
+
+               /* disable and stop the PFPW engine */
+               gpmc_prefetch_reset();
+       }
+}
+
+/**
+ * omap_write_buf_pref - write buffer to NAND controller
+ * @mtd: MTD device structure
+ * @buf: data buffer
+ * @len: number of bytes to write
+ */
+static void omap_write_buf_pref(struct mtd_info *mtd,
+                                       const u_char *buf, int len)
+{
+       struct omap_nand_info *info = container_of(mtd,
+                                               struct omap_nand_info, mtd);
+       uint32_t pfpw_status = 0, w_count = 0;
+       int i = 0, ret = 0;
+       u16 *p = (u16 *) buf;
+
+       /* take care of subpage writes */
+       if (len % 2 != 0) {
+               writeb(*buf, info->nand.IO_ADDR_R);
+               p = (u16 *)(buf + 1);
+               len--;
+       }
+
+       /*  configure and start prefetch transfer */
+       ret = gpmc_prefetch_enable(info->gpmc_cs, 0x0, len, 0x1);
+       if (ret) {
+               /* PFPW engine is busy, use cpu copy method */
+               if (info->nand.options & NAND_BUSWIDTH_16)
+                       omap_write_buf16(mtd, buf, len);
+               else
+                       omap_write_buf8(mtd, buf, len);
+       } else {
+               pfpw_status = gpmc_prefetch_status();
+               while (pfpw_status & 0x3FFF) {
+                       w_count = ((pfpw_status >> 24) & 0x7F) >> 1;
+                       for (i = 0; (i < w_count) && len; i++, len -= 2)
+                               iowrite16(*p++, info->nand_pref_fifo_add);
+                       pfpw_status = gpmc_prefetch_status();
+               }
+
+               /* disable and stop the PFPW engine */
+               gpmc_prefetch_reset();
+       }
+}
+
+#ifdef CONFIG_MTD_NAND_OMAP_PREFETCH_DMA
+/*
+ * omap_nand_dma_cb: callback on the completion of dma transfer
+ * @lch: logical channel
+ * @ch_satuts: channel status
+ * @data: pointer to completion data structure
+ */
+static void omap_nand_dma_cb(int lch, u16 ch_status, void *data)
+{
+       complete((struct completion *) data);
+}
+
+/*
+ * omap_nand_dma_transfer: configer and start dma transfer
+ * @mtd: MTD device structure
+ * @addr: virtual address in RAM of source/destination
+ * @len: number of data bytes to be transferred
+ * @is_write: flag for read/write operation
+ */
+static inline int omap_nand_dma_transfer(struct mtd_info *mtd, void *addr,
+                                       unsigned int len, int is_write)
+{
+       struct omap_nand_info *info = container_of(mtd,
+                                       struct omap_nand_info, mtd);
+       uint32_t prefetch_status = 0;
+       enum dma_data_direction dir = is_write ? DMA_TO_DEVICE :
+                                                       DMA_FROM_DEVICE;
+       dma_addr_t dma_addr;
+       int ret;
+
+       /* The fifo depth is 64 bytes. We have a sync at each frame and frame
+        * length is 64 bytes.
+        */
+       int buf_len = len >> 6;
+
+       if (addr >= high_memory) {
+               struct page *p1;
+
+               if (((size_t)addr & PAGE_MASK) !=
+                       ((size_t)(addr + len - 1) & PAGE_MASK))
+                       goto out_copy;
+               p1 = vmalloc_to_page(addr);
+               if (!p1)
+                       goto out_copy;
+               addr = page_address(p1) + ((size_t)addr & ~PAGE_MASK);
+       }
+
+       dma_addr = dma_map_single(&info->pdev->dev, addr, len, dir);
+       if (dma_mapping_error(&info->pdev->dev, dma_addr)) {
+               dev_err(&info->pdev->dev,
+                       "Couldn't DMA map a %d byte buffer\n", len);
+               goto out_copy;
+       }
+
+       if (is_write) {
+           omap_set_dma_dest_params(info->dma_ch, 0, OMAP_DMA_AMODE_CONSTANT,
+                                               info->phys_base, 0, 0);
+           omap_set_dma_src_params(info->dma_ch, 0, OMAP_DMA_AMODE_POST_INC,
+                                                       dma_addr, 0, 0);
+           omap_set_dma_transfer_params(info->dma_ch, OMAP_DMA_DATA_TYPE_S32,
+                                       0x10, buf_len, OMAP_DMA_SYNC_FRAME,
+                                       OMAP24XX_DMA_GPMC, OMAP_DMA_DST_SYNC);
+       } else {
+           omap_set_dma_src_params(info->dma_ch, 0, OMAP_DMA_AMODE_CONSTANT,
+                                               info->phys_base, 0, 0);
+           omap_set_dma_dest_params(info->dma_ch, 0, OMAP_DMA_AMODE_POST_INC,
+                                                       dma_addr, 0, 0);
+           omap_set_dma_transfer_params(info->dma_ch, OMAP_DMA_DATA_TYPE_S32,
+                                       0x10, buf_len, OMAP_DMA_SYNC_FRAME,
+                                       OMAP24XX_DMA_GPMC, OMAP_DMA_SRC_SYNC);
+       }
+       /*  configure and start prefetch transfer */
+       ret = gpmc_prefetch_enable(info->gpmc_cs, 0x1, len, is_write);
+       if (ret)
+               /* PFPW engine is busy, use cpu copy methode */
+               goto out_copy;
+
+       init_completion(&info->comp);
+
+       omap_start_dma(info->dma_ch);
+
+       /* setup and start DMA using dma_addr */
+       wait_for_completion(&info->comp);
+
+       while (0x3fff & (prefetch_status = gpmc_prefetch_status()))
+               ;
+       /* disable and stop the PFPW engine */
+       gpmc_prefetch_reset();
+
+       dma_unmap_single(&info->pdev->dev, dma_addr, len, dir);
+       return 0;
+
+out_copy:
+       if (info->nand.options & NAND_BUSWIDTH_16)
+               is_write == 0 ? omap_read_buf16(mtd, (u_char *) addr, len)
+                       : omap_write_buf16(mtd, (u_char *) addr, len);
+       else
+               is_write == 0 ? omap_read_buf8(mtd, (u_char *) addr, len)
+                       : omap_write_buf8(mtd, (u_char *) addr, len);
+       return 0;
+}
+#else
+static void omap_nand_dma_cb(int lch, u16 ch_status, void *data) {}
+static inline int omap_nand_dma_transfer(struct mtd_info *mtd, void *addr,
+                                       unsigned int len, int is_write)
+{
+       return 0;
+}
+#endif
+
+/**
+ * omap_read_buf_dma_pref - read data from NAND controller into buffer
+ * @mtd: MTD device structure
+ * @buf: buffer to store date
+ * @len: number of bytes to read
+ */
+static void omap_read_buf_dma_pref(struct mtd_info *mtd, u_char *buf, int len)
+{
+       if (len <= mtd->oobsize)
+               omap_read_buf_pref(mtd, buf, len);
+       else
+               /* start transfer in DMA mode */
+               omap_nand_dma_transfer(mtd, buf, len, 0x0);
+}
+
+/**
+ * omap_write_buf_dma_pref - write buffer to NAND controller
+ * @mtd: MTD device structure
+ * @buf: data buffer
+ * @len: number of bytes to write
+ */
+static void omap_write_buf_dma_pref(struct mtd_info *mtd,
+                                       const u_char *buf, int len)
+{
+       if (len <= mtd->oobsize)
+               omap_write_buf_pref(mtd, buf, len);
+       else
+               /* start transfer in DMA mode */
+               omap_nand_dma_transfer(mtd, buf, len, 0x1);
+}
+
 /**
  * omap_verify_buf - Verify chip data against buffer
  * @mtd: MTD device structure
@@ -658,17 +942,12 @@ static int __devinit omap_nand_probe(struct platform_device *pdev)
                err = -ENOMEM;
                goto out_release_mem_region;
        }
+
        info->nand.controller = &info->controller;
 
        info->nand.IO_ADDR_W = info->nand.IO_ADDR_R;
        info->nand.cmd_ctrl  = omap_hwcontrol;
 
-       /* REVISIT:  only supports 16-bit NAND flash */
-
-       info->nand.read_buf   = omap_read_buf16;
-       info->nand.write_buf  = omap_write_buf16;
-       info->nand.verify_buf = omap_verify_buf;
-
        /*
         * If RDY/BSY line is connected to OMAP then use the omap ready
         * funcrtion and the generic nand_wait function which reads the status
@@ -689,6 +968,40 @@ static int __devinit omap_nand_probe(struct platform_device *pdev)
                                                                == 0x1000)
                info->nand.options  |= NAND_BUSWIDTH_16;
 
+       if (use_prefetch) {
+               /* copy the virtual address of nand base for fifo access */
+               info->nand_pref_fifo_add = info->nand.IO_ADDR_R;
+
+               info->nand.read_buf   = omap_read_buf_pref;
+               info->nand.write_buf  = omap_write_buf_pref;
+               if (use_dma) {
+                       err = omap_request_dma(OMAP24XX_DMA_GPMC, "NAND",
+                               omap_nand_dma_cb, &info->comp, &info->dma_ch);
+                       if (err < 0) {
+                               info->dma_ch = -1;
+                               printk(KERN_WARNING "DMA request failed."
+                                       " Non-dma data transfer mode\n");
+                       } else {
+                               omap_set_dma_dest_burst_mode(info->dma_ch,
+                                               OMAP_DMA_DATA_BURST_16);
+                               omap_set_dma_src_burst_mode(info->dma_ch,
+                                               OMAP_DMA_DATA_BURST_16);
+
+                               info->nand.read_buf   = omap_read_buf_dma_pref;
+                               info->nand.write_buf  = omap_write_buf_dma_pref;
+                       }
+               }
+       } else {
+               if (info->nand.options & NAND_BUSWIDTH_16) {
+                       info->nand.read_buf   = omap_read_buf16;
+                       info->nand.write_buf  = omap_write_buf16;
+               } else {
+                       info->nand.read_buf   = omap_read_buf8;
+                       info->nand.write_buf  = omap_write_buf8;
+               }
+       }
+       info->nand.verify_buf = omap_verify_buf;
+
 #ifdef CONFIG_MTD_NAND_OMAP_HWECC
        info->nand.ecc.bytes            = 3;
        info->nand.ecc.size             = 512;
@@ -744,9 +1057,12 @@ static int omap_nand_remove(struct platform_device *pdev)
        struct omap_nand_info *info = mtd->priv;
 
        platform_set_drvdata(pdev, NULL);
+       if (use_dma)
+               omap_free_dma(info->dma_ch);
+
        /* Release NAND device, its internal structures and partitions */
        nand_release(&info->mtd);
-       iounmap(info->nand.IO_ADDR_R);
+       iounmap(info->nand_pref_fifo_add);
        kfree(&info->mtd);
        return 0;
 }
@@ -763,6 +1079,15 @@ static struct platform_driver omap_nand_driver = {
 static int __init omap_nand_init(void)
 {
        printk(KERN_INFO "%s driver initializing\n", DRIVER_NAME);
+
+       /* This check is required if driver is being
+        * loaded run time as a module
+        */
+       if ((1 == use_dma) && (0 == use_prefetch)) {
+               printk(KERN_INFO"Wrong parameters: 'use_dma' can not be 1 "
+                               "without use_prefetch'. Prefetch will not be"
+                               " used in either mode (mpu or dma)\n");
+       }
        return platform_driver_register(&omap_nand_driver);
 }
 
index 0d9d4bc9c762fe5caeab5770419f14dfe2c81403..f59c07427af3eda9c71dd18cb4244200375f5216 100644 (file)
@@ -171,7 +171,6 @@ static int __devexit orion_nand_remove(struct platform_device *pdev)
 }
 
 static struct platform_driver orion_nand_driver = {
-       .probe          = orion_nand_probe,
        .remove         = __devexit_p(orion_nand_remove),
        .driver         = {
                .name   = "orion_nand",
@@ -181,7 +180,7 @@ static struct platform_driver orion_nand_driver = {
 
 static int __init orion_nand_init(void)
 {
-       return platform_driver_register(&orion_nand_driver);
+       return platform_driver_probe(&orion_nand_driver, orion_nand_probe);
 }
 
 static void __exit orion_nand_exit(void)
index 30a8ce6d3e69bcdc1f0429daafacd06115baf06e..6ea520ae2410a9113690641670d488321ac3da23 100644 (file)
@@ -102,6 +102,7 @@ enum {
        ERR_SENDCMD     = -2,
        ERR_DBERR       = -3,
        ERR_BBERR       = -4,
+       ERR_SBERR       = -5,
 };
 
 enum {
@@ -564,11 +565,13 @@ static irqreturn_t pxa3xx_nand_irq(int irq, void *devid)
 
        status = nand_readl(info, NDSR);
 
-       if (status & (NDSR_RDDREQ | NDSR_DBERR)) {
+       if (status & (NDSR_RDDREQ | NDSR_DBERR | NDSR_SBERR)) {
                if (status & NDSR_DBERR)
                        info->retcode = ERR_DBERR;
+               else if (status & NDSR_SBERR)
+                       info->retcode = ERR_SBERR;
 
-               disable_int(info, NDSR_RDDREQ | NDSR_DBERR);
+               disable_int(info, NDSR_RDDREQ | NDSR_DBERR | NDSR_SBERR);
 
                if (info->use_dma) {
                        info->state = STATE_DMA_READING;
@@ -670,7 +673,7 @@ static void pxa3xx_nand_cmdfunc(struct mtd_info *mtd, unsigned command,
                if (prepare_read_prog_cmd(info, cmdset->read1, column, page_addr))
                        break;
 
-               pxa3xx_nand_do_cmd(info, NDSR_RDDREQ | NDSR_DBERR);
+               pxa3xx_nand_do_cmd(info, NDSR_RDDREQ | NDSR_DBERR | NDSR_SBERR);
 
                /* We only are OOB, so if the data has error, does not matter */
                if (info->retcode == ERR_DBERR)
@@ -687,7 +690,7 @@ static void pxa3xx_nand_cmdfunc(struct mtd_info *mtd, unsigned command,
                if (prepare_read_prog_cmd(info, cmdset->read1, column, page_addr))
                        break;
 
-               pxa3xx_nand_do_cmd(info, NDSR_RDDREQ | NDSR_DBERR);
+               pxa3xx_nand_do_cmd(info, NDSR_RDDREQ | NDSR_DBERR | NDSR_SBERR);
 
                if (info->retcode == ERR_DBERR) {
                        /* for blank page (all 0xff), HW will calculate its ECC as
@@ -861,8 +864,12 @@ static int pxa3xx_nand_ecc_correct(struct mtd_info *mtd,
         * consider it as a ecc error which will tell the caller the
         * read fail We have distinguish all the errors, but the
         * nand_read_ecc only check this function return value
+        *
+        * Corrected (single-bit) errors must also be noted.
         */
-       if (info->retcode != ERR_NONE)
+       if (info->retcode == ERR_SBERR)
+               return 1;
+       else if (info->retcode != ERR_NONE)
                return -1;
 
        return 0;
index 2bc896623e2d7e21ea5d76977ce3417958293c6f..02bef21f2e4b987099a8f1f8d856c7364cbf9a58 100644 (file)
@@ -329,7 +329,7 @@ static void set_cmd_regs(struct mtd_info *mtd, uint32_t cmd, uint32_t flcmcdr_va
 }
 
 static int flctl_read_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip,
-                               uint8_t *buf)
+                               uint8_t *buf, int page)
 {
        int i, eccsize = chip->ecc.size;
        int eccbytes = chip->ecc.bytes;
@@ -857,7 +857,6 @@ static int __exit flctl_remove(struct platform_device *pdev)
 }
 
 static struct platform_driver flctl_driver = {
-       .probe          = flctl_probe,
        .remove         = flctl_remove,
        .driver = {
                .name   = "sh_flctl",
@@ -867,7 +866,7 @@ static struct platform_driver flctl_driver = {
 
 static int __init flctl_nand_init(void)
 {
-       return platform_driver_register(&flctl_driver);
+       return platform_driver_probe(&flctl_driver, flctl_probe);
 }
 
 static void __exit flctl_nand_cleanup(void)
index daa6a4c3b8cecc885a32a328a5cc71cc93907b73..92c73344a669eebbd56f2b450161260d07872409 100644 (file)
@@ -301,6 +301,21 @@ static int tmio_nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat,
        return 0;
 }
 
+static int tmio_nand_correct_data(struct mtd_info *mtd, unsigned char *buf,
+               unsigned char *read_ecc, unsigned char *calc_ecc)
+{
+       int r0, r1;
+
+       /* assume ecc.size = 512 and ecc.bytes = 6 */
+       r0 = __nand_correct_data(buf, read_ecc, calc_ecc, 256);
+       if (r0 < 0)
+               return r0;
+       r1 = __nand_correct_data(buf + 256, read_ecc + 3, calc_ecc + 3, 256);
+       if (r1 < 0)
+               return r1;
+       return r0 + r1;
+}
+
 static int tmio_hw_init(struct platform_device *dev, struct tmio_nand *tmio)
 {
        struct mfd_cell *cell = (struct mfd_cell *)dev->dev.platform_data;
@@ -424,7 +439,7 @@ static int tmio_probe(struct platform_device *dev)
        nand_chip->ecc.bytes = 6;
        nand_chip->ecc.hwctl = tmio_nand_enable_hwecc;
        nand_chip->ecc.calculate = tmio_nand_calculate_ecc;
-       nand_chip->ecc.correct = nand_correct_data;
+       nand_chip->ecc.correct = tmio_nand_correct_data;
 
        if (data)
                nand_chip->badblock_pattern = data->badblock_pattern;
index 488088eff2cae01ab5b8db8dab1e904d7307da8f..73af8324d0d0b4e540195063c9b311dcaf875b3b 100644 (file)
@@ -189,18 +189,43 @@ static int txx9ndfmc_calculate_ecc(struct mtd_info *mtd, const uint8_t *dat,
                                   uint8_t *ecc_code)
 {
        struct platform_device *dev = mtd_to_platdev(mtd);
+       struct nand_chip *chip = mtd->priv;
+       int eccbytes;
        u32 mcr = txx9ndfmc_read(dev, TXX9_NDFMCR);
 
        mcr &= ~TXX9_NDFMCR_ECC_ALL;
        txx9ndfmc_write(dev, mcr | TXX9_NDFMCR_ECC_OFF, TXX9_NDFMCR);
        txx9ndfmc_write(dev, mcr | TXX9_NDFMCR_ECC_READ, TXX9_NDFMCR);
-       ecc_code[1] = txx9ndfmc_read(dev, TXX9_NDFDTR);
-       ecc_code[0] = txx9ndfmc_read(dev, TXX9_NDFDTR);
-       ecc_code[2] = txx9ndfmc_read(dev, TXX9_NDFDTR);
+       for (eccbytes = chip->ecc.bytes; eccbytes > 0; eccbytes -= 3) {
+               ecc_code[1] = txx9ndfmc_read(dev, TXX9_NDFDTR);
+               ecc_code[0] = txx9ndfmc_read(dev, TXX9_NDFDTR);
+               ecc_code[2] = txx9ndfmc_read(dev, TXX9_NDFDTR);
+               ecc_code += 3;
+       }
        txx9ndfmc_write(dev, mcr | TXX9_NDFMCR_ECC_OFF, TXX9_NDFMCR);
        return 0;
 }
 
+static int txx9ndfmc_correct_data(struct mtd_info *mtd, unsigned char *buf,
+               unsigned char *read_ecc, unsigned char *calc_ecc)
+{
+       struct nand_chip *chip = mtd->priv;
+       int eccsize;
+       int corrected = 0;
+       int stat;
+
+       for (eccsize = chip->ecc.size; eccsize > 0; eccsize -= 256) {
+               stat = __nand_correct_data(buf, read_ecc, calc_ecc, 256);
+               if (stat < 0)
+                       return stat;
+               corrected += stat;
+               buf += 256;
+               read_ecc += 3;
+               calc_ecc += 3;
+       }
+       return corrected;
+}
+
 static void txx9ndfmc_enable_hwecc(struct mtd_info *mtd, int mode)
 {
        struct platform_device *dev = mtd_to_platdev(mtd);
@@ -244,6 +269,22 @@ static void txx9ndfmc_initialize(struct platform_device *dev)
 #define TXX9NDFMC_NS_TO_CYC(gbusclk, ns) \
        DIV_ROUND_UP((ns) * DIV_ROUND_UP(gbusclk, 1000), 1000000)
 
+static int txx9ndfmc_nand_scan(struct mtd_info *mtd)
+{
+       struct nand_chip *chip = mtd->priv;
+       int ret;
+
+       ret = nand_scan_ident(mtd, 1);
+       if (!ret) {
+               if (mtd->writesize >= 512) {
+                       chip->ecc.size = mtd->writesize;
+                       chip->ecc.bytes = 3 * (mtd->writesize / 256);
+               }
+               ret = nand_scan_tail(mtd);
+       }
+       return ret;
+}
+
 static int __init txx9ndfmc_probe(struct platform_device *dev)
 {
        struct txx9ndfmc_platform_data *plat = dev->dev.platform_data;
@@ -321,9 +362,10 @@ static int __init txx9ndfmc_probe(struct platform_device *dev)
                chip->cmd_ctrl = txx9ndfmc_cmd_ctrl;
                chip->dev_ready = txx9ndfmc_dev_ready;
                chip->ecc.calculate = txx9ndfmc_calculate_ecc;
-               chip->ecc.correct = nand_correct_data;
+               chip->ecc.correct = txx9ndfmc_correct_data;
                chip->ecc.hwctl = txx9ndfmc_enable_hwecc;
                chip->ecc.mode = NAND_ECC_HW;
+               /* txx9ndfmc_nand_scan will overwrite ecc.size and ecc.bytes */
                chip->ecc.size = 256;
                chip->ecc.bytes = 3;
                chip->chip_delay = 100;
@@ -349,7 +391,7 @@ static int __init txx9ndfmc_probe(struct platform_device *dev)
                if (plat->wide_mask & (1 << i))
                        chip->options |= NAND_BUSWIDTH_16;
 
-               if (nand_scan(mtd, 1)) {
+               if (txx9ndfmc_nand_scan(mtd)) {
                        kfree(txx9_priv->mtdname);
                        kfree(txx9_priv);
                        continue;
diff --git a/drivers/mtd/nand/w90p910_nand.c b/drivers/mtd/nand/w90p910_nand.c
new file mode 100644 (file)
index 0000000..7680e73
--- /dev/null
@@ -0,0 +1,382 @@
+/*
+ * Copyright (c) 2009 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/slab.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/platform_device.h>
+#include <linux/delay.h>
+#include <linux/clk.h>
+#include <linux/err.h>
+
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/nand.h>
+#include <linux/mtd/partitions.h>
+
+#define REG_FMICSR     0x00
+#define REG_SMCSR      0xa0
+#define REG_SMISR      0xac
+#define REG_SMCMD      0xb0
+#define REG_SMADDR     0xb4
+#define REG_SMDATA     0xb8
+
+#define RESET_FMI      0x01
+#define NAND_EN                0x08
+#define READYBUSY      (0x01 << 18)
+
+#define SWRST          0x01
+#define PSIZE          (0x01 << 3)
+#define DMARWEN                (0x03 << 1)
+#define BUSWID         (0x01 << 4)
+#define ECC4EN         (0x01 << 5)
+#define WP             (0x01 << 24)
+#define NANDCS         (0x01 << 25)
+#define ENDADDR                (0x01 << 31)
+
+#define read_data_reg(dev)             \
+       __raw_readl((dev)->reg + REG_SMDATA)
+
+#define write_data_reg(dev, val)       \
+       __raw_writel((val), (dev)->reg + REG_SMDATA)
+
+#define write_cmd_reg(dev, val)                \
+       __raw_writel((val), (dev)->reg + REG_SMCMD)
+
+#define write_addr_reg(dev, val)       \
+       __raw_writel((val), (dev)->reg + REG_SMADDR)
+
+struct w90p910_nand {
+       struct mtd_info mtd;
+       struct nand_chip chip;
+       void __iomem *reg;
+       struct clk *clk;
+       spinlock_t lock;
+};
+
+static const struct mtd_partition partitions[] = {
+       {
+        .name = "NAND FS 0",
+        .offset = 0,
+        .size = 8 * 1024 * 1024
+       },
+       {
+        .name = "NAND FS 1",
+        .offset = MTDPART_OFS_APPEND,
+        .size = MTDPART_SIZ_FULL
+       }
+};
+
+static unsigned char w90p910_nand_read_byte(struct mtd_info *mtd)
+{
+       unsigned char ret;
+       struct w90p910_nand *nand;
+
+       nand = container_of(mtd, struct w90p910_nand, mtd);
+
+       ret = (unsigned char)read_data_reg(nand);
+
+       return ret;
+}
+
+static void w90p910_nand_read_buf(struct mtd_info *mtd,
+                                               unsigned char *buf, int len)
+{
+       int i;
+       struct w90p910_nand *nand;
+
+       nand = container_of(mtd, struct w90p910_nand, mtd);
+
+       for (i = 0; i < len; i++)
+               buf[i] = (unsigned char)read_data_reg(nand);
+}
+
+static void w90p910_nand_write_buf(struct mtd_info *mtd,
+                                       const unsigned char *buf, int len)
+{
+       int i;
+       struct w90p910_nand *nand;
+
+       nand = container_of(mtd, struct w90p910_nand, mtd);
+
+       for (i = 0; i < len; i++)
+               write_data_reg(nand, buf[i]);
+}
+
+static int w90p910_verify_buf(struct mtd_info *mtd,
+                                       const unsigned char *buf, int len)
+{
+       int i;
+       struct w90p910_nand *nand;
+
+       nand = container_of(mtd, struct w90p910_nand, mtd);
+
+       for (i = 0; i < len; i++) {
+               if (buf[i] != (unsigned char)read_data_reg(nand))
+                       return -EFAULT;
+       }
+
+       return 0;
+}
+
+static int w90p910_check_rb(struct w90p910_nand *nand)
+{
+       unsigned int val;
+       spin_lock(&nand->lock);
+       val = __raw_readl(REG_SMISR);
+       val &= READYBUSY;
+       spin_unlock(&nand->lock);
+
+       return val;
+}
+
+static int w90p910_nand_devready(struct mtd_info *mtd)
+{
+       struct w90p910_nand *nand;
+       int ready;
+
+       nand = container_of(mtd, struct w90p910_nand, mtd);
+
+       ready = (w90p910_check_rb(nand)) ? 1 : 0;
+       return ready;
+}
+
+static void w90p910_nand_command_lp(struct mtd_info *mtd,
+                       unsigned int command, int column, int page_addr)
+{
+       register struct nand_chip *chip = mtd->priv;
+       struct w90p910_nand *nand;
+
+       nand = container_of(mtd, struct w90p910_nand, mtd);
+
+       if (command == NAND_CMD_READOOB) {
+               column += mtd->writesize;
+               command = NAND_CMD_READ0;
+       }
+
+       write_cmd_reg(nand, command & 0xff);
+
+       if (column != -1 || page_addr != -1) {
+
+               if (column != -1) {
+                       if (chip->options & NAND_BUSWIDTH_16)
+                               column >>= 1;
+                       write_addr_reg(nand, column);
+                       write_addr_reg(nand, column >> 8 | ENDADDR);
+               }
+               if (page_addr != -1) {
+                       write_addr_reg(nand, page_addr);
+
+                       if (chip->chipsize > (128 << 20)) {
+                               write_addr_reg(nand, page_addr >> 8);
+                               write_addr_reg(nand, page_addr >> 16 | ENDADDR);
+                       } else {
+                               write_addr_reg(nand, page_addr >> 8 | ENDADDR);
+                       }
+               }
+       }
+
+       switch (command) {
+       case NAND_CMD_CACHEDPROG:
+       case NAND_CMD_PAGEPROG:
+       case NAND_CMD_ERASE1:
+       case NAND_CMD_ERASE2:
+       case NAND_CMD_SEQIN:
+       case NAND_CMD_RNDIN:
+       case NAND_CMD_STATUS:
+       case NAND_CMD_DEPLETE1:
+               return;
+
+       case NAND_CMD_STATUS_ERROR:
+       case NAND_CMD_STATUS_ERROR0:
+       case NAND_CMD_STATUS_ERROR1:
+       case NAND_CMD_STATUS_ERROR2:
+       case NAND_CMD_STATUS_ERROR3:
+               udelay(chip->chip_delay);
+               return;
+
+       case NAND_CMD_RESET:
+               if (chip->dev_ready)
+                       break;
+               udelay(chip->chip_delay);
+
+               write_cmd_reg(nand, NAND_CMD_STATUS);
+               write_cmd_reg(nand, command);
+
+               while (!w90p910_check_rb(nand))
+                       ;
+
+               return;
+
+       case NAND_CMD_RNDOUT:
+               write_cmd_reg(nand, NAND_CMD_RNDOUTSTART);
+               return;
+
+       case NAND_CMD_READ0:
+
+               write_cmd_reg(nand, NAND_CMD_READSTART);
+       default:
+
+               if (!chip->dev_ready) {
+                       udelay(chip->chip_delay);
+                       return;
+               }
+       }
+
+       /* Apply this short delay always to ensure that we do wait tWB in
+        * any case on any machine. */
+       ndelay(100);
+
+       while (!chip->dev_ready(mtd))
+               ;
+}
+
+
+static void w90p910_nand_enable(struct w90p910_nand *nand)
+{
+       unsigned int val;
+       spin_lock(&nand->lock);
+       __raw_writel(RESET_FMI, (nand->reg + REG_FMICSR));
+
+       val = __raw_readl(nand->reg + REG_FMICSR);
+
+       if (!(val & NAND_EN))
+               __raw_writel(val | NAND_EN, REG_FMICSR);
+
+       val = __raw_readl(nand->reg + REG_SMCSR);
+
+       val &= ~(SWRST|PSIZE|DMARWEN|BUSWID|ECC4EN|NANDCS);
+       val |= WP;
+
+       __raw_writel(val, nand->reg + REG_SMCSR);
+
+       spin_unlock(&nand->lock);
+}
+
+static int __devinit w90p910_nand_probe(struct platform_device *pdev)
+{
+       struct w90p910_nand *w90p910_nand;
+       struct nand_chip *chip;
+       int retval;
+       struct resource *res;
+
+       retval = 0;
+
+       w90p910_nand = kzalloc(sizeof(struct w90p910_nand), GFP_KERNEL);
+       if (!w90p910_nand)
+               return -ENOMEM;
+       chip = &(w90p910_nand->chip);
+
+       w90p910_nand->mtd.priv  = chip;
+       w90p910_nand->mtd.owner = THIS_MODULE;
+       spin_lock_init(&w90p910_nand->lock);
+
+       w90p910_nand->clk = clk_get(&pdev->dev, NULL);
+       if (IS_ERR(w90p910_nand->clk)) {
+               retval = -ENOENT;
+               goto fail1;
+       }
+       clk_enable(w90p910_nand->clk);
+
+       chip->cmdfunc           = w90p910_nand_command_lp;
+       chip->dev_ready         = w90p910_nand_devready;
+       chip->read_byte         = w90p910_nand_read_byte;
+       chip->write_buf         = w90p910_nand_write_buf;
+       chip->read_buf          = w90p910_nand_read_buf;
+       chip->verify_buf        = w90p910_verify_buf;
+       chip->chip_delay        = 50;
+       chip->options           = 0;
+       chip->ecc.mode          = NAND_ECC_SOFT;
+
+       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       if (!res) {
+               retval = -ENXIO;
+               goto fail1;
+       }
+
+       if (!request_mem_region(res->start, resource_size(res), pdev->name)) {
+               retval = -EBUSY;
+               goto fail1;
+       }
+
+       w90p910_nand->reg = ioremap(res->start, resource_size(res));
+       if (!w90p910_nand->reg) {
+               retval = -ENOMEM;
+               goto fail2;
+       }
+
+       w90p910_nand_enable(w90p910_nand);
+
+       if (nand_scan(&(w90p910_nand->mtd), 1)) {
+               retval = -ENXIO;
+               goto fail3;
+       }
+
+       add_mtd_partitions(&(w90p910_nand->mtd), partitions,
+                                               ARRAY_SIZE(partitions));
+
+       platform_set_drvdata(pdev, w90p910_nand);
+
+       return retval;
+
+fail3: iounmap(w90p910_nand->reg);
+fail2: release_mem_region(res->start, resource_size(res));
+fail1: kfree(w90p910_nand);
+       return retval;
+}
+
+static int __devexit w90p910_nand_remove(struct platform_device *pdev)
+{
+       struct w90p910_nand *w90p910_nand = platform_get_drvdata(pdev);
+       struct resource *res;
+
+       iounmap(w90p910_nand->reg);
+
+       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       release_mem_region(res->start, resource_size(res));
+
+       clk_disable(w90p910_nand->clk);
+       clk_put(w90p910_nand->clk);
+
+       kfree(w90p910_nand);
+
+       platform_set_drvdata(pdev, NULL);
+
+       return 0;
+}
+
+static struct platform_driver w90p910_nand_driver = {
+       .probe          = w90p910_nand_probe,
+       .remove         = __devexit_p(w90p910_nand_remove),
+       .driver         = {
+               .name   = "w90p910-fmi",
+               .owner  = THIS_MODULE,
+       },
+};
+
+static int __init w90p910_nand_init(void)
+{
+       return platform_driver_register(&w90p910_nand_driver);
+}
+
+static void __exit w90p910_nand_exit(void)
+{
+       platform_driver_unregister(&w90p910_nand_driver);
+}
+
+module_init(w90p910_nand_init);
+module_exit(w90p910_nand_exit);
+
+MODULE_AUTHOR("Wan ZongShun <mcuos.com@gmail.com>");
+MODULE_DESCRIPTION("w90p910 nand driver!");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:w90p910-fmi");
index 3e164f0c9295c7bc779b0b0c72c798f76176c09e..62d6a78c4eeea43ae34aac65508d270b163b985d 100644 (file)
@@ -46,21 +46,12 @@ int __devinit of_mtd_parse_partitions(struct device *dev,
                const u32 *reg;
                int len;
 
-               /* check if this is a partition node */
-               partname = of_get_property(pp, "name", &len);
-               if (strcmp(partname, "partition") != 0) {
+               reg = of_get_property(pp, "reg", &len);
+               if (!reg) {
                        nr_parts--;
                        continue;
                }
 
-               reg = of_get_property(pp, "reg", &len);
-               if (!reg || (len != 2 * sizeof(u32))) {
-                       of_node_put(pp);
-                       dev_err(dev, "Invalid 'reg' on %s\n", node->full_name);
-                       kfree(*pparts);
-                       *pparts = NULL;
-                       return -EINVAL;
-               }
                (*pparts)[i].offset = reg[0];
                (*pparts)[i].size = reg[1];
 
@@ -75,6 +66,14 @@ int __devinit of_mtd_parse_partitions(struct device *dev,
                i++;
        }
 
+       if (!i) {
+               of_node_put(pp);
+               dev_err(dev, "No valid partition found on %s\n", node->full_name);
+               kfree(*pparts);
+               *pparts = NULL;
+               return -EINVAL;
+       }
+
        return nr_parts;
 }
 EXPORT_SYMBOL(of_mtd_parse_partitions);
index 79fa79e8f8de9b67a5949888d029f93b7dbebb27..a38f580c2bb3f82a680d392d418b753aeb1562c0 100644 (file)
@@ -5,6 +5,7 @@
 menuconfig MTD_ONENAND
        tristate "OneNAND Device Support"
        depends on MTD
+       select MTD_PARTITIONS
        help
          This enables support for accessing all type of OneNAND flash
          devices. For further information see
@@ -23,7 +24,6 @@ config MTD_ONENAND_VERIFY_WRITE
 
 config MTD_ONENAND_GENERIC
        tristate "OneNAND Flash device via platform device driver"
-       depends on ARM
        help
          Support for OneNAND flash via platform device driver.
 
@@ -66,7 +66,6 @@ config MTD_ONENAND_2X_PROGRAM
 
 config MTD_ONENAND_SIM
        tristate "OneNAND simulator support"
-       depends on MTD_PARTITIONS
        help
          The simulator may simulate various OneNAND flash chips for the
          OneNAND MTD layer.
index 3a496c33fb52405801d8add2191bd3df89ac435f..e78914938c5c6930cee9b9462bd33cd271bdda2d 100644 (file)
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/onenand.h>
 #include <linux/mtd/partitions.h>
-
 #include <asm/io.h>
-#include <asm/mach/flash.h>
-
-#define DRIVER_NAME    "onenand"
 
+/*
+ * Note: Driver name and platform data format have been updated!
+ *
+ * This version of the driver is named "onenand-flash" and takes struct
+ * onenand_platform_data as platform data. The old ARM-specific version
+ * with the name "onenand" used to take struct flash_platform_data.
+ */
+#define DRIVER_NAME    "onenand-flash"
 
 #ifdef CONFIG_MTD_PARTITIONS
 static const char *part_probes[] = { "cmdlinepart", NULL,  };
@@ -39,16 +43,16 @@ struct onenand_info {
 static int __devinit generic_onenand_probe(struct platform_device *pdev)
 {
        struct onenand_info *info;
-       struct flash_platform_data *pdata = pdev->dev.platform_data;
+       struct onenand_platform_data *pdata = pdev->dev.platform_data;
        struct resource *res = pdev->resource;
-       unsigned long size = res->end - res->start + 1;
+       unsigned long size = resource_size(res);
        int err;
 
        info = kzalloc(sizeof(struct onenand_info), GFP_KERNEL);
        if (!info)
                return -ENOMEM;
 
-       if (!request_mem_region(res->start, size, pdev->dev.driver->name)) {
+       if (!request_mem_region(res->start, size, dev_name(&pdev->dev))) {
                err = -EBUSY;
                goto out_free_info;
        }
@@ -59,7 +63,7 @@ static int __devinit generic_onenand_probe(struct platform_device *pdev)
                goto out_release_mem_region;
        }
 
-       info->onenand.mmcontrol = pdata->mmcontrol;
+       info->onenand.mmcontrol = pdata ? pdata->mmcontrol : 0;
        info->onenand.irq = platform_get_irq(pdev, 0);
 
        info->mtd.name = dev_name(&pdev->dev);
@@ -75,7 +79,7 @@ static int __devinit generic_onenand_probe(struct platform_device *pdev)
        err = parse_mtd_partitions(&info->mtd, part_probes, &info->parts, 0);
        if (err > 0)
                add_mtd_partitions(&info->mtd, info->parts, err);
-       else if (err <= 0 && pdata->parts)
+       else if (err <= 0 && pdata && pdata->parts)
                add_mtd_partitions(&info->mtd, pdata->parts, pdata->nr_parts);
        else
 #endif
@@ -99,7 +103,7 @@ static int __devexit generic_onenand_remove(struct platform_device *pdev)
 {
        struct onenand_info *info = platform_get_drvdata(pdev);
        struct resource *res = pdev->resource;
-       unsigned long size = res->end - res->start + 1;
+       unsigned long size = resource_size(res);
 
        platform_set_drvdata(pdev, NULL);
 
index 6e829095ea9de8a601f58b2fcb7c4da167e2d746..ff66e4330aa71ebde90b830b0faca5e4dc6f31d0 100644 (file)
@@ -1191,7 +1191,7 @@ static int onenand_read_ops_nolock(struct mtd_info *mtd, loff_t from,
                        /*
                         * Chip boundary handling in DDP
                         * Now we issued chip 1 read and pointed chip 1
-                        * bufferam so we have to point chip 0 bufferam.
+                        * bufferram so we have to point chip 0 bufferram.
                         */
                        if (ONENAND_IS_DDP(this) &&
                            unlikely(from == (this->chipsize >> 1))) {
@@ -1867,8 +1867,8 @@ static int onenand_write_ops_nolock(struct mtd_info *mtd, loff_t to,
                        ONENAND_SET_NEXT_BUFFERRAM(this);
 
                /*
-                * 2 PLANE, MLC, and Flex-OneNAND doesn't support
-                * write-while-programe feature.
+                * 2 PLANE, MLC, and Flex-OneNAND do not support
+                * write-while-program feature.
                 */
                if (!ONENAND_IS_2PLANE(this) && !first) {
                        ONENAND_SET_PREV_BUFFERRAM(this);
@@ -1879,7 +1879,7 @@ static int onenand_write_ops_nolock(struct mtd_info *mtd, loff_t to,
                        onenand_update_bufferram(mtd, prev, !ret && !prev_subpage);
                        if (ret) {
                                written -= prevlen;
-                               printk(KERN_ERR "onenand_write_ops_nolock: write filaed %d\n", ret);
+                               printk(KERN_ERR "onenand_write_ops_nolock: write failed %d\n", ret);
                                break;
                        }
 
@@ -1905,7 +1905,7 @@ static int onenand_write_ops_nolock(struct mtd_info *mtd, loff_t to,
                        /* In partial page write we don't update bufferram */
                        onenand_update_bufferram(mtd, to, !ret && !subpage);
                        if (ret) {
-                               printk(KERN_ERR "onenand_write_ops_nolock: write filaed %d\n", ret);
+                               printk(KERN_ERR "onenand_write_ops_nolock: write failed %d\n", ret);
                                break;
                        }
 
@@ -2201,7 +2201,7 @@ static int onenand_erase(struct mtd_info *mtd, struct erase_info *instr)
        /* Grab the lock and see if the device is available */
        onenand_get_device(mtd, FL_ERASING);
 
-       /* Loop throught the pages */
+       /* Loop through the blocks */
        instr->state = MTD_ERASING;
 
        while (len) {
@@ -2328,7 +2328,7 @@ static int onenand_default_block_markbad(struct mtd_info *mtd, loff_t ofs)
         if (bbm->bbt)
                 bbm->bbt[block >> 2] |= 0x01 << ((block & 0x03) << 1);
 
-        /* We write two bytes, so we dont have to mess with 16 bit access */
+        /* We write two bytes, so we don't have to mess with 16-bit access */
         ofs += mtd->oobsize + (bbm->badblockpos & ~0x01);
        /* FIXME : What to do when marking SLC block in partition
         *         with MLC erasesize? For now, it is not advisable to
@@ -2557,7 +2557,7 @@ static void onenand_unlock_all(struct mtd_info *mtd)
 
 #ifdef CONFIG_MTD_ONENAND_OTP
 
-/* Interal OTP operation */
+/* Internal OTP operation */
 typedef int (*otp_op_t)(struct mtd_info *mtd, loff_t form, size_t len,
                size_t *retlen, u_char *buf);
 
@@ -2921,7 +2921,7 @@ static void onenand_check_features(struct mtd_info *mtd)
                this->options |= ONENAND_HAS_2PLANE;
 
        case ONENAND_DEVICE_DENSITY_2Gb:
-               /* 2Gb DDP don't have 2 plane */
+               /* 2Gb DDP does not have 2 plane */
                if (!ONENAND_IS_DDP(this))
                        this->options |= ONENAND_HAS_2PLANE;
                this->options |= ONENAND_HAS_UNLOCK_ALL;
@@ -3364,7 +3364,7 @@ static int onenand_probe(struct mtd_info *mtd)
        /* It's real page size */
        this->writesize = mtd->writesize;
 
-       /* REVIST: Multichip handling */
+       /* REVISIT: Multichip handling */
 
        if (FLEXONENAND(this))
                flexonenand_get_size(mtd);
index a18e8d2f255765db492c8b1797dd99c2eaf54ece..5553cd4eab2083d80824f49e95423e1e2507a705 100644 (file)
@@ -512,7 +512,7 @@ static int __init mtd_oobtest_init(void)
                goto out;
 
        addr0 = 0;
-       for (i = 0; bbt[i] && i < ebcnt; ++i)
+       for (i = 0; i < ebcnt && bbt[i]; ++i)
                addr0 += mtd->erasesize;
 
        /* Attempt to write off end of OOB */
index 9648818b9e2c3857feb9f1a2e57a159ef073b94a..103cac480feec2fbf622db0d4d65694cc611547a 100644 (file)
@@ -116,11 +116,11 @@ static int verify_eraseblock(int ebnum)
        loff_t addr = ebnum * mtd->erasesize;
 
        addr0 = 0;
-       for (i = 0; bbt[i] && i < ebcnt; ++i)
+       for (i = 0; i < ebcnt && bbt[i]; ++i)
                addr0 += mtd->erasesize;
 
        addrn = mtd->size;
-       for (i = 0; bbt[ebcnt - i - 1] && i < ebcnt; ++i)
+       for (i = 0; i < ebcnt && bbt[ebcnt - i - 1]; ++i)
                addrn -= mtd->erasesize;
 
        set_random_data(writebuf, mtd->erasesize);
@@ -219,11 +219,11 @@ static int crosstest(void)
        memset(pp1, 0, pgsize * 4);
 
        addr0 = 0;
-       for (i = 0; bbt[i] && i < ebcnt; ++i)
+       for (i = 0; i < ebcnt && bbt[i]; ++i)
                addr0 += mtd->erasesize;
 
        addrn = mtd->size;
-       for (i = 0; bbt[ebcnt - i - 1] && i < ebcnt; ++i)
+       for (i = 0; i < ebcnt && bbt[ebcnt - i - 1]; ++i)
                addrn -= mtd->erasesize;
 
        /* Read 2nd-to-last page to pp1 */
@@ -317,7 +317,7 @@ static int erasecrosstest(void)
 
        ebnum = 0;
        addr0 = 0;
-       for (i = 0; bbt[i] && i < ebcnt; ++i) {
+       for (i = 0; i < ebcnt && bbt[i]; ++i) {
                addr0 += mtd->erasesize;
                ebnum += 1;
        }
@@ -413,7 +413,7 @@ static int erasetest(void)
 
        ebnum = 0;
        addr0 = 0;
-       for (i = 0; bbt[i] && i < ebcnt; ++i) {
+       for (i = 0; i < ebcnt && bbt[i]; ++i) {
                addr0 += mtd->erasesize;
                ebnum += 1;
        }
index e4d9ef0c965a4f432a45913942f03d7702a7b4cb..9f87c99189a99cca2e30dbe35b2a7441203a663e 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 c290f51dd178fc95c8a4b26caf1017309f50d601..1af08178defd57bc346f9056f57f7b5816bba9ff 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
index 646dfc5f50c9827014f343ba3c62bc7960b85f4e..8ea9c7545c12b815dc899ec64e00de1e56d95c59 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 083e21094b20d69ae6fba917bef34485a5cd5766..66bcbbb6babc057480676a4b413419b016681b8c 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 0695be14cf915bb624b8809a5d8b420f4a717880..aa76cbada5e2ad4adbdbc45e15aa2b6e70f76395 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 cea5cfe23b71f9607c17310fe90d63301c3c06ff..c3fa31c9f2a7440f893f60ba10e6007ac9150251 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 cda6b397550d541fdd0a0dec65f319bf375a7cec..45ac225a7aaa5c241a90e042ccac8738c8643a67 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 3747457f5e69441a14d91932b3ac3aca18a5c879..bc7c5b7abb883e9b2af2a591d5692b464fdc0d30 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 117fc6c12e3400233f98cfc80e93de3b989c8871..66813c91a720d7b7b8be884ddbba07e2f65cce85 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 2234118eedbb66a2aa1c884aab228332f0706d0a..6c144b525b4714cceeacc667bd4d3d2f0c86669a 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 1d7d7fef414f8f64a1a97ab7658214d2af9ea044..89c82c5e63e4e576476eefe65936bce754bd08ff 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 d2639c4a086dfc0ed7f265c472b9df1c1edcb1db..5d6c1530a8c0458e02ae42305e3accf893f9cdd1 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 547ac7c7479ced9240ec6d08a32ee7209001b34a..2378358643576daa21a034202a87f0ee3f2ebbb7 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 da8d0a0ca94fd45afdec5a9248dc279842901b8f..f2a197fd47a5fd2bbd6d5d3a5a35fe4d7c16d05b 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 fb65b427c69227231e125b882a6de80b6e741254..1d0d4d9ab623ee3a2504cc0b7c69620574aaf087 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 bd0ac690d12cde2d406c4764f9b6719675ce511d..aad3b370c56284ccaa0f97426d0ba681b35c31c1 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 76cc2614f480df28cbf1973461529114d4c7d8b7..f9364d0678f27d19cc4ab1e5a0519034e627e2db 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 220529257828a690afc64e7ab2fc726f82a9e7d8..7783c5db81dcf12174e2dc95217336987c6ff10e 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 bc98e7f69ee905b9ca405a622778cb61aa95cd13..ede937ee50c704e373554f9881782dea7840b31b 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 f1df2ec8ad41a8e7fd4ee3349ebbf6550ea1d983..e6b33ee05ede1473ba91c8b4e8d9124a9122f793 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 79e665e0853deb67180afda15b482e388cdbe809..a320fdb3727ded529bd95833c32b50182bccfff6 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 62e852e21ab2cf7e6444cdd5fab27f2ae5c57484..55bad408196604d454b4e4f8e241cb2b98365e83 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 4bb52e9cd371afc58db9e8620bf8a3182643f686..15140f9f2e92883bc7d807ee571afa82fe893539 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 45cebfb302cf438e769f0865decbf9f86a0f90b8..23300656c2668a147b428c8339d79f8b0d3a548c 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 32266fb89c2022204c4b7fd396b4139c53f69f0d..5c498d2b043f45f59135160e8edd424658c01e18 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 62779a520ca1d5d8d2c0ac4b110e916756fba1fc..3e94f0ce0900eb8d22bac23b37182a52d2a4863b 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 b378037a29b560cdac222d6e47cf2b69e455220a..068d7a9d3e36aaf447661fb27e0b9d898325137a 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 debad07d990072e30f9776de94c365a991fbc0b5..c63ea6afd96f1c1880a0cb62c884d9fec39ff150 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 a3b36b3a9d676a76194bc806d6776b714768fc95..cce188837d10b03daa42f1cf4209d6e334493d70 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 446e327180f8efe2829e5839b89886d546fab4f3..cb8be8d7abc15a26ec48d8d8fb19719633d09c9d 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 05458d9249ce357f1a3b1ac73d0ea270225321ee..afd26bf06649a06690bf7e29a67592c00151a5b9 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 5809ef5b18f82e224dfb3115bdd1298608547661..1103256ad989400d2bb65b765731a79f464b00ea 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 5e110a2328aef327dedf1575eacab30bb739c69e..4e79a9800134fda2043e02c445102d85a94fe8f9 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 69f85c07d17fc24718861b41618c6a8c0c493183..ddf224d456b2602efeaa9cdefebf72300f9bdf13 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 b7e4cee24269a2e0a11b66833c6734dcf6f6a959..2766a6d3c2e9c8fe2f7ab2a2d1f3457275693f80 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 a45b0c0d574e2d909c2180b6fa752d9100e770f6..a6b4a5a53d40d8f123345a6e3f5400c409a8e3a4 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 123d8fe3427d0a1286f8ebd5d1cf684d13969993..57a6d19eba4c73877283b7779229d5619cc4d0bd 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 ab99783dccec9570c7aecd9e8141490a97cadc14..14bbaa17e2ca8ec8729eda3702c6883865558406 100644 (file)
@@ -34,9 +34,9 @@
 #include <linux/irq.h>
 #include <linux/interrupt.h>
 #include <linux/tboot.h>
+#include <linux/dmi.h>
 
-#undef PREFIX
-#define PREFIX "DMAR:"
+#define PREFIX "DMAR: "
 
 /* No locks are needed as DMA remapping hardware unit
  * list is constructed at boot time and hotplug of
@@ -577,9 +577,6 @@ int __init dmar_table_init(void)
                printk(KERN_INFO PREFIX "No ATSR found\n");
 #endif
 
-#ifdef CONFIG_INTR_REMAP
-       parse_ioapics_under_ir();
-#endif
        return 0;
 }
 
@@ -639,20 +636,31 @@ int alloc_iommu(struct dmar_drhd_unit *drhd)
        iommu->cap = dmar_readq(iommu->reg + DMAR_CAP_REG);
        iommu->ecap = dmar_readq(iommu->reg + DMAR_ECAP_REG);
 
+       if (iommu->cap == (uint64_t)-1 && iommu->ecap == (uint64_t)-1) {
+               /* Promote an attitude of violence to a BIOS engineer today */
+               WARN(1, "Your BIOS is broken; DMAR reported at address %llx returns all ones!\n"
+                    "BIOS vendor: %s; Ver: %s; Product Version: %s\n",
+                    drhd->reg_base_addr,
+                    dmi_get_system_info(DMI_BIOS_VENDOR),
+                    dmi_get_system_info(DMI_BIOS_VERSION),
+                    dmi_get_system_info(DMI_PRODUCT_VERSION));
+               goto err_unmap;
+       }
+
 #ifdef CONFIG_DMAR
        agaw = iommu_calculate_agaw(iommu);
        if (agaw < 0) {
                printk(KERN_ERR
                       "Cannot get a valid agaw for iommu (seq_id = %d)\n",
                       iommu->seq_id);
-               goto error;
+               goto err_unmap;
        }
        msagaw = iommu_calculate_max_sagaw(iommu);
        if (msagaw < 0) {
                printk(KERN_ERR
                        "Cannot get a valid max agaw for iommu (seq_id = %d)\n",
                        iommu->seq_id);
-               goto error;
+               goto err_unmap;
        }
 #endif
        iommu->agaw = agaw;
@@ -672,7 +680,7 @@ int alloc_iommu(struct dmar_drhd_unit *drhd)
        }
 
        ver = readl(iommu->reg + DMAR_VER_REG);
-       pr_debug("IOMMU %llx: ver %d:%d cap %llx ecap %llx\n",
+       pr_info("IOMMU %llx: ver %d:%d cap %llx ecap %llx\n",
                (unsigned long long)drhd->reg_base_addr,
                DMAR_VER_MAJOR(ver), DMAR_VER_MINOR(ver),
                (unsigned long long)iommu->cap,
@@ -682,7 +690,10 @@ int alloc_iommu(struct dmar_drhd_unit *drhd)
 
        drhd->iommu = iommu;
        return 0;
-error:
+
+ err_unmap:
+       iounmap(iommu->reg);
+ error:
        kfree(iommu);
        return -1;
 }
@@ -1219,7 +1230,7 @@ irqreturn_t dmar_fault(int irq, void *dev_id)
                                source_id, guest_addr);
 
                fault_index++;
-               if (fault_index > cap_num_fault_regs(iommu->cap))
+               if (fault_index >= cap_num_fault_regs(iommu->cap))
                        fault_index = 0;
                spin_lock_irqsave(&iommu->register_lock, flag);
        }
@@ -1312,3 +1323,13 @@ int dmar_reenable_qi(struct intel_iommu *iommu)
 
        return 0;
 }
+
+/*
+ * Check interrupt remapping support in DMAR table description.
+ */
+int dmar_ir_support(void)
+{
+       struct acpi_table_dmar *dmar;
+       dmar = (struct acpi_table_dmar *)dmar_tbl;
+       return dmar->flags & 0x1;
+}
index 5befa7e379b73ffd43f242f4095c25265e8cad00..a9d926b7d805e14d099188c891b8295f1eabe15e 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 562221e119172ffe19655b5ff6b5792098d89e48..855dd7ca47f3be2c6f8e79da514035ea5a3ad77c 100644 (file)
@@ -38,6 +38,7 @@
 #include <linux/intel-iommu.h>
 #include <linux/sysdev.h>
 #include <linux/tboot.h>
+#include <linux/dmi.h>
 #include <asm/cacheflush.h>
 #include <asm/iommu.h>
 #include "pci.h"
 
 #define MAX_AGAW_WIDTH 64
 
-#define DOMAIN_MAX_ADDR(gaw) ((((u64)1) << gaw) - 1)
-#define DOMAIN_MAX_PFN(gaw)  ((((u64)1) << (gaw-VTD_PAGE_SHIFT)) - 1)
+#define __DOMAIN_MAX_PFN(gaw)  ((((uint64_t)1) << (gaw-VTD_PAGE_SHIFT)) - 1)
+#define __DOMAIN_MAX_ADDR(gaw) ((((uint64_t)1) << gaw) - 1)
+
+/* We limit DOMAIN_MAX_PFN to fit in an unsigned long, and DOMAIN_MAX_ADDR
+   to match. That way, we can use 'unsigned long' for PFNs with impunity. */
+#define DOMAIN_MAX_PFN(gaw)    ((unsigned long) min_t(uint64_t, \
+                               __DOMAIN_MAX_PFN(gaw), (unsigned long)-1))
+#define DOMAIN_MAX_ADDR(gaw)   (((uint64_t)__DOMAIN_MAX_PFN(gaw)) << VTD_PAGE_SHIFT)
 
 #define IOVA_PFN(addr)         ((addr) >> PAGE_SHIFT)
 #define DMA_32BIT_PFN          IOVA_PFN(DMA_BIT_MASK(32))
@@ -252,7 +259,8 @@ static inline int first_pte_in_page(struct dma_pte *pte)
  *     2. It maps to each iommu if successful.
  *     3. Each iommu mapps to this domain if successful.
  */
-struct dmar_domain *si_domain;
+static struct dmar_domain *si_domain;
+static int hw_pass_through = 1;
 
 /* devices under the same p2p bridge are owned in one domain */
 #define DOMAIN_FLAG_P2P_MULTIPLE_DEVICES (1 << 0)
@@ -728,7 +736,7 @@ static struct dma_pte *pfn_to_dma_pte(struct dmar_domain *domain,
                                return NULL;
 
                        domain_flush_cache(domain, tmp_page, VTD_PAGE_SIZE);
-                       pteval = (virt_to_dma_pfn(tmp_page) << VTD_PAGE_SHIFT) | DMA_PTE_READ | DMA_PTE_WRITE;
+                       pteval = ((uint64_t)virt_to_dma_pfn(tmp_page) << VTD_PAGE_SHIFT) | DMA_PTE_READ | DMA_PTE_WRITE;
                        if (cmpxchg64(&pte->val, 0ULL, pteval)) {
                                /* Someone else set it while we were thinking; use theirs. */
                                free_pgtable_page(tmp_page);
@@ -778,9 +786,10 @@ static void dma_pte_clear_range(struct dmar_domain *domain,
 
        BUG_ON(addr_width < BITS_PER_LONG && start_pfn >> addr_width);
        BUG_ON(addr_width < BITS_PER_LONG && last_pfn >> addr_width);
+       BUG_ON(start_pfn > last_pfn);
 
        /* we don't need lock here; nobody else touches the iova range */
-       while (start_pfn <= last_pfn) {
+       do {
                first_pte = pte = dma_pfn_level_pte(domain, start_pfn, 1);
                if (!pte) {
                        start_pfn = align_to_level(start_pfn + 1, 2);
@@ -794,7 +803,8 @@ static void dma_pte_clear_range(struct dmar_domain *domain,
 
                domain_flush_cache(domain, first_pte,
                                   (void *)pte - (void *)first_pte);
-       }
+
+       } while (start_pfn && start_pfn <= last_pfn);
 }
 
 /* free page table pages. last level pte should already be cleared */
@@ -810,6 +820,7 @@ static void dma_pte_free_pagetable(struct dmar_domain *domain,
 
        BUG_ON(addr_width < BITS_PER_LONG && start_pfn >> addr_width);
        BUG_ON(addr_width < BITS_PER_LONG && last_pfn >> addr_width);
+       BUG_ON(start_pfn > last_pfn);
 
        /* We don't need lock here; nobody else touches the iova range */
        level = 2;
@@ -820,7 +831,7 @@ static void dma_pte_free_pagetable(struct dmar_domain *domain,
                if (tmp + level_size(level) - 1 > last_pfn)
                        return;
 
-               while (tmp + level_size(level) - 1 <= last_pfn) {
+               do {
                        first_pte = pte = dma_pfn_level_pte(domain, tmp, level);
                        if (!pte) {
                                tmp = align_to_level(tmp + 1, level + 1);
@@ -839,7 +850,7 @@ static void dma_pte_free_pagetable(struct dmar_domain *domain,
                        domain_flush_cache(domain, first_pte,
                                           (void *)pte - (void *)first_pte);
                        
-               }
+               } while (tmp && tmp + level_size(level) - 1 <= last_pfn);
                level++;
        }
        /* free pgd */
@@ -1158,6 +1169,8 @@ static int iommu_init_domains(struct intel_iommu *iommu)
        pr_debug("Number of Domains supportd <%ld>\n", ndomains);
        nlongs = BITS_TO_LONGS(ndomains);
 
+       spin_lock_init(&iommu->lock);
+
        /* TBD: there might be 64K domains,
         * consider other allocation for future chip
         */
@@ -1170,12 +1183,9 @@ static int iommu_init_domains(struct intel_iommu *iommu)
                        GFP_KERNEL);
        if (!iommu->domains) {
                printk(KERN_ERR "Allocating domain array failed\n");
-               kfree(iommu->domain_ids);
                return -ENOMEM;
        }
 
-       spin_lock_init(&iommu->lock);
-
        /*
         * if Caching mode is set, then invalid translations are tagged
         * with domainid 0. Hence we need to pre-allocate it.
@@ -1195,22 +1205,24 @@ void free_dmar_iommu(struct intel_iommu *iommu)
        int i;
        unsigned long flags;
 
-       i = find_first_bit(iommu->domain_ids, cap_ndoms(iommu->cap));
-       for (; i < cap_ndoms(iommu->cap); ) {
-               domain = iommu->domains[i];
-               clear_bit(i, iommu->domain_ids);
+       if ((iommu->domains) && (iommu->domain_ids)) {
+               i = find_first_bit(iommu->domain_ids, cap_ndoms(iommu->cap));
+               for (; i < cap_ndoms(iommu->cap); ) {
+                       domain = iommu->domains[i];
+                       clear_bit(i, iommu->domain_ids);
+
+                       spin_lock_irqsave(&domain->iommu_lock, flags);
+                       if (--domain->iommu_count == 0) {
+                               if (domain->flags & DOMAIN_FLAG_VIRTUAL_MACHINE)
+                                       vm_domain_exit(domain);
+                               else
+                                       domain_exit(domain);
+                       }
+                       spin_unlock_irqrestore(&domain->iommu_lock, flags);
 
-               spin_lock_irqsave(&domain->iommu_lock, flags);
-               if (--domain->iommu_count == 0) {
-                       if (domain->flags & DOMAIN_FLAG_VIRTUAL_MACHINE)
-                               vm_domain_exit(domain);
-                       else
-                               domain_exit(domain);
+                       i = find_next_bit(iommu->domain_ids,
+                               cap_ndoms(iommu->cap), i+1);
                }
-               spin_unlock_irqrestore(&domain->iommu_lock, flags);
-
-               i = find_next_bit(iommu->domain_ids,
-                       cap_ndoms(iommu->cap), i+1);
        }
 
        if (iommu->gcmd & DMA_GCMD_TE)
@@ -1310,7 +1322,6 @@ static void iommu_detach_domain(struct dmar_domain *domain,
 }
 
 static struct iova_domain reserved_iova_list;
-static struct lock_class_key reserved_alloc_key;
 static struct lock_class_key reserved_rbtree_key;
 
 static void dmar_init_reserved_ranges(void)
@@ -1321,8 +1332,6 @@ static void dmar_init_reserved_ranges(void)
 
        init_iova_domain(&reserved_iova_list, DMA_32BIT_PFN);
 
-       lockdep_set_class(&reserved_iova_list.iova_alloc_lock,
-               &reserved_alloc_key);
        lockdep_set_class(&reserved_iova_list.iova_rbtree_lock,
                &reserved_rbtree_key);
 
@@ -1959,14 +1968,35 @@ static int iommu_prepare_identity_map(struct pci_dev *pdev,
        struct dmar_domain *domain;
        int ret;
 
-       printk(KERN_INFO
-              "IOMMU: Setting identity map for device %s [0x%Lx - 0x%Lx]\n",
-              pci_name(pdev), start, end);
-
        domain = get_domain_for_dev(pdev, DEFAULT_DOMAIN_ADDRESS_WIDTH);
        if (!domain)
                return -ENOMEM;
 
+       /* For _hardware_ passthrough, don't bother. But for software
+          passthrough, we do it anyway -- it may indicate a memory
+          range which is reserved in E820, so which didn't get set
+          up to start with in si_domain */
+       if (domain == si_domain && hw_pass_through) {
+               printk("Ignoring identity map for HW passthrough device %s [0x%Lx - 0x%Lx]\n",
+                      pci_name(pdev), start, end);
+               return 0;
+       }
+
+       printk(KERN_INFO
+              "IOMMU: Setting identity map for device %s [0x%Lx - 0x%Lx]\n",
+              pci_name(pdev), start, end);
+       
+       if (end >> agaw_to_width(domain->agaw)) {
+               WARN(1, "Your BIOS is broken; RMRR exceeds permitted address width (%d bits)\n"
+                    "BIOS vendor: %s; Ver: %s; Product Version: %s\n",
+                    agaw_to_width(domain->agaw),
+                    dmi_get_system_info(DMI_BIOS_VENDOR),
+                    dmi_get_system_info(DMI_BIOS_VERSION),
+                    dmi_get_system_info(DMI_PRODUCT_VERSION));
+               ret = -EIO;
+               goto error;
+       }
+
        ret = iommu_domain_identity_map(domain, start, end);
        if (ret)
                goto error;
@@ -2017,23 +2047,6 @@ static inline void iommu_prepare_isa(void)
 }
 #endif /* !CONFIG_DMAR_FLPY_WA */
 
-/* Initialize each context entry as pass through.*/
-static int __init init_context_pass_through(void)
-{
-       struct pci_dev *pdev = NULL;
-       struct dmar_domain *domain;
-       int ret;
-
-       for_each_pci_dev(pdev) {
-               domain = get_domain_for_dev(pdev, DEFAULT_DOMAIN_ADDRESS_WIDTH);
-               ret = domain_context_mapping(domain, pdev,
-                                            CONTEXT_TT_PASS_THROUGH);
-               if (ret)
-                       return ret;
-       }
-       return 0;
-}
-
 static int md_domain_init(struct dmar_domain *domain, int guest_width);
 
 static int __init si_domain_work_fn(unsigned long start_pfn,
@@ -2048,7 +2061,7 @@ static int __init si_domain_work_fn(unsigned long start_pfn,
 
 }
 
-static int si_domain_init(void)
+static int __init si_domain_init(int hw)
 {
        struct dmar_drhd_unit *drhd;
        struct intel_iommu *iommu;
@@ -2075,6 +2088,9 @@ static int si_domain_init(void)
 
        si_domain->flags = DOMAIN_FLAG_STATIC_IDENTITY;
 
+       if (hw)
+               return 0;
+
        for_each_online_node(nid) {
                work_with_active_regions(nid, si_domain_work_fn, &ret);
                if (ret)
@@ -2101,15 +2117,23 @@ static int identity_mapping(struct pci_dev *pdev)
 }
 
 static int domain_add_dev_info(struct dmar_domain *domain,
-                                 struct pci_dev *pdev)
+                              struct pci_dev *pdev,
+                              int translation)
 {
        struct device_domain_info *info;
        unsigned long flags;
+       int ret;
 
        info = alloc_devinfo_mem();
        if (!info)
                return -ENOMEM;
 
+       ret = domain_context_mapping(domain, pdev, translation);
+       if (ret) {
+               free_devinfo_mem(info);
+               return ret;
+       }
+
        info->segment = pci_domain_nr(pdev->bus);
        info->bus = pdev->bus->number;
        info->devfn = pdev->devfn;
@@ -2166,27 +2190,25 @@ static int iommu_should_identity_map(struct pci_dev *pdev, int startup)
        return 1;
 }
 
-static int iommu_prepare_static_identity_mapping(void)
+static int __init iommu_prepare_static_identity_mapping(int hw)
 {
        struct pci_dev *pdev = NULL;
        int ret;
 
-       ret = si_domain_init();
+       ret = si_domain_init(hw);
        if (ret)
                return -EFAULT;
 
        for_each_pci_dev(pdev) {
                if (iommu_should_identity_map(pdev, 1)) {
-                       printk(KERN_INFO "IOMMU: identity mapping for device %s\n",
-                              pci_name(pdev));
+                       printk(KERN_INFO "IOMMU: %s identity mapping for device %s\n",
+                              hw ? "hardware" : "software", pci_name(pdev));
 
-                       ret = domain_context_mapping(si_domain, pdev,
+                       ret = domain_add_dev_info(si_domain, pdev,
+                                                    hw ? CONTEXT_TT_PASS_THROUGH :
                                                     CONTEXT_TT_MULTI_LEVEL);
                        if (ret)
                                return ret;
-                       ret = domain_add_dev_info(si_domain, pdev);
-                       if (ret)
-                               return ret;
                }
        }
 
@@ -2200,14 +2222,6 @@ int __init init_dmars(void)
        struct pci_dev *pdev;
        struct intel_iommu *iommu;
        int i, ret;
-       int pass_through = 1;
-
-       /*
-        * In case pass through can not be enabled, iommu tries to use identity
-        * mapping.
-        */
-       if (iommu_pass_through)
-               iommu_identity_mapping = 1;
 
        /*
         * for each drhd
@@ -2235,7 +2249,6 @@ int __init init_dmars(void)
        deferred_flush = kzalloc(g_num_of_iommus *
                sizeof(struct deferred_flush_tables), GFP_KERNEL);
        if (!deferred_flush) {
-               kfree(g_iommus);
                ret = -ENOMEM;
                goto error;
        }
@@ -2262,14 +2275,8 @@ int __init init_dmars(void)
                        goto error;
                }
                if (!ecap_pass_through(iommu->ecap))
-                       pass_through = 0;
+                       hw_pass_through = 0;
        }
-       if (iommu_pass_through)
-               if (!pass_through) {
-                       printk(KERN_INFO
-                              "Pass Through is not supported by hardware.\n");
-                       iommu_pass_through = 0;
-               }
 
        /*
         * Start from the sane iommu hardware state.
@@ -2324,64 +2331,57 @@ int __init init_dmars(void)
                }
        }
 
+       if (iommu_pass_through)
+               iommu_identity_mapping = 1;
+#ifdef CONFIG_DMAR_BROKEN_GFX_WA
+       else
+               iommu_identity_mapping = 2;
+#endif
        /*
-        * If pass through is set and enabled, context entries of all pci
-        * devices are intialized by pass through translation type.
+        * If pass through is not set or not enabled, setup context entries for
+        * identity mappings for rmrr, gfx, and isa and may fall back to static
+        * identity mapping if iommu_identity_mapping is set.
         */
-       if (iommu_pass_through) {
-               ret = init_context_pass_through();
+       if (iommu_identity_mapping) {
+               ret = iommu_prepare_static_identity_mapping(hw_pass_through);
                if (ret) {
-                       printk(KERN_ERR "IOMMU: Pass through init failed.\n");
-                       iommu_pass_through = 0;
+                       printk(KERN_CRIT "Failed to setup IOMMU pass-through\n");
+                       goto error;
                }
        }
-
        /*
-        * If pass through is not set or not enabled, setup context entries for
-        * identity mappings for rmrr, gfx, and isa and may fall back to static
-        * identity mapping if iommu_identity_mapping is set.
+        * For each rmrr
+        *   for each dev attached to rmrr
+        *   do
+        *     locate drhd for dev, alloc domain for dev
+        *     allocate free domain
+        *     allocate page table entries for rmrr
+        *     if context not allocated for bus
+        *           allocate and init context
+        *           set present in root table for this bus
+        *     init context with domain, translation etc
+        *    endfor
+        * endfor
         */
-       if (!iommu_pass_through) {
-#ifdef CONFIG_DMAR_BROKEN_GFX_WA
-               if (!iommu_identity_mapping)
-                       iommu_identity_mapping = 2;
-#endif
-               if (iommu_identity_mapping)
-                       iommu_prepare_static_identity_mapping();
-               /*
-                * For each rmrr
-                *   for each dev attached to rmrr
-                *   do
-                *     locate drhd for dev, alloc domain for dev
-                *     allocate free domain
-                *     allocate page table entries for rmrr
-                *     if context not allocated for bus
-                *           allocate and init context
-                *           set present in root table for this bus
-                *     init context with domain, translation etc
-                *    endfor
-                * endfor
-                */
-               printk(KERN_INFO "IOMMU: Setting RMRR:\n");
-               for_each_rmrr_units(rmrr) {
-                       for (i = 0; i < rmrr->devices_cnt; i++) {
-                               pdev = rmrr->devices[i];
-                               /*
-                                * some BIOS lists non-exist devices in DMAR
-                                * table.
-                                */
-                               if (!pdev)
-                                       continue;
-                               ret = iommu_prepare_rmrr_dev(rmrr, pdev);
-                               if (ret)
-                                       printk(KERN_ERR
-                                "IOMMU: mapping reserved region failed\n");
-                       }
+       printk(KERN_INFO "IOMMU: Setting RMRR:\n");
+       for_each_rmrr_units(rmrr) {
+               for (i = 0; i < rmrr->devices_cnt; i++) {
+                       pdev = rmrr->devices[i];
+                       /*
+                        * some BIOS lists non-exist devices in DMAR
+                        * table.
+                        */
+                       if (!pdev)
+                               continue;
+                       ret = iommu_prepare_rmrr_dev(rmrr, pdev);
+                       if (ret)
+                               printk(KERN_ERR
+                                      "IOMMU: mapping reserved region failed\n");
                }
-
-               iommu_prepare_isa();
        }
 
+       iommu_prepare_isa();
+
        /*
         * for each drhd
         *   enable fault log
@@ -2404,11 +2404,12 @@ int __init init_dmars(void)
 
                iommu->flush.flush_context(iommu, 0, 0, 0, DMA_CCMD_GLOBAL_INVL);
                iommu->flush.flush_iotlb(iommu, 0, 0, 0, DMA_TLB_GLOBAL_FLUSH);
-               iommu_disable_protect_mem_regions(iommu);
 
                ret = iommu_enable_translation(iommu);
                if (ret)
                        goto error;
+
+               iommu_disable_protect_mem_regions(iommu);
        }
 
        return 0;
@@ -2455,8 +2456,7 @@ static struct iova *intel_alloc_iova(struct device *dev,
        return iova;
 }
 
-static struct dmar_domain *
-get_valid_domain_for_dev(struct pci_dev *pdev)
+static struct dmar_domain *__get_valid_domain_for_dev(struct pci_dev *pdev)
 {
        struct dmar_domain *domain;
        int ret;
@@ -2484,6 +2484,18 @@ get_valid_domain_for_dev(struct pci_dev *pdev)
        return domain;
 }
 
+static inline struct dmar_domain *get_valid_domain_for_dev(struct pci_dev *dev)
+{
+       struct device_domain_info *info;
+
+       /* No lock here, assumes no domain exit in normal case */
+       info = dev->dev.archdata.iommu;
+       if (likely(info))
+               return info->domain;
+
+       return __get_valid_domain_for_dev(dev);
+}
+
 static int iommu_dummy(struct pci_dev *pdev)
 {
        return pdev->dev.archdata.iommu == DUMMY_DEVICE_DOMAIN_INFO;
@@ -2526,10 +2538,10 @@ static int iommu_no_mapping(struct device *dev)
                 */
                if (iommu_should_identity_map(pdev, 0)) {
                        int ret;
-                       ret = domain_add_dev_info(si_domain, pdev);
-                       if (ret)
-                               return 0;
-                       ret = domain_context_mapping(si_domain, pdev, CONTEXT_TT_MULTI_LEVEL);
+                       ret = domain_add_dev_info(si_domain, pdev,
+                                                 hw_pass_through ?
+                                                 CONTEXT_TT_PASS_THROUGH :
+                                                 CONTEXT_TT_MULTI_LEVEL);
                        if (!ret) {
                                printk(KERN_INFO "64bit %s uses identity mapping\n",
                                       pci_name(pdev));
@@ -2638,10 +2650,9 @@ static void flush_unmaps(void)
                        unsigned long mask;
                        struct iova *iova = deferred_flush[i].iova[j];
 
-                       mask = (iova->pfn_hi - iova->pfn_lo + 1) << PAGE_SHIFT;
-                       mask = ilog2(mask >> VTD_PAGE_SHIFT);
+                       mask = ilog2(mm_to_dma_pfn(iova->pfn_hi - iova->pfn_lo + 1));
                        iommu_flush_dev_iotlb(deferred_flush[i].domain[j],
-                                       iova->pfn_lo << PAGE_SHIFT, mask);
+                                       (uint64_t)iova->pfn_lo << PAGE_SHIFT, mask);
                        __free_iova(&deferred_flush[i].domain[j]->iovad, iova);
                }
                deferred_flush[i].next = 0;
@@ -2734,12 +2745,6 @@ static void intel_unmap_page(struct device *dev, dma_addr_t dev_addr,
        }
 }
 
-static void intel_unmap_single(struct device *dev, dma_addr_t dev_addr, size_t size,
-                              int dir)
-{
-       intel_unmap_page(dev, dev_addr, size, dir, NULL);
-}
-
 static void *intel_alloc_coherent(struct device *hwdev, size_t size,
                                  dma_addr_t *dma_handle, gfp_t flags)
 {
@@ -2772,7 +2777,7 @@ static void intel_free_coherent(struct device *hwdev, size_t size, void *vaddr,
        size = PAGE_ALIGN(size);
        order = get_order(size);
 
-       intel_unmap_single(hwdev, dma_handle, size, DMA_BIDIRECTIONAL);
+       intel_unmap_page(hwdev, dma_handle, size, DMA_BIDIRECTIONAL, NULL);
        free_pages((unsigned long)vaddr, order);
 }
 
@@ -2808,11 +2813,18 @@ static void intel_unmap_sg(struct device *hwdev, struct scatterlist *sglist,
        /* free page tables */
        dma_pte_free_pagetable(domain, start_pfn, last_pfn);
 
-       iommu_flush_iotlb_psi(iommu, domain->id, start_pfn,
-                             (last_pfn - start_pfn + 1));
-
-       /* free iova */
-       __free_iova(&domain->iovad, iova);
+       if (intel_iommu_strict) {
+               iommu_flush_iotlb_psi(iommu, domain->id, start_pfn,
+                                     last_pfn - start_pfn + 1);
+               /* free iova */
+               __free_iova(&domain->iovad, iova);
+       } else {
+               add_unmap(domain, iova);
+               /*
+                * queue up the release of the unmap to save the 1/6th of the
+                * cpu used up by the iotlb flush operation...
+                */
+       }
 }
 
 static int intel_nontranslate_map_sg(struct device *hddev,
@@ -3056,8 +3068,8 @@ static int init_iommu_hw(void)
                                           DMA_CCMD_GLOBAL_INVL);
                iommu->flush.flush_iotlb(iommu, 0, 0, 0,
                                         DMA_TLB_GLOBAL_FLUSH);
-               iommu_disable_protect_mem_regions(iommu);
                iommu_enable_translation(iommu);
+               iommu_disable_protect_mem_regions(iommu);
        }
 
        return 0;
@@ -3205,7 +3217,7 @@ int __init intel_iommu_init(void)
         * Check the need for DMA-remapping initialization now.
         * Above initialization will also be used by Interrupt-remapping.
         */
-       if (no_iommu || (swiotlb && !iommu_pass_through) || dmar_disabled)
+       if (no_iommu || swiotlb || dmar_disabled)
                return -ENODEV;
 
        iommu_init_mempool();
@@ -3227,14 +3239,7 @@ int __init intel_iommu_init(void)
 
        init_timer(&unmap_timer);
        force_iommu = 1;
-
-       if (!iommu_pass_through) {
-               printk(KERN_INFO
-                      "Multi-level page-table translation for DMAR.\n");
-               dma_ops = &intel_dma_ops;
-       } else
-               printk(KERN_INFO
-                      "DMAR: Pass through translation for DMAR.\n");
+       dma_ops = &intel_dma_ops;
 
        init_iommu_sysfs();
 
@@ -3517,7 +3522,6 @@ static int intel_iommu_attach_device(struct iommu_domain *domain,
        struct intel_iommu *iommu;
        int addr_width;
        u64 end;
-       int ret;
 
        /* normally pdev is not mapped */
        if (unlikely(domain_context_mapped(pdev))) {
@@ -3549,12 +3553,7 @@ static int intel_iommu_attach_device(struct iommu_domain *domain,
                return -EFAULT;
        }
 
-       ret = domain_add_dev_info(dmar_domain, pdev);
-       if (ret)
-               return ret;
-
-       ret = domain_context_mapping(dmar_domain, pdev, CONTEXT_TT_MULTI_LEVEL);
-       return ret;
+       return domain_add_dev_info(dmar_domain, pdev, CONTEXT_TT_MULTI_LEVEL);
 }
 
 static void intel_iommu_detach_device(struct iommu_domain *domain,
index 44803644ca058de163a8f856dcb1754ef076614b..0ed78a764ded2e10ede6f3f109ab481bca73be42 100644 (file)
@@ -603,6 +603,9 @@ int __init intr_remapping_supported(void)
        if (disable_intremap)
                return 0;
 
+       if (!dmar_ir_support())
+               return 0;
+
        for_each_drhd_unit(drhd) {
                struct intel_iommu *iommu = drhd->iommu;
 
@@ -618,6 +621,11 @@ int __init enable_intr_remapping(int eim)
        struct dmar_drhd_unit *drhd;
        int setup = 0;
 
+       if (parse_ioapics_under_ir() != 1) {
+               printk(KERN_INFO "Not enable interrupt remapping\n");
+               return -1;
+       }
+
        for_each_drhd_unit(drhd) {
                struct intel_iommu *iommu = drhd->iommu;
 
index 46dd440e2315d2ec7beaf096c00fae5c3c11df1a..7914951ef29a9bab0b4bf4371f6d396503abd4ac 100644 (file)
@@ -22,7 +22,6 @@
 void
 init_iova_domain(struct iova_domain *iovad, unsigned long pfn_32bit)
 {
-       spin_lock_init(&iovad->iova_alloc_lock);
        spin_lock_init(&iovad->iova_rbtree_lock);
        iovad->rbroot = RB_ROOT;
        iovad->cached32_node = NULL;
@@ -205,7 +204,6 @@ alloc_iova(struct iova_domain *iovad, unsigned long size,
        unsigned long limit_pfn,
        bool size_aligned)
 {
-       unsigned long flags;
        struct iova *new_iova;
        int ret;
 
@@ -219,11 +217,9 @@ alloc_iova(struct iova_domain *iovad, unsigned long size,
        if (size_aligned)
                size = __roundup_pow_of_two(size);
 
-       spin_lock_irqsave(&iovad->iova_alloc_lock, flags);
        ret = __alloc_and_insert_iova_range(iovad, size, limit_pfn,
                        new_iova, size_aligned);
 
-       spin_unlock_irqrestore(&iovad->iova_alloc_lock, flags);
        if (ret) {
                free_iova_mem(new_iova);
                return NULL;
@@ -381,8 +377,7 @@ reserve_iova(struct iova_domain *iovad,
        struct iova *iova;
        unsigned int overlap = 0;
 
-       spin_lock_irqsave(&iovad->iova_alloc_lock, flags);
-       spin_lock(&iovad->iova_rbtree_lock);
+       spin_lock_irqsave(&iovad->iova_rbtree_lock, flags);
        for (node = rb_first(&iovad->rbroot); node; node = rb_next(node)) {
                if (__is_range_overlap(node, pfn_lo, pfn_hi)) {
                        iova = container_of(node, struct iova, node);
@@ -402,8 +397,7 @@ reserve_iova(struct iova_domain *iovad,
        iova = __insert_new_range(iovad, pfn_lo, pfn_hi);
 finish:
 
-       spin_unlock(&iovad->iova_rbtree_lock);
-       spin_unlock_irqrestore(&iovad->iova_alloc_lock, flags);
+       spin_unlock_irqrestore(&iovad->iova_rbtree_lock, flags);
        return iova;
 }
 
@@ -420,8 +414,7 @@ copy_reserved_iova(struct iova_domain *from, struct iova_domain *to)
        unsigned long flags;
        struct rb_node *node;
 
-       spin_lock_irqsave(&from->iova_alloc_lock, flags);
-       spin_lock(&from->iova_rbtree_lock);
+       spin_lock_irqsave(&from->iova_rbtree_lock, flags);
        for (node = rb_first(&from->rbroot); node; node = rb_next(node)) {
                struct iova *iova = container_of(node, struct iova, node);
                struct iova *new_iova;
@@ -430,6 +423,5 @@ copy_reserved_iova(struct iova_domain *from, struct iova_domain *to)
                        printk(KERN_ERR "Reserve iova range %lx@%lx failed\n",
                                iova->pfn_lo, iova->pfn_lo);
        }
-       spin_unlock(&from->iova_rbtree_lock);
-       spin_unlock_irqrestore(&from->iova_alloc_lock, flags);
+       spin_unlock_irqrestore(&from->iova_rbtree_lock, flags);
 }
index 7b424e0b0449f948ae632a9ef633f1cfd6c68535..32c44040c1e8bd00734f51e3fd96aa5fcc10bb38 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 57ca085473d511bb9fc125332b4eecdb5bdf138a..7eedb42f800c1f4591c5f4aaa5b7aa6ada01be64 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 737fe5d87c40f10a262bfd6d4830a36baeab850e..b459e87a30acf2938c4b2b01e9df276623c54937 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 77c6097ced80e5db1ba7926e95391e81f74895c0..55ca39dea42e7f4177a3cd9f79f709cfb7dd1a64 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 641b8bfa5538a7ca3ed0ebfc62410552bbd8dfb1..d1c16210a5124a3ea14ce8219db11994b0ce30a6 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 bdfee177eefb95000bf33a1c544a0f37180cfa53..0a8f735f6c4a9fd4f79b79ef1c341a6b247be73b 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 db657bbeec908e456facb8271fa8624fe0f0a515..b39d2bb3e75b897ddfc48e2e8856f118d93aa95e 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 222ffb892f2299852d7e3d77dc109bdd412ca6e5..da3c08b3dcc1d719918e26718986a75817b76203 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 218b9a16ac3f5dc2ab7f6c48481394ce991c82d2..f35aee5c21491ebc763bdff1e5a41a6fdba147dd 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,10 +691,10 @@ 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 PREFIX "%s [%s] (%s)\n",
+       printk(KERN_INFO "ACPI: %s [%s] (%s)\n",
               acpi_device_name(device), acpi_device_bid(device),
               !device->power.state ? "on" : "off");
 
@@ -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,10 +862,10 @@ 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 PREFIX "%s [%s] (%s)\n",
+       printk(KERN_INFO "ACPI: %s [%s] (%s)\n",
               acpi_device_name(device), acpi_device_bid(device),
               !device->power.state ? "on" : "off");
 
@@ -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 af04f5b049db927a2e40d7248fd98abdc772e8e6..c2842171cec6b9942c3e844954842612d5db0d20 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 dafaa4a92df59ffdb7acb16518c1fe6edbfe37a3..f9f68e0e73443b4c7348b31744ae1fe5cb860a7c 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 e85600852502e0a0c6b99b1681ed0213806e8420..f78d27503925bb97fd28b67e9443d247685b16d1 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 f215a59191925f01893c5c65802c0f80b61eee43..177f8d767df40f3a61528a1df582392121181969 100644 (file)
@@ -42,7 +42,6 @@ MODULE_LICENSE("GPL");
 
 #define ACPI_WMI_CLASS "wmi"
 
-#undef PREFIX
 #define PREFIX "ACPI: WMI: "
 
 static DEFINE_MUTEX(wmi_data_lock);
index 527ee764c93f54264cfd7f60e4facf4462cd8c80..cd11b113494fabf7ca2367a2567bbbbc8af71ac7 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 9496494f340e70b4df4e28e034f625a256ec125e..c07fdb94d665d60d23f771449cf2cb77eb906472 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 bdbc4f73fcdced7466406874737a373185aaf167..cea6cef27e893f36f96d168724e6befa5429e085 100644 (file)
@@ -29,6 +29,13 @@ config APM_POWER
          Say Y here to enable support APM status emulation using
          battery class devices.
 
+config WM831X_POWER
+       tristate "WM831X PMU support"
+       depends on MFD_WM831X
+       help
+         Say Y here to enable support for the power management unit
+         provided by Wolfson Microelectronics WM831x PMICs.
+
 config WM8350_POWER
         tristate "WM8350 PMU support"
         depends on MFD_WM8350
index 380d17c9ae2983dc34ab84e68e244eefaf78ca48..b96f29d91c284b3719075d4995f3b5d0f20598fc 100644 (file)
@@ -16,6 +16,7 @@ obj-$(CONFIG_POWER_SUPPLY)    += power_supply.o
 
 obj-$(CONFIG_PDA_POWER)                += pda_power.o
 obj-$(CONFIG_APM_POWER)                += apm_power.o
+obj-$(CONFIG_WM831X_POWER)     += wm831x_power.o
 obj-$(CONFIG_WM8350_POWER)     += wm8350_power.o
 
 obj-$(CONFIG_BATTERY_DS2760)   += ds2760_battery.o
index 520b5c49ff3049275dbeada16c80b93135cf47ea..6f1dba5a519dfa4c458e66a784aafadf8fee2460 100644 (file)
@@ -56,6 +56,7 @@ struct ds2760_device_info {
        struct device *w1_dev;
        struct workqueue_struct *monitor_wqueue;
        struct delayed_work monitor_work;
+       struct delayed_work set_charged_work;
 };
 
 static unsigned int cache_time = 1000;
@@ -66,6 +67,14 @@ static unsigned int pmod_enabled;
 module_param(pmod_enabled, bool, 0644);
 MODULE_PARM_DESC(pmod_enabled, "PMOD enable bit");
 
+static unsigned int rated_capacity;
+module_param(rated_capacity, uint, 0644);
+MODULE_PARM_DESC(rated_capacity, "rated battery capacity, 10*mAh or index");
+
+static unsigned int current_accum;
+module_param(current_accum, uint, 0644);
+MODULE_PARM_DESC(current_accum, "current accumulator value");
+
 /* Some batteries have their rated capacity stored a N * 10 mAh, while
  * others use an index into this table. */
 static int rated_capacities[] = {
@@ -168,8 +177,13 @@ static int ds2760_battery_read_status(struct ds2760_device_info *di)
        di->full_active_uAh = di->raw[DS2760_ACTIVE_FULL] << 8 |
                              di->raw[DS2760_ACTIVE_FULL + 1];
 
-       scale[0] = di->raw[DS2760_ACTIVE_FULL] << 8 |
-                  di->raw[DS2760_ACTIVE_FULL + 1];
+       /* If the full_active_uAh value is not given, fall back to the rated
+        * capacity. This is likely to happen when chips are not part of the
+        * battery pack and is therefore not bootstrapped. */
+       if (di->full_active_uAh == 0)
+               di->full_active_uAh = di->rated_capacity / 1000L;
+
+       scale[0] = di->full_active_uAh;
        for (i = 1; i < 5; i++)
                scale[i] = scale[i - 1] + di->raw[DS2760_ACTIVE_FULL + 2 + i];
 
@@ -197,15 +211,31 @@ static int ds2760_battery_read_status(struct ds2760_device_info *di)
        if (di->rem_capacity > 100)
                di->rem_capacity = 100;
 
-       if (di->current_uA)
-               di->life_sec = -((di->accum_current_uAh - di->empty_uAh) *
-                                3600L) / di->current_uA;
+       if (di->current_uA >= 100L)
+               di->life_sec = -((di->accum_current_uAh - di->empty_uAh) * 36L)
+                                       / (di->current_uA / 100L);
        else
                di->life_sec = 0;
 
        return 0;
 }
 
+static void ds2760_battery_set_current_accum(struct ds2760_device_info *di,
+                                            unsigned int acr_val)
+{
+       unsigned char acr[2];
+
+       /* acr is in units of 0.25 mAh */
+       acr_val *= 4L;
+       acr_val /= 1000;
+
+       acr[0] = acr_val >> 8;
+       acr[1] = acr_val & 0xff;
+
+       if (w1_ds2760_write(di->w1_dev, acr, DS2760_CURRENT_ACCUM_MSB, 2) < 2)
+               dev_warn(di->dev, "ACR write failed\n");
+}
+
 static void ds2760_battery_update_status(struct ds2760_device_info *di)
 {
        int old_charge_status = di->charge_status;
@@ -237,21 +267,9 @@ static void ds2760_battery_update_status(struct ds2760_device_info *di)
                        if (di->full_counter < 2) {
                                di->charge_status = POWER_SUPPLY_STATUS_CHARGING;
                        } else {
-                               unsigned char acr[2];
-                               int acr_val;
-
-                               /* acr is in units of 0.25 mAh */
-                               acr_val = di->full_active_uAh * 4L / 1000;
-
-                               acr[0] = acr_val >> 8;
-                               acr[1] = acr_val & 0xff;
-
-                               if (w1_ds2760_write(di->w1_dev, acr,
-                                   DS2760_CURRENT_ACCUM_MSB, 2) < 2)
-                                       dev_warn(di->dev,
-                                                "ACR reset failed\n");
-
                                di->charge_status = POWER_SUPPLY_STATUS_FULL;
+                               ds2760_battery_set_current_accum(di,
+                                               di->full_active_uAh);
                        }
                }
        } else {
@@ -274,6 +292,17 @@ static void ds2760_battery_write_status(struct ds2760_device_info *di,
        w1_ds2760_recall_eeprom(di->w1_dev, DS2760_EEPROM_BLOCK1);
 }
 
+static void ds2760_battery_write_rated_capacity(struct ds2760_device_info *di,
+                                               unsigned char rated_capacity)
+{
+       if (rated_capacity == di->raw[DS2760_RATED_CAPACITY])
+               return;
+
+       w1_ds2760_write(di->w1_dev, &rated_capacity, DS2760_RATED_CAPACITY, 1);
+       w1_ds2760_store_eeprom(di->w1_dev, DS2760_EEPROM_BLOCK1);
+       w1_ds2760_recall_eeprom(di->w1_dev, DS2760_EEPROM_BLOCK1);
+}
+
 static void ds2760_battery_work(struct work_struct *work)
 {
        struct ds2760_device_info *di = container_of(work,
@@ -299,6 +328,52 @@ static void ds2760_battery_external_power_changed(struct power_supply *psy)
        queue_delayed_work(di->monitor_wqueue, &di->monitor_work, HZ/10);
 }
 
+
+static void ds2760_battery_set_charged_work(struct work_struct *work)
+{
+       char bias;
+       struct ds2760_device_info *di = container_of(work,
+               struct ds2760_device_info, set_charged_work.work);
+
+       dev_dbg(di->dev, "%s\n", __func__);
+
+       ds2760_battery_read_status(di);
+
+       /* When we get notified by external circuitry that the battery is
+        * considered fully charged now, we know that there is no current
+        * flow any more. However, the ds2760's internal current meter is
+        * too inaccurate to rely on - spec say something ~15% failure.
+        * Hence, we use the current offset bias register to compensate
+        * that error.
+        */
+
+       if (!power_supply_am_i_supplied(&di->bat))
+               return;
+
+       bias = (signed char) di->current_raw +
+               (signed char) di->raw[DS2760_CURRENT_OFFSET_BIAS];
+
+       dev_dbg(di->dev, "%s: bias = %d\n", __func__, bias);
+
+       w1_ds2760_write(di->w1_dev, &bias, DS2760_CURRENT_OFFSET_BIAS, 1);
+       w1_ds2760_store_eeprom(di->w1_dev, DS2760_EEPROM_BLOCK1);
+       w1_ds2760_recall_eeprom(di->w1_dev, DS2760_EEPROM_BLOCK1);
+
+       /* Write to the di->raw[] buffer directly - the CURRENT_OFFSET_BIAS
+        * value won't be read back by ds2760_battery_read_status() */
+       di->raw[DS2760_CURRENT_OFFSET_BIAS] = bias;
+}
+
+static void ds2760_battery_set_charged(struct power_supply *psy)
+{
+       struct ds2760_device_info *di = to_ds2760_device_info(psy);
+
+       /* postpone the actual work by 20 secs. This is for debouncing GPIO
+        * signals and to let the current value settle. See AN4188. */
+       cancel_delayed_work(&di->set_charged_work);
+       queue_delayed_work(di->monitor_wqueue, &di->set_charged_work, HZ * 20);
+}
+
 static int ds2760_battery_get_property(struct power_supply *psy,
                                       enum power_supply_property psp,
                                       union power_supply_propval *val)
@@ -337,6 +412,12 @@ static int ds2760_battery_get_property(struct power_supply *psy,
        case POWER_SUPPLY_PROP_TEMP:
                val->intval = di->temp_C;
                break;
+       case POWER_SUPPLY_PROP_TIME_TO_EMPTY_NOW:
+               val->intval = di->life_sec;
+               break;
+       case POWER_SUPPLY_PROP_CAPACITY:
+               val->intval = di->rem_capacity;
+               break;
        default:
                return -EINVAL;
        }
@@ -353,6 +434,8 @@ static enum power_supply_property ds2760_battery_props[] = {
        POWER_SUPPLY_PROP_CHARGE_EMPTY,
        POWER_SUPPLY_PROP_CHARGE_NOW,
        POWER_SUPPLY_PROP_TEMP,
+       POWER_SUPPLY_PROP_TIME_TO_EMPTY_NOW,
+       POWER_SUPPLY_PROP_CAPACITY,
 };
 
 static int ds2760_battery_probe(struct platform_device *pdev)
@@ -376,17 +459,12 @@ static int ds2760_battery_probe(struct platform_device *pdev)
        di->bat.properties      = ds2760_battery_props;
        di->bat.num_properties  = ARRAY_SIZE(ds2760_battery_props);
        di->bat.get_property    = ds2760_battery_get_property;
+       di->bat.set_charged     = ds2760_battery_set_charged;
        di->bat.external_power_changed =
                                  ds2760_battery_external_power_changed;
 
        di->charge_status = POWER_SUPPLY_STATUS_UNKNOWN;
 
-       retval = power_supply_register(&pdev->dev, &di->bat);
-       if (retval) {
-               dev_err(di->dev, "failed to register battery\n");
-               goto batt_failed;
-       }
-
        /* enable sleep mode feature */
        ds2760_battery_read_status(di);
        status = di->raw[DS2760_STATUS_REG];
@@ -397,7 +475,24 @@ static int ds2760_battery_probe(struct platform_device *pdev)
 
        ds2760_battery_write_status(di, status);
 
+       /* set rated capacity from module param */
+       if (rated_capacity)
+               ds2760_battery_write_rated_capacity(di, rated_capacity);
+
+       /* set current accumulator if given as parameter.
+        * this should only be done for bootstrapping the value */
+       if (current_accum)
+               ds2760_battery_set_current_accum(di, current_accum);
+
+       retval = power_supply_register(&pdev->dev, &di->bat);
+       if (retval) {
+               dev_err(di->dev, "failed to register battery\n");
+               goto batt_failed;
+       }
+
        INIT_DELAYED_WORK(&di->monitor_work, ds2760_battery_work);
+       INIT_DELAYED_WORK(&di->set_charged_work,
+                         ds2760_battery_set_charged_work);
        di->monitor_wqueue = create_singlethread_workqueue(dev_name(&pdev->dev));
        if (!di->monitor_wqueue) {
                retval = -ESRCH;
@@ -422,6 +517,8 @@ static int ds2760_battery_remove(struct platform_device *pdev)
 
        cancel_rearming_delayed_workqueue(di->monitor_wqueue,
                                          &di->monitor_work);
+       cancel_rearming_delayed_workqueue(di->monitor_wqueue,
+                                         &di->set_charged_work);
        destroy_workqueue(di->monitor_wqueue);
        power_supply_unregister(&di->bat);
 
index 58e419299cd6cdba020042ac9991556803282617..8fefe5a73558895f5bb0df35b865366ea02e8618 100644 (file)
@@ -10,7 +10,9 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/types.h>
 #include <linux/err.h>
+#include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/power_supply.h>
 #include <linux/jiffies.h>
@@ -231,6 +233,14 @@ static int olpc_bat_get_property(struct power_supply *psy,
                if (ret)
                        return ret;
                break;
+       case POWER_SUPPLY_PROP_CHARGE_TYPE:
+               if (ec_byte & BAT_STAT_TRICKLE)
+                       val->intval = POWER_SUPPLY_CHARGE_TYPE_TRICKLE;
+               else if (ec_byte & BAT_STAT_CHARGING)
+                       val->intval = POWER_SUPPLY_CHARGE_TYPE_FAST;
+               else
+                       val->intval = POWER_SUPPLY_CHARGE_TYPE_NONE;
+               break;
        case POWER_SUPPLY_PROP_PRESENT:
                val->intval = !!(ec_byte & (BAT_STAT_PRESENT |
                                            BAT_STAT_TRICKLE));
@@ -276,6 +286,14 @@ static int olpc_bat_get_property(struct power_supply *psy,
                        return ret;
                val->intval = ec_byte;
                break;
+       case POWER_SUPPLY_PROP_CAPACITY_LEVEL:
+               if (ec_byte & BAT_STAT_FULL)
+                       val->intval = POWER_SUPPLY_CAPACITY_LEVEL_FULL;
+               else if (ec_byte & BAT_STAT_LOW)
+                       val->intval = POWER_SUPPLY_CAPACITY_LEVEL_LOW;
+               else
+                       val->intval = POWER_SUPPLY_CAPACITY_LEVEL_NORMAL;
+               break;
        case POWER_SUPPLY_PROP_TEMP:
                ret = olpc_ec_cmd(EC_BAT_TEMP, NULL, 0, (void *)&ec_word, 2);
                if (ret)
@@ -315,12 +333,14 @@ static int olpc_bat_get_property(struct power_supply *psy,
 
 static enum power_supply_property olpc_bat_props[] = {
        POWER_SUPPLY_PROP_STATUS,
+       POWER_SUPPLY_PROP_CHARGE_TYPE,
        POWER_SUPPLY_PROP_PRESENT,
        POWER_SUPPLY_PROP_HEALTH,
        POWER_SUPPLY_PROP_TECHNOLOGY,
        POWER_SUPPLY_PROP_VOLTAGE_AVG,
        POWER_SUPPLY_PROP_CURRENT_AVG,
        POWER_SUPPLY_PROP_CAPACITY,
+       POWER_SUPPLY_PROP_CAPACITY_LEVEL,
        POWER_SUPPLY_PROP_TEMP,
        POWER_SUPPLY_PROP_TEMP_AMBIENT,
        POWER_SUPPLY_PROP_MANUFACTURER,
@@ -370,6 +390,29 @@ static struct bin_attribute olpc_bat_eeprom = {
        .read = olpc_bat_eeprom_read,
 };
 
+/* Allow userspace to see the specific error value pulled from the EC */
+
+static ssize_t olpc_bat_error_read(struct device *dev,
+               struct device_attribute *attr, char *buf)
+{
+       uint8_t ec_byte;
+       ssize_t ret;
+
+       ret = olpc_ec_cmd(EC_BAT_ERRCODE, NULL, 0, &ec_byte, 1);
+       if (ret < 0)
+               return ret;
+
+       return sprintf(buf, "%d\n", ec_byte);
+}
+
+static struct device_attribute olpc_bat_error = {
+       .attr = {
+               .name = "error",
+               .mode = S_IRUGO,
+       },
+       .show = olpc_bat_error_read,
+};
+
 /*********************************************************************
  *             Initialisation
  *********************************************************************/
@@ -433,8 +476,14 @@ static int __init olpc_bat_init(void)
        if (ret)
                goto eeprom_failed;
 
+       ret = device_create_file(olpc_bat.dev, &olpc_bat_error);
+       if (ret)
+               goto error_failed;
+
        goto success;
 
+error_failed:
+       device_remove_bin_file(olpc_bat.dev, &olpc_bat_eeprom);
 eeprom_failed:
        power_supply_unregister(&olpc_bat);
 battery_failed:
@@ -447,6 +496,7 @@ success:
 
 static void __exit olpc_bat_exit(void)
 {
+       device_remove_file(olpc_bat.dev, &olpc_bat_error);
        device_remove_bin_file(olpc_bat.dev, &olpc_bat_eeprom);
        power_supply_unregister(&olpc_bat);
        power_supply_unregister(&olpc_ac);
index 5520040449c486e2cb6978cacdc0c4715a067974..cce75b40b4351b3c8de85261855f4b970f2a94ac 100644 (file)
@@ -18,7 +18,9 @@
 #include <linux/power_supply.h>
 #include "power_supply.h"
 
+/* exported for the APM Power driver, APM emulation */
 struct class *power_supply_class;
+EXPORT_SYMBOL_GPL(power_supply_class);
 
 static int __power_supply_changed_work(struct device *dev, void *data)
 {
@@ -55,6 +57,7 @@ void power_supply_changed(struct power_supply *psy)
 
        schedule_work(&psy->changed_work);
 }
+EXPORT_SYMBOL_GPL(power_supply_changed);
 
 static int __power_supply_am_i_supplied(struct device *dev, void *data)
 {
@@ -86,6 +89,7 @@ int power_supply_am_i_supplied(struct power_supply *psy)
 
        return error;
 }
+EXPORT_SYMBOL_GPL(power_supply_am_i_supplied);
 
 static int __power_supply_is_system_supplied(struct device *dev, void *data)
 {
@@ -110,6 +114,35 @@ int power_supply_is_system_supplied(void)
 
        return error;
 }
+EXPORT_SYMBOL_GPL(power_supply_is_system_supplied);
+
+int power_supply_set_battery_charged(struct power_supply *psy)
+{
+       if (psy->type == POWER_SUPPLY_TYPE_BATTERY && psy->set_charged) {
+               psy->set_charged(psy);
+               return 0;
+       }
+
+       return -EINVAL;
+}
+EXPORT_SYMBOL_GPL(power_supply_set_battery_charged);
+
+static int power_supply_match_device_by_name(struct device *dev, void *data)
+{
+       const char *name = data;
+       struct power_supply *psy = dev_get_drvdata(dev);
+
+       return strcmp(psy->name, name) == 0;
+}
+
+struct power_supply *power_supply_get_by_name(char *name)
+{
+       struct device *dev = class_find_device(power_supply_class, NULL, name,
+                                       power_supply_match_device_by_name);
+
+       return dev ? dev_get_drvdata(dev) : NULL;
+}
+EXPORT_SYMBOL_GPL(power_supply_get_by_name);
 
 int power_supply_register(struct device *parent, struct power_supply *psy)
 {
@@ -144,6 +177,7 @@ dev_create_failed:
 success:
        return rc;
 }
+EXPORT_SYMBOL_GPL(power_supply_register);
 
 void power_supply_unregister(struct power_supply *psy)
 {
@@ -152,6 +186,7 @@ void power_supply_unregister(struct power_supply *psy)
        power_supply_remove_attrs(psy);
        device_unregister(psy->dev);
 }
+EXPORT_SYMBOL_GPL(power_supply_unregister);
 
 static int __init power_supply_class_init(void)
 {
@@ -170,15 +205,6 @@ static void __exit power_supply_class_exit(void)
        class_destroy(power_supply_class);
 }
 
-EXPORT_SYMBOL_GPL(power_supply_changed);
-EXPORT_SYMBOL_GPL(power_supply_am_i_supplied);
-EXPORT_SYMBOL_GPL(power_supply_is_system_supplied);
-EXPORT_SYMBOL_GPL(power_supply_register);
-EXPORT_SYMBOL_GPL(power_supply_unregister);
-
-/* exported for the APM Power driver, APM emulation */
-EXPORT_SYMBOL_GPL(power_supply_class);
-
 subsys_initcall(power_supply_class_init);
 module_exit(power_supply_class_exit);
 
index da73591017f903126f4cf59372938e91db9ea7ce..08144393d64b72e7b2a54d44929a6d47cbf18036 100644 (file)
@@ -43,6 +43,9 @@ static ssize_t power_supply_show_property(struct device *dev,
        static char *status_text[] = {
                "Unknown", "Charging", "Discharging", "Not charging", "Full"
        };
+       static char *charge_type[] = {
+               "Unknown", "N/A", "Trickle", "Fast"
+       };
        static char *health_text[] = {
                "Unknown", "Good", "Overheat", "Dead", "Over voltage",
                "Unspecified failure", "Cold",
@@ -51,6 +54,9 @@ static ssize_t power_supply_show_property(struct device *dev,
                "Unknown", "NiMH", "Li-ion", "Li-poly", "LiFe", "NiCd",
                "LiMn"
        };
+       static char *capacity_level_text[] = {
+               "Unknown", "Critical", "Low", "Normal", "High", "Full"
+       };
        ssize_t ret;
        struct power_supply *psy = dev_get_drvdata(dev);
        const ptrdiff_t off = attr - power_supply_attrs;
@@ -67,10 +73,14 @@ static ssize_t power_supply_show_property(struct device *dev,
 
        if (off == POWER_SUPPLY_PROP_STATUS)
                return sprintf(buf, "%s\n", status_text[value.intval]);
+       else if (off == POWER_SUPPLY_PROP_CHARGE_TYPE)
+               return sprintf(buf, "%s\n", charge_type[value.intval]);
        else if (off == POWER_SUPPLY_PROP_HEALTH)
                return sprintf(buf, "%s\n", health_text[value.intval]);
        else if (off == POWER_SUPPLY_PROP_TECHNOLOGY)
                return sprintf(buf, "%s\n", technology_text[value.intval]);
+       else if (off == POWER_SUPPLY_PROP_CAPACITY_LEVEL)
+               return sprintf(buf, "%s\n", capacity_level_text[value.intval]);
        else if (off >= POWER_SUPPLY_PROP_MODEL_NAME)
                return sprintf(buf, "%s\n", value.strval);
 
@@ -81,6 +91,7 @@ static ssize_t power_supply_show_property(struct device *dev,
 static struct device_attribute power_supply_attrs[] = {
        /* Properties of type `int' */
        POWER_SUPPLY_ATTR(status),
+       POWER_SUPPLY_ATTR(charge_type),
        POWER_SUPPLY_ATTR(health),
        POWER_SUPPLY_ATTR(present),
        POWER_SUPPLY_ATTR(online),
@@ -109,6 +120,7 @@ static struct device_attribute power_supply_attrs[] = {
        POWER_SUPPLY_ATTR(energy_now),
        POWER_SUPPLY_ATTR(energy_avg),
        POWER_SUPPLY_ATTR(capacity),
+       POWER_SUPPLY_ATTR(capacity_level),
        POWER_SUPPLY_ATTR(temp),
        POWER_SUPPLY_ATTR(temp_ambient),
        POWER_SUPPLY_ATTR(time_to_empty_now),
diff --git a/drivers/power/wm831x_power.c b/drivers/power/wm831x_power.c
new file mode 100644 (file)
index 0000000..2a4c8b0
--- /dev/null
@@ -0,0 +1,779 @@
+/*
+ * PMU driver for Wolfson Microelectronics wm831x PMICs
+ *
+ * Copyright 2009 Wolfson Microelectronics PLC.
+ *
+ * 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/err.h>
+#include <linux/platform_device.h>
+#include <linux/power_supply.h>
+
+#include <linux/mfd/wm831x/core.h>
+#include <linux/mfd/wm831x/auxadc.h>
+#include <linux/mfd/wm831x/pmu.h>
+#include <linux/mfd/wm831x/pdata.h>
+
+struct wm831x_power {
+       struct wm831x *wm831x;
+       struct power_supply wall;
+       struct power_supply backup;
+       struct power_supply usb;
+       struct power_supply battery;
+};
+
+static int wm831x_power_check_online(struct wm831x *wm831x, int supply,
+                                    union power_supply_propval *val)
+{
+       int ret;
+
+       ret = wm831x_reg_read(wm831x, WM831X_SYSTEM_STATUS);
+       if (ret < 0)
+               return ret;
+
+       if (ret & supply)
+               val->intval = 1;
+       else
+               val->intval = 0;
+
+       return 0;
+}
+
+static int wm831x_power_read_voltage(struct wm831x *wm831x,
+                                    enum wm831x_auxadc src,
+                                    union power_supply_propval *val)
+{
+       int ret;
+
+       ret = wm831x_auxadc_read_uv(wm831x, src);
+       if (ret >= 0)
+               val->intval = ret;
+
+       return ret;
+}
+
+/*********************************************************************
+ *             WALL Power
+ *********************************************************************/
+static int wm831x_wall_get_prop(struct power_supply *psy,
+                               enum power_supply_property psp,
+                               union power_supply_propval *val)
+{
+       struct wm831x_power *wm831x_power = dev_get_drvdata(psy->dev->parent);
+       struct wm831x *wm831x = wm831x_power->wm831x;
+       int ret = 0;
+
+       switch (psp) {
+       case POWER_SUPPLY_PROP_ONLINE:
+               ret = wm831x_power_check_online(wm831x, WM831X_PWR_WALL, val);
+               break;
+       case POWER_SUPPLY_PROP_VOLTAGE_NOW:
+               ret = wm831x_power_read_voltage(wm831x, WM831X_AUX_WALL, val);
+               break;
+       default:
+               ret = -EINVAL;
+               break;
+       }
+
+       return ret;
+}
+
+static enum power_supply_property wm831x_wall_props[] = {
+       POWER_SUPPLY_PROP_ONLINE,
+       POWER_SUPPLY_PROP_VOLTAGE_NOW,
+};
+
+/*********************************************************************
+ *             USB Power
+ *********************************************************************/
+static int wm831x_usb_get_prop(struct power_supply *psy,
+                              enum power_supply_property psp,
+                              union power_supply_propval *val)
+{
+       struct wm831x_power *wm831x_power = dev_get_drvdata(psy->dev->parent);
+       struct wm831x *wm831x = wm831x_power->wm831x;
+       int ret = 0;
+
+       switch (psp) {
+       case POWER_SUPPLY_PROP_ONLINE:
+               ret = wm831x_power_check_online(wm831x, WM831X_PWR_USB, val);
+               break;
+       case POWER_SUPPLY_PROP_VOLTAGE_NOW:
+               ret = wm831x_power_read_voltage(wm831x, WM831X_AUX_USB, val);
+               break;
+       default:
+               ret = -EINVAL;
+               break;
+       }
+
+       return ret;
+}
+
+static enum power_supply_property wm831x_usb_props[] = {
+       POWER_SUPPLY_PROP_ONLINE,
+       POWER_SUPPLY_PROP_VOLTAGE_NOW,
+};
+
+/*********************************************************************
+ *             Battery properties
+ *********************************************************************/
+
+struct chg_map {
+       int val;
+       int reg_val;
+};
+
+static struct chg_map trickle_ilims[] = {
+       {  50, 0 << WM831X_CHG_TRKL_ILIM_SHIFT },
+       { 100, 1 << WM831X_CHG_TRKL_ILIM_SHIFT },
+       { 150, 2 << WM831X_CHG_TRKL_ILIM_SHIFT },
+       { 200, 3 << WM831X_CHG_TRKL_ILIM_SHIFT },
+};
+
+static struct chg_map vsels[] = {
+       { 4050, 0 << WM831X_CHG_VSEL_SHIFT },
+       { 4100, 1 << WM831X_CHG_VSEL_SHIFT },
+       { 4150, 2 << WM831X_CHG_VSEL_SHIFT },
+       { 4200, 3 << WM831X_CHG_VSEL_SHIFT },
+};
+
+static struct chg_map fast_ilims[] = {
+       {    0,  0 << WM831X_CHG_FAST_ILIM_SHIFT },
+       {   50,  1 << WM831X_CHG_FAST_ILIM_SHIFT },
+       {  100,  2 << WM831X_CHG_FAST_ILIM_SHIFT },
+       {  150,  3 << WM831X_CHG_FAST_ILIM_SHIFT },
+       {  200,  4 << WM831X_CHG_FAST_ILIM_SHIFT },
+       {  250,  5 << WM831X_CHG_FAST_ILIM_SHIFT },
+       {  300,  6 << WM831X_CHG_FAST_ILIM_SHIFT },
+       {  350,  7 << WM831X_CHG_FAST_ILIM_SHIFT },
+       {  400,  8 << WM831X_CHG_FAST_ILIM_SHIFT },
+       {  450,  9 << WM831X_CHG_FAST_ILIM_SHIFT },
+       {  500, 10 << WM831X_CHG_FAST_ILIM_SHIFT },
+       {  600, 11 << WM831X_CHG_FAST_ILIM_SHIFT },
+       {  700, 12 << WM831X_CHG_FAST_ILIM_SHIFT },
+       {  800, 13 << WM831X_CHG_FAST_ILIM_SHIFT },
+       {  900, 14 << WM831X_CHG_FAST_ILIM_SHIFT },
+       { 1000, 15 << WM831X_CHG_FAST_ILIM_SHIFT },
+};
+
+static struct chg_map eoc_iterms[] = {
+       { 20, 0 << WM831X_CHG_ITERM_SHIFT },
+       { 30, 1 << WM831X_CHG_ITERM_SHIFT },
+       { 40, 2 << WM831X_CHG_ITERM_SHIFT },
+       { 50, 3 << WM831X_CHG_ITERM_SHIFT },
+       { 60, 4 << WM831X_CHG_ITERM_SHIFT },
+       { 70, 5 << WM831X_CHG_ITERM_SHIFT },
+       { 80, 6 << WM831X_CHG_ITERM_SHIFT },
+       { 90, 7 << WM831X_CHG_ITERM_SHIFT },
+};
+
+static struct chg_map chg_times[] = {
+       {  60,  0 << WM831X_CHG_TIME_SHIFT },
+       {  90,  1 << WM831X_CHG_TIME_SHIFT },
+       { 120,  2 << WM831X_CHG_TIME_SHIFT },
+       { 150,  3 << WM831X_CHG_TIME_SHIFT },
+       { 180,  4 << WM831X_CHG_TIME_SHIFT },
+       { 210,  5 << WM831X_CHG_TIME_SHIFT },
+       { 240,  6 << WM831X_CHG_TIME_SHIFT },
+       { 270,  7 << WM831X_CHG_TIME_SHIFT },
+       { 300,  8 << WM831X_CHG_TIME_SHIFT },
+       { 330,  9 << WM831X_CHG_TIME_SHIFT },
+       { 360, 10 << WM831X_CHG_TIME_SHIFT },
+       { 390, 11 << WM831X_CHG_TIME_SHIFT },
+       { 420, 12 << WM831X_CHG_TIME_SHIFT },
+       { 450, 13 << WM831X_CHG_TIME_SHIFT },
+       { 480, 14 << WM831X_CHG_TIME_SHIFT },
+       { 510, 15 << WM831X_CHG_TIME_SHIFT },
+};
+
+static void wm831x_battey_apply_config(struct wm831x *wm831x,
+                                      struct chg_map *map, int count, int val,
+                                      int *reg, const char *name,
+                                      const char *units)
+{
+       int i;
+
+       for (i = 0; i < count; i++)
+               if (val == map[i].val)
+                       break;
+       if (i == count) {
+               dev_err(wm831x->dev, "Invalid %s %d%s\n",
+                       name, val, units);
+       } else {
+               *reg |= map[i].reg_val;
+               dev_dbg(wm831x->dev, "Set %s of %d%s\n", name, val, units);
+       }
+}
+
+static void wm831x_config_battery(struct wm831x *wm831x)
+{
+       struct wm831x_pdata *wm831x_pdata = wm831x->dev->platform_data;
+       struct wm831x_battery_pdata *pdata;
+       int ret, reg1, reg2;
+
+       if (!wm831x_pdata || !wm831x_pdata->battery) {
+               dev_warn(wm831x->dev,
+                        "No battery charger configuration\n");
+               return;
+       }
+
+       pdata = wm831x_pdata->battery;
+
+       reg1 = 0;
+       reg2 = 0;
+
+       if (!pdata->enable) {
+               dev_info(wm831x->dev, "Battery charger disabled\n");
+               return;
+       }
+
+       reg1 |= WM831X_CHG_ENA;
+       if (pdata->off_mask)
+               reg2 |= WM831X_CHG_OFF_MSK;
+       if (pdata->fast_enable)
+               reg1 |= WM831X_CHG_FAST;
+
+       wm831x_battey_apply_config(wm831x, trickle_ilims,
+                                  ARRAY_SIZE(trickle_ilims),
+                                  pdata->trickle_ilim, &reg2,
+                                  "trickle charge current limit", "mA");
+
+       wm831x_battey_apply_config(wm831x, vsels, ARRAY_SIZE(vsels),
+                                  pdata->vsel, &reg2,
+                                  "target voltage", "mV");
+
+       wm831x_battey_apply_config(wm831x, fast_ilims, ARRAY_SIZE(fast_ilims),
+                                  pdata->fast_ilim, &reg2,
+                                  "fast charge current limit", "mA");
+
+       wm831x_battey_apply_config(wm831x, eoc_iterms, ARRAY_SIZE(eoc_iterms),
+                                  pdata->eoc_iterm, &reg1,
+                                  "end of charge current threshold", "mA");
+
+       wm831x_battey_apply_config(wm831x, chg_times, ARRAY_SIZE(chg_times),
+                                  pdata->timeout, &reg2,
+                                  "charger timeout", "min");
+
+       ret = wm831x_reg_unlock(wm831x);
+       if (ret != 0) {
+               dev_err(wm831x->dev, "Failed to unlock registers: %d\n", ret);
+               return;
+       }
+
+       ret = wm831x_set_bits(wm831x, WM831X_CHARGER_CONTROL_1,
+                             WM831X_CHG_ENA_MASK |
+                             WM831X_CHG_FAST_MASK |
+                             WM831X_CHG_ITERM_MASK |
+                             WM831X_CHG_ITERM_MASK,
+                             reg1);
+       if (ret != 0)
+               dev_err(wm831x->dev, "Failed to set charger control 1: %d\n",
+                       ret);
+
+       ret = wm831x_set_bits(wm831x, WM831X_CHARGER_CONTROL_2,
+                             WM831X_CHG_OFF_MSK |
+                             WM831X_CHG_TIME_MASK |
+                             WM831X_CHG_FAST_ILIM_MASK |
+                             WM831X_CHG_TRKL_ILIM_MASK |
+                             WM831X_CHG_VSEL_MASK,
+                             reg2);
+       if (ret != 0)
+               dev_err(wm831x->dev, "Failed to set charger control 2: %d\n",
+                       ret);
+
+       wm831x_reg_lock(wm831x);
+}
+
+static int wm831x_bat_check_status(struct wm831x *wm831x, int *status)
+{
+       int ret;
+
+       ret = wm831x_reg_read(wm831x, WM831X_SYSTEM_STATUS);
+       if (ret < 0)
+               return ret;
+
+       if (ret & WM831X_PWR_SRC_BATT) {
+               *status = POWER_SUPPLY_STATUS_DISCHARGING;
+               return 0;
+       }
+
+       ret = wm831x_reg_read(wm831x, WM831X_CHARGER_STATUS);
+       if (ret < 0)
+               return ret;
+
+       switch (ret & WM831X_CHG_STATE_MASK) {
+       case WM831X_CHG_STATE_OFF:
+               *status = POWER_SUPPLY_STATUS_NOT_CHARGING;
+               break;
+       case WM831X_CHG_STATE_TRICKLE:
+       case WM831X_CHG_STATE_FAST:
+               *status = POWER_SUPPLY_STATUS_CHARGING;
+               break;
+
+       default:
+               *status = POWER_SUPPLY_STATUS_UNKNOWN;
+               break;
+       }
+
+       return 0;
+}
+
+static int wm831x_bat_check_type(struct wm831x *wm831x, int *type)
+{
+       int ret;
+
+       ret = wm831x_reg_read(wm831x, WM831X_CHARGER_STATUS);
+       if (ret < 0)
+               return ret;
+
+       switch (ret & WM831X_CHG_STATE_MASK) {
+       case WM831X_CHG_STATE_TRICKLE:
+       case WM831X_CHG_STATE_TRICKLE_OT:
+               *type = POWER_SUPPLY_CHARGE_TYPE_TRICKLE;
+               break;
+       case WM831X_CHG_STATE_FAST:
+       case WM831X_CHG_STATE_FAST_OT:
+               *type = POWER_SUPPLY_CHARGE_TYPE_FAST;
+               break;
+       default:
+               *type = POWER_SUPPLY_CHARGE_TYPE_NONE;
+               break;
+       }
+
+       return 0;
+}
+
+static int wm831x_bat_check_health(struct wm831x *wm831x, int *health)
+{
+       int ret;
+
+       ret = wm831x_reg_read(wm831x, WM831X_CHARGER_STATUS);
+       if (ret < 0)
+               return ret;
+
+       if (ret & WM831X_BATT_HOT_STS) {
+               *health = POWER_SUPPLY_HEALTH_OVERHEAT;
+               return 0;
+       }
+
+       if (ret & WM831X_BATT_COLD_STS) {
+               *health = POWER_SUPPLY_HEALTH_COLD;
+               return 0;
+       }
+
+       if (ret & WM831X_BATT_OV_STS) {
+               *health = POWER_SUPPLY_HEALTH_OVERVOLTAGE;
+               return 0;
+       }
+
+       switch (ret & WM831X_CHG_STATE_MASK) {
+       case WM831X_CHG_STATE_TRICKLE_OT:
+       case WM831X_CHG_STATE_FAST_OT:
+               *health = POWER_SUPPLY_HEALTH_OVERHEAT;
+               break;
+       case WM831X_CHG_STATE_DEFECTIVE:
+               *health = POWER_SUPPLY_HEALTH_UNSPEC_FAILURE;
+               break;
+       default:
+               *health = POWER_SUPPLY_HEALTH_GOOD;
+               break;
+       }
+
+       return 0;
+}
+
+static int wm831x_bat_get_prop(struct power_supply *psy,
+                              enum power_supply_property psp,
+                              union power_supply_propval *val)
+{
+       struct wm831x_power *wm831x_power = dev_get_drvdata(psy->dev->parent);
+       struct wm831x *wm831x = wm831x_power->wm831x;
+       int ret = 0;
+
+       switch (psp) {
+       case POWER_SUPPLY_PROP_STATUS:
+               ret = wm831x_bat_check_status(wm831x, &val->intval);
+               break;
+       case POWER_SUPPLY_PROP_ONLINE:
+               ret = wm831x_power_check_online(wm831x, WM831X_PWR_SRC_BATT,
+                                               val);
+               break;
+       case POWER_SUPPLY_PROP_VOLTAGE_NOW:
+               ret = wm831x_power_read_voltage(wm831x, WM831X_AUX_BATT, val);
+               break;
+       case POWER_SUPPLY_PROP_HEALTH:
+               ret = wm831x_bat_check_health(wm831x, &val->intval);
+               break;
+       case POWER_SUPPLY_PROP_CHARGE_TYPE:
+               ret = wm831x_bat_check_type(wm831x, &val->intval);
+               break;
+       default:
+               ret = -EINVAL;
+               break;
+       }
+
+       return ret;
+}
+
+static enum power_supply_property wm831x_bat_props[] = {
+       POWER_SUPPLY_PROP_STATUS,
+       POWER_SUPPLY_PROP_ONLINE,
+       POWER_SUPPLY_PROP_VOLTAGE_NOW,
+       POWER_SUPPLY_PROP_HEALTH,
+       POWER_SUPPLY_PROP_CHARGE_TYPE,
+};
+
+static const char *wm831x_bat_irqs[] = {
+       "BATT HOT",
+       "BATT COLD",
+       "BATT FAIL",
+       "OV",
+       "END",
+       "TO",
+       "MODE",
+       "START",
+};
+
+static irqreturn_t wm831x_bat_irq(int irq, void *data)
+{
+       struct wm831x_power *wm831x_power = data;
+       struct wm831x *wm831x = wm831x_power->wm831x;
+
+       dev_dbg(wm831x->dev, "Battery status changed: %d\n", irq);
+
+       /* The battery charger is autonomous so we don't need to do
+        * anything except kick user space */
+       power_supply_changed(&wm831x_power->battery);
+
+       return IRQ_HANDLED;
+}
+
+
+/*********************************************************************
+ *             Backup supply properties
+ *********************************************************************/
+
+static void wm831x_config_backup(struct wm831x *wm831x)
+{
+       struct wm831x_pdata *wm831x_pdata = wm831x->dev->platform_data;
+       struct wm831x_backup_pdata *pdata;
+       int ret, reg;
+
+       if (!wm831x_pdata || !wm831x_pdata->backup) {
+               dev_warn(wm831x->dev,
+                        "No backup battery charger configuration\n");
+               return;
+       }
+
+       pdata = wm831x_pdata->backup;
+
+       reg = 0;
+
+       if (pdata->charger_enable)
+               reg |= WM831X_BKUP_CHG_ENA | WM831X_BKUP_BATT_DET_ENA;
+       if (pdata->no_constant_voltage)
+               reg |= WM831X_BKUP_CHG_MODE;
+
+       switch (pdata->vlim) {
+       case 2500:
+               break;
+       case 3100:
+               reg |= WM831X_BKUP_CHG_VLIM;
+               break;
+       default:
+               dev_err(wm831x->dev, "Invalid backup voltage limit %dmV\n",
+                       pdata->vlim);
+       }
+
+       switch (pdata->ilim) {
+       case 100:
+               break;
+       case 200:
+               reg |= 1;
+               break;
+       case 300:
+               reg |= 2;
+               break;
+       case 400:
+               reg |= 3;
+               break;
+       default:
+               dev_err(wm831x->dev, "Invalid backup current limit %duA\n",
+                       pdata->ilim);
+       }
+
+       ret = wm831x_reg_unlock(wm831x);
+       if (ret != 0) {
+               dev_err(wm831x->dev, "Failed to unlock registers: %d\n", ret);
+               return;
+       }
+
+       ret = wm831x_set_bits(wm831x, WM831X_BACKUP_CHARGER_CONTROL,
+                             WM831X_BKUP_CHG_ENA_MASK |
+                             WM831X_BKUP_CHG_MODE_MASK |
+                             WM831X_BKUP_BATT_DET_ENA_MASK |
+                             WM831X_BKUP_CHG_VLIM_MASK |
+                             WM831X_BKUP_CHG_ILIM_MASK,
+                             reg);
+       if (ret != 0)
+               dev_err(wm831x->dev,
+                       "Failed to set backup charger config: %d\n", ret);
+
+       wm831x_reg_lock(wm831x);
+}
+
+static int wm831x_backup_get_prop(struct power_supply *psy,
+                                 enum power_supply_property psp,
+                                 union power_supply_propval *val)
+{
+       struct wm831x_power *wm831x_power = dev_get_drvdata(psy->dev->parent);
+       struct wm831x *wm831x = wm831x_power->wm831x;
+       int ret = 0;
+
+       ret = wm831x_reg_read(wm831x, WM831X_BACKUP_CHARGER_CONTROL);
+       if (ret < 0)
+               return ret;
+
+       switch (psp) {
+       case POWER_SUPPLY_PROP_STATUS:
+               if (ret & WM831X_BKUP_CHG_STS)
+                       val->intval = POWER_SUPPLY_STATUS_CHARGING;
+               else
+                       val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
+               break;
+
+       case POWER_SUPPLY_PROP_VOLTAGE_NOW:
+               ret = wm831x_power_read_voltage(wm831x, WM831X_AUX_BKUP_BATT,
+                                               val);
+               break;
+
+       case POWER_SUPPLY_PROP_PRESENT:
+               if (ret & WM831X_BKUP_CHG_STS)
+                       val->intval = 1;
+               else
+                       val->intval = 0;
+               break;
+
+       default:
+               ret = -EINVAL;
+               break;
+       }
+
+       return ret;
+}
+
+static enum power_supply_property wm831x_backup_props[] = {
+       POWER_SUPPLY_PROP_STATUS,
+       POWER_SUPPLY_PROP_VOLTAGE_NOW,
+       POWER_SUPPLY_PROP_PRESENT,
+};
+
+/*********************************************************************
+ *             Initialisation
+ *********************************************************************/
+
+static irqreturn_t wm831x_syslo_irq(int irq, void *data)
+{
+       struct wm831x_power *wm831x_power = data;
+       struct wm831x *wm831x = wm831x_power->wm831x;
+
+       /* Not much we can actually *do* but tell people for
+        * posterity, we're probably about to run out of power. */
+       dev_crit(wm831x->dev, "SYSVDD under voltage\n");
+
+       return IRQ_HANDLED;
+}
+
+static irqreturn_t wm831x_pwr_src_irq(int irq, void *data)
+{
+       struct wm831x_power *wm831x_power = data;
+       struct wm831x *wm831x = wm831x_power->wm831x;
+
+       dev_dbg(wm831x->dev, "Power source changed\n");
+
+       /* Just notify for everything - little harm in overnotifying.
+        * The backup battery is not a power source while the system
+        * is running so skip that.
+        */
+       power_supply_changed(&wm831x_power->battery);
+       power_supply_changed(&wm831x_power->usb);
+       power_supply_changed(&wm831x_power->wall);
+
+       return IRQ_HANDLED;
+}
+
+static __devinit int wm831x_power_probe(struct platform_device *pdev)
+{
+       struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
+       struct wm831x_power *power;
+       struct power_supply *usb;
+       struct power_supply *battery;
+       struct power_supply *wall;
+       struct power_supply *backup;
+       int ret, irq, i;
+
+       power = kzalloc(sizeof(struct wm831x_power), GFP_KERNEL);
+       if (power == NULL)
+               return -ENOMEM;
+
+       power->wm831x = wm831x;
+       platform_set_drvdata(pdev, power);
+
+       usb = &power->usb;
+       battery = &power->battery;
+       wall = &power->wall;
+       backup = &power->backup;
+
+       /* We ignore configuration failures since we can still read back
+        * the status without enabling either of the chargers.
+        */
+       wm831x_config_battery(wm831x);
+       wm831x_config_backup(wm831x);
+
+       wall->name = "wm831x-wall";
+       wall->type = POWER_SUPPLY_TYPE_MAINS;
+       wall->properties = wm831x_wall_props;
+       wall->num_properties = ARRAY_SIZE(wm831x_wall_props);
+       wall->get_property = wm831x_wall_get_prop;
+       ret = power_supply_register(&pdev->dev, wall);
+       if (ret)
+               goto err_kmalloc;
+
+       battery->name = "wm831x-battery";
+       battery->properties = wm831x_bat_props;
+       battery->num_properties = ARRAY_SIZE(wm831x_bat_props);
+       battery->get_property = wm831x_bat_get_prop;
+       battery->use_for_apm = 1;
+       ret = power_supply_register(&pdev->dev, battery);
+       if (ret)
+               goto err_wall;
+
+       usb->name = "wm831x-usb",
+       usb->type = POWER_SUPPLY_TYPE_USB;
+       usb->properties = wm831x_usb_props;
+       usb->num_properties = ARRAY_SIZE(wm831x_usb_props);
+       usb->get_property = wm831x_usb_get_prop;
+       ret = power_supply_register(&pdev->dev, usb);
+       if (ret)
+               goto err_battery;
+
+       backup->name = "wm831x-backup";
+       backup->type = POWER_SUPPLY_TYPE_BATTERY;
+       backup->properties = wm831x_backup_props;
+       backup->num_properties = ARRAY_SIZE(wm831x_backup_props);
+       backup->get_property = wm831x_backup_get_prop;
+       ret = power_supply_register(&pdev->dev, backup);
+       if (ret)
+               goto err_usb;
+
+       irq = platform_get_irq_byname(pdev, "SYSLO");
+       ret = wm831x_request_irq(wm831x, irq, wm831x_syslo_irq,
+                                IRQF_TRIGGER_RISING, "SYSLO",
+                                power);
+       if (ret != 0) {
+               dev_err(&pdev->dev, "Failed to request SYSLO IRQ %d: %d\n",
+                       irq, ret);
+               goto err_backup;
+       }
+
+       irq = platform_get_irq_byname(pdev, "PWR SRC");
+       ret = wm831x_request_irq(wm831x, irq, wm831x_pwr_src_irq,
+                                IRQF_TRIGGER_RISING, "Power source",
+                                power);
+       if (ret != 0) {
+               dev_err(&pdev->dev, "Failed to request PWR SRC IRQ %d: %d\n",
+                       irq, ret);
+               goto err_syslo;
+       }
+
+       for (i = 0; i < ARRAY_SIZE(wm831x_bat_irqs); i++) {
+               irq = platform_get_irq_byname(pdev, wm831x_bat_irqs[i]);
+               ret = wm831x_request_irq(wm831x, irq, wm831x_bat_irq,
+                                        IRQF_TRIGGER_RISING,
+                                        wm831x_bat_irqs[i],
+                                        power);
+               if (ret != 0) {
+                       dev_err(&pdev->dev,
+                               "Failed to request %s IRQ %d: %d\n",
+                               wm831x_bat_irqs[i], irq, ret);
+                       goto err_bat_irq;
+               }
+       }
+
+       return ret;
+
+err_bat_irq:
+       for (; i >= 0; i--) {
+               irq = platform_get_irq_byname(pdev, wm831x_bat_irqs[i]);
+               wm831x_free_irq(wm831x, irq, power);
+       }
+       irq = platform_get_irq_byname(pdev, "PWR SRC");
+       wm831x_free_irq(wm831x, irq, power);
+err_syslo:
+       irq = platform_get_irq_byname(pdev, "SYSLO");
+       wm831x_free_irq(wm831x, irq, power);
+err_backup:
+       power_supply_unregister(backup);
+err_usb:
+       power_supply_unregister(usb);
+err_battery:
+       power_supply_unregister(battery);
+err_wall:
+       power_supply_unregister(wall);
+err_kmalloc:
+       kfree(power);
+       return ret;
+}
+
+static __devexit int wm831x_power_remove(struct platform_device *pdev)
+{
+       struct wm831x_power *wm831x_power = platform_get_drvdata(pdev);
+       struct wm831x *wm831x = wm831x_power->wm831x;
+       int irq, i;
+
+       for (i = 0; i < ARRAY_SIZE(wm831x_bat_irqs); i++) {
+               irq = platform_get_irq_byname(pdev, wm831x_bat_irqs[i]);
+               wm831x_free_irq(wm831x, irq, wm831x_power);
+       }
+
+       irq = platform_get_irq_byname(pdev, "PWR SRC");
+       wm831x_free_irq(wm831x, irq, wm831x_power);
+
+       irq = platform_get_irq_byname(pdev, "SYSLO");
+       wm831x_free_irq(wm831x, irq, wm831x_power);
+
+       power_supply_unregister(&wm831x_power->backup);
+       power_supply_unregister(&wm831x_power->battery);
+       power_supply_unregister(&wm831x_power->wall);
+       power_supply_unregister(&wm831x_power->usb);
+       return 0;
+}
+
+static struct platform_driver wm831x_power_driver = {
+       .probe = wm831x_power_probe,
+       .remove = __devexit_p(wm831x_power_remove),
+       .driver = {
+               .name = "wm831x-power",
+       },
+};
+
+static int __init wm831x_power_init(void)
+{
+       return platform_driver_register(&wm831x_power_driver);
+}
+module_init(wm831x_power_init);
+
+static void __exit wm831x_power_exit(void)
+{
+       platform_driver_unregister(&wm831x_power_driver);
+}
+module_exit(wm831x_power_exit);
+
+MODULE_DESCRIPTION("Power supply driver for WM831x PMICs");
+MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:wm831x-power");
index 1b16bf343f2fc8d3d1a4b1cfcc5675db19f057b4..28b0299c0043694cf19bed7d3bc97b8289db2873 100644 (file)
@@ -321,6 +321,24 @@ static int wm8350_bat_check_health(struct wm8350 *wm8350)
        return POWER_SUPPLY_HEALTH_GOOD;
 }
 
+static int wm8350_bat_get_charge_type(struct wm8350 *wm8350)
+{
+       int state;
+
+       state = wm8350_reg_read(wm8350, WM8350_BATTERY_CHARGER_CONTROL_2) &
+           WM8350_CHG_STS_MASK;
+       switch (state) {
+       case WM8350_CHG_STS_OFF:
+               return POWER_SUPPLY_CHARGE_TYPE_NONE;
+       case WM8350_CHG_STS_TRICKLE:
+               return POWER_SUPPLY_CHARGE_TYPE_TRICKLE;
+       case WM8350_CHG_STS_FAST:
+               return POWER_SUPPLY_CHARGE_TYPE_FAST;
+       default:
+               return POWER_SUPPLY_CHARGE_TYPE_UNKNOWN;
+       }
+}
+
 static int wm8350_bat_get_property(struct power_supply *psy,
                                   enum power_supply_property psp,
                                   union power_supply_propval *val)
@@ -342,6 +360,9 @@ static int wm8350_bat_get_property(struct power_supply *psy,
        case POWER_SUPPLY_PROP_HEALTH:
                val->intval = wm8350_bat_check_health(wm8350);
                break;
+       case POWER_SUPPLY_PROP_CHARGE_TYPE:
+               val->intval = wm8350_bat_get_charge_type(wm8350);
+               break;
        default:
                ret = -EINVAL;
                break;
@@ -355,6 +376,7 @@ static enum power_supply_property wm8350_bat_props[] = {
        POWER_SUPPLY_PROP_ONLINE,
        POWER_SUPPLY_PROP_VOLTAGE_NOW,
        POWER_SUPPLY_PROP_HEALTH,
+       POWER_SUPPLY_PROP_CHARGE_TYPE,
 };
 
 /*********************************************************************
index b787335a8419352fa4cef23af9fccd2fd4f508ac..f2bfd296dbae05133134b02c05daf9df12da6fa0 100644 (file)
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
 #include <linux/gpio.h>
-#include <linux/wm97xx_batt.h>
+#include <linux/irq.h>
 
 static DEFINE_MUTEX(bat_lock);
 static struct work_struct bat_work;
 struct mutex work_lock;
 static int bat_status = POWER_SUPPLY_STATUS_UNKNOWN;
-static struct wm97xx_batt_info *pdata;
+static struct wm97xx_batt_info *gpdata;
 static enum power_supply_property *prop;
 
 static unsigned long wm97xx_read_bat(struct power_supply *bat_ps)
 {
+       struct wm97xx_pdata *wmdata = bat_ps->dev->parent->platform_data;
+       struct wm97xx_batt_pdata *pdata = wmdata->batt_pdata;
+
        return wm97xx_read_aux_adc(dev_get_drvdata(bat_ps->dev->parent),
                                        pdata->batt_aux) * pdata->batt_mult /
                                        pdata->batt_div;
@@ -40,6 +43,9 @@ static unsigned long wm97xx_read_bat(struct power_supply *bat_ps)
 
 static unsigned long wm97xx_read_temp(struct power_supply *bat_ps)
 {
+       struct wm97xx_pdata *wmdata = bat_ps->dev->parent->platform_data;
+       struct wm97xx_batt_pdata *pdata = wmdata->batt_pdata;
+
        return wm97xx_read_aux_adc(dev_get_drvdata(bat_ps->dev->parent),
                                        pdata->temp_aux) * pdata->temp_mult /
                                        pdata->temp_div;
@@ -49,6 +55,9 @@ static int wm97xx_bat_get_property(struct power_supply *bat_ps,
                            enum power_supply_property psp,
                            union power_supply_propval *val)
 {
+       struct wm97xx_pdata *wmdata = bat_ps->dev->parent->platform_data;
+       struct wm97xx_batt_pdata *pdata = wmdata->batt_pdata;
+
        switch (psp) {
        case POWER_SUPPLY_PROP_STATUS:
                val->intval = bat_status;
@@ -97,6 +106,8 @@ static void wm97xx_bat_external_power_changed(struct power_supply *bat_ps)
 static void wm97xx_bat_update(struct power_supply *bat_ps)
 {
        int old_status = bat_status;
+       struct wm97xx_pdata *wmdata = bat_ps->dev->parent->platform_data;
+       struct wm97xx_batt_pdata *pdata = wmdata->batt_pdata;
 
        mutex_lock(&work_lock);
 
@@ -127,21 +138,29 @@ static void wm97xx_bat_work(struct work_struct *work)
        wm97xx_bat_update(&bat_ps);
 }
 
+static irqreturn_t wm97xx_chrg_irq(int irq, void *data)
+{
+       schedule_work(&bat_work);
+       return IRQ_HANDLED;
+}
+
 #ifdef CONFIG_PM
-static int wm97xx_bat_suspend(struct platform_device *dev, pm_message_t state)
+static int wm97xx_bat_suspend(struct device *dev)
 {
        flush_scheduled_work();
        return 0;
 }
 
-static int wm97xx_bat_resume(struct platform_device *dev)
+static int wm97xx_bat_resume(struct device *dev)
 {
        schedule_work(&bat_work);
        return 0;
 }
-#else
-#define wm97xx_bat_suspend NULL
-#define wm97xx_bat_resume NULL
+
+static struct dev_pm_ops wm97xx_bat_pm_ops = {
+       .suspend        = wm97xx_bat_suspend,
+       .resume         = wm97xx_bat_resume,
+};
 #endif
 
 static int __devinit wm97xx_bat_probe(struct platform_device *dev)
@@ -149,6 +168,15 @@ static int __devinit wm97xx_bat_probe(struct platform_device *dev)
        int ret = 0;
        int props = 1;  /* POWER_SUPPLY_PROP_PRESENT */
        int i = 0;
+       struct wm97xx_pdata *wmdata = dev->dev.platform_data;
+       struct wm97xx_batt_pdata *pdata;
+
+       if (gpdata) {
+               dev_err(&dev->dev, "Do not pass platform_data through "
+                       "wm97xx_bat_set_pdata!\n");
+               return -EINVAL;
+       } else
+               pdata = wmdata->batt_pdata;
 
        if (dev->id != -1)
                return -EINVAL;
@@ -156,15 +184,20 @@ static int __devinit wm97xx_bat_probe(struct platform_device *dev)
        mutex_init(&work_lock);
 
        if (!pdata) {
-               dev_err(&dev->dev, "Please use wm97xx_bat_set_pdata\n");
+               dev_err(&dev->dev, "No platform_data supplied\n");
                return -EINVAL;
        }
 
-       if (pdata->charge_gpio >= 0 && gpio_is_valid(pdata->charge_gpio)) {
+       if (gpio_is_valid(pdata->charge_gpio)) {
                ret = gpio_request(pdata->charge_gpio, "BATT CHRG");
                if (ret)
                        goto err;
                ret = gpio_direction_input(pdata->charge_gpio);
+               if (ret)
+                       goto err2;
+               ret = request_irq(gpio_to_irq(pdata->charge_gpio),
+                               wm97xx_chrg_irq, IRQF_DISABLED,
+                               "AC Detect", 0);
                if (ret)
                        goto err2;
                props++;        /* POWER_SUPPLY_PROP_STATUS */
@@ -183,7 +216,7 @@ static int __devinit wm97xx_bat_probe(struct platform_device *dev)
 
        prop = kzalloc(props * sizeof(*prop), GFP_KERNEL);
        if (!prop)
-               goto err2;
+               goto err3;
 
        prop[i++] = POWER_SUPPLY_PROP_PRESENT;
        if (pdata->charge_gpio >= 0)
@@ -216,21 +249,30 @@ static int __devinit wm97xx_bat_probe(struct platform_device *dev)
        if (!ret)
                schedule_work(&bat_work);
        else
-               goto err3;
+               goto err4;
 
        return 0;
-err3:
+err4:
        kfree(prop);
+err3:
+       if (gpio_is_valid(pdata->charge_gpio))
+               free_irq(gpio_to_irq(pdata->charge_gpio), dev);
 err2:
-       gpio_free(pdata->charge_gpio);
+       if (gpio_is_valid(pdata->charge_gpio))
+               gpio_free(pdata->charge_gpio);
 err:
        return ret;
 }
 
 static int __devexit wm97xx_bat_remove(struct platform_device *dev)
 {
-       if (pdata && pdata->charge_gpio && pdata->charge_gpio >= 0)
+       struct wm97xx_pdata *wmdata = dev->dev.platform_data;
+       struct wm97xx_batt_pdata *pdata = wmdata->batt_pdata;
+
+       if (pdata && gpio_is_valid(pdata->charge_gpio)) {
+               free_irq(gpio_to_irq(pdata->charge_gpio), dev);
                gpio_free(pdata->charge_gpio);
+       }
        flush_scheduled_work();
        power_supply_unregister(&bat_ps);
        kfree(prop);
@@ -241,11 +283,12 @@ static struct platform_driver wm97xx_bat_driver = {
        .driver = {
                .name   = "wm97xx-battery",
                .owner  = THIS_MODULE,
+#ifdef CONFIG_PM
+               .pm     = &wm97xx_bat_pm_ops,
+#endif
        },
        .probe          = wm97xx_bat_probe,
        .remove         = __devexit_p(wm97xx_bat_remove),
-       .suspend        = wm97xx_bat_suspend,
-       .resume         = wm97xx_bat_resume,
 };
 
 static int __init wm97xx_bat_init(void)
@@ -258,9 +301,9 @@ static void __exit wm97xx_bat_exit(void)
        platform_driver_unregister(&wm97xx_bat_driver);
 }
 
-void __init wm97xx_bat_set_pdata(struct wm97xx_batt_info *data)
+void wm97xx_bat_set_pdata(struct wm97xx_batt_info *data)
 {
-       pdata = data;
+       gpdata = data;
 }
 EXPORT_SYMBOL_GPL(wm97xx_bat_set_pdata);
 
index 2dc42bbf6fe996cc97de4f942e9ae6863c7475e3..bcbb161bde0b706c6083f2bc6205180dc0fcea09 100644 (file)
@@ -1,6 +1,5 @@
 menuconfig REGULATOR
        bool "Voltage and Current Regulator Support"
-       default n
        help
          Generic Voltage and Current Regulator support.
 
@@ -30,7 +29,6 @@ config REGULATOR_DEBUG
 
 config REGULATOR_FIXED_VOLTAGE
        tristate "Fixed voltage regulator support"
-       default n
        help
          This driver provides support for fixed voltage regulators,
          useful for systems which use a combination of software
@@ -38,7 +36,6 @@ config REGULATOR_FIXED_VOLTAGE
 
 config REGULATOR_VIRTUAL_CONSUMER
        tristate "Virtual regulator consumer support"
-       default n
        help
          This driver provides a virtual consumer for the voltage and
           current regulator API which provides sysfs controls for
@@ -49,17 +46,15 @@ config REGULATOR_VIRTUAL_CONSUMER
 
 config REGULATOR_USERSPACE_CONSUMER
        tristate "Userspace regulator consumer support"
-       default n
        help
          There are some classes of devices that are controlled entirely
-         from user space. Usersapce consumer driver provides ability to
+         from user space. Userspace consumer driver provides ability to
          control power supplies for such devices.
 
           If unsure, say no.
 
 config REGULATOR_BQ24022
        tristate "TI bq24022 Dual Input 1-Cell Li-Ion Charger IC"
-       default n
        help
          This driver controls a TI bq24022 Charger attached via
          GPIOs. The provided current regulator can enable/disable
@@ -69,7 +64,6 @@ config REGULATOR_BQ24022
 config REGULATOR_MAX1586
        tristate "Maxim 1586/1587 voltage regulator"
        depends on I2C
-       default n
        help
          This driver controls a Maxim 1586 or 1587 voltage output
          regulator via I2C bus. The provided regulator is suitable
@@ -147,5 +141,21 @@ config REGULATOR_AB3100
         AB3100 analog baseband dealing with power regulators
         for the system.
 
+config REGULATOR_TPS65023
+       tristate "TI TPS65023 Power regulators"
+       depends on I2C
+       help
+         This driver supports TPS65023 voltage regulator chips. TPS65023 provides
+         three step-down converters and two general-purpose LDO voltage regulators.
+         It supports TI's software based Class-2 SmartReflex implementation.
+
+config REGULATOR_TPS6507X
+       tristate "TI TPS6507X Power regulators"
+       depends on I2C
+       help
+         This driver supports TPS6507X voltage regulator chips. TPS6507X provides
+         three step-down converters and two general-purpose LDO voltage regulators.
+         It supports TI's software based Class-2 SmartReflex implementation.
+
 endif
 
index 768b3316d6ebbb586d049876a5351ad5d42215ee..4257a868377803b0359f49af864fb3b4ad014d57 100644 (file)
@@ -23,4 +23,7 @@ obj-$(CONFIG_REGULATOR_PCAP) += pcap-regulator.o
 obj-$(CONFIG_REGULATOR_MC13783) += mc13783.o
 obj-$(CONFIG_REGULATOR_AB3100) += ab3100.o
 
+obj-$(CONFIG_REGULATOR_TPS65023) += tps65023-regulator.o
+obj-$(CONFIG_REGULATOR_TPS6507X) += tps6507x-regulator.o
+
 ccflags-$(CONFIG_REGULATOR_DEBUG) += -DDEBUG
index 91ba9bfaa706a3a0dfe7ef8679060d0a4df07e00..744ea1d0b59bf084f19559b8f199b644fbb0899c 100644 (file)
@@ -37,7 +37,7 @@ static int has_full_constraints;
  */
 struct regulator_map {
        struct list_head list;
-       struct device *dev;
+       const char *dev_name;   /* The dev_name() for the consumer */
        const char *supply;
        struct regulator_dev *regulator;
 };
@@ -232,7 +232,7 @@ static ssize_t regulator_name_show(struct device *dev,
        struct regulator_dev *rdev = dev_get_drvdata(dev);
        const char *name;
 
-       if (rdev->constraints->name)
+       if (rdev->constraints && rdev->constraints->name)
                name = rdev->constraints->name;
        else if (rdev->desc->name)
                name = rdev->desc->name;
@@ -280,8 +280,13 @@ static ssize_t regulator_state_show(struct device *dev,
                                   struct device_attribute *attr, char *buf)
 {
        struct regulator_dev *rdev = dev_get_drvdata(dev);
+       ssize_t ret;
+
+       mutex_lock(&rdev->mutex);
+       ret = regulator_print_state(buf, _regulator_is_enabled(rdev));
+       mutex_unlock(&rdev->mutex);
 
-       return regulator_print_state(buf, _regulator_is_enabled(rdev));
+       return ret;
 }
 static DEVICE_ATTR(state, 0444, regulator_state_show, NULL);
 
@@ -857,23 +862,39 @@ out:
  * set_consumer_device_supply: Bind a regulator to a symbolic supply
  * @rdev:         regulator source
  * @consumer_dev: device the supply applies to
+ * @consumer_dev_name: dev_name() string for device supply applies to
  * @supply:       symbolic name for supply
  *
  * Allows platform initialisation code to map physical regulator
  * sources to symbolic names for supplies for use by devices.  Devices
  * should use these symbolic names to request regulators, avoiding the
  * need to provide board-specific regulator names as platform data.
+ *
+ * Only one of consumer_dev and consumer_dev_name may be specified.
  */
 static int set_consumer_device_supply(struct regulator_dev *rdev,
-       struct device *consumer_dev, const char *supply)
+       struct device *consumer_dev, const char *consumer_dev_name,
+       const char *supply)
 {
        struct regulator_map *node;
+       int has_dev;
+
+       if (consumer_dev && consumer_dev_name)
+               return -EINVAL;
+
+       if (!consumer_dev_name && consumer_dev)
+               consumer_dev_name = dev_name(consumer_dev);
 
        if (supply == NULL)
                return -EINVAL;
 
+       if (consumer_dev_name != NULL)
+               has_dev = 1;
+       else
+               has_dev = 0;
+
        list_for_each_entry(node, &regulator_map_list, list) {
-               if (consumer_dev != node->dev)
+               if (consumer_dev_name != node->dev_name)
                        continue;
                if (strcmp(node->supply, supply) != 0)
                        continue;
@@ -886,30 +907,45 @@ static int set_consumer_device_supply(struct regulator_dev *rdev,
                return -EBUSY;
        }
 
-       node = kmalloc(sizeof(struct regulator_map), GFP_KERNEL);
+       node = kzalloc(sizeof(struct regulator_map), GFP_KERNEL);
        if (node == NULL)
                return -ENOMEM;
 
        node->regulator = rdev;
-       node->dev = consumer_dev;
        node->supply = supply;
 
+       if (has_dev) {
+               node->dev_name = kstrdup(consumer_dev_name, GFP_KERNEL);
+               if (node->dev_name == NULL) {
+                       kfree(node);
+                       return -ENOMEM;
+               }
+       }
+
        list_add(&node->list, &regulator_map_list);
        return 0;
 }
 
 static void unset_consumer_device_supply(struct regulator_dev *rdev,
-       struct device *consumer_dev)
+       const char *consumer_dev_name, struct device *consumer_dev)
 {
        struct regulator_map *node, *n;
 
+       if (consumer_dev && !consumer_dev_name)
+               consumer_dev_name = dev_name(consumer_dev);
+
        list_for_each_entry_safe(node, n, &regulator_map_list, list) {
-               if (rdev == node->regulator &&
-                       consumer_dev == node->dev) {
-                       list_del(&node->list);
-                       kfree(node);
-                       return;
-               }
+               if (rdev != node->regulator)
+                       continue;
+
+               if (consumer_dev_name && node->dev_name &&
+                   strcmp(consumer_dev_name, node->dev_name))
+                       continue;
+
+               list_del(&node->list);
+               kfree(node->dev_name);
+               kfree(node);
+               return;
        }
 }
 
@@ -920,6 +956,7 @@ static void unset_regulator_supplies(struct regulator_dev *rdev)
        list_for_each_entry_safe(node, n, &regulator_map_list, list) {
                if (rdev == node->regulator) {
                        list_del(&node->list);
+                       kfree(node->dev_name);
                        kfree(node);
                        return;
                }
@@ -1001,35 +1038,33 @@ overflow_err:
        return NULL;
 }
 
-/**
- * regulator_get - lookup and obtain a reference to a regulator.
- * @dev: device for regulator "consumer"
- * @id: Supply name or regulator ID.
- *
- * Returns a struct regulator corresponding to the regulator producer,
- * or IS_ERR() condition containing errno.
- *
- * Use of supply names configured via regulator_set_device_supply() is
- * strongly encouraged.  It is recommended that the supply name used
- * should match the name used for the supply and/or the relevant
- * device pins in the datasheet.
- */
-struct regulator *regulator_get(struct device *dev, const char *id)
+/* Internal regulator request function */
+static struct regulator *_regulator_get(struct device *dev, const char *id,
+                                       int exclusive)
 {
        struct regulator_dev *rdev;
        struct regulator_map *map;
        struct regulator *regulator = ERR_PTR(-ENODEV);
+       const char *devname = NULL;
+       int ret;
 
        if (id == NULL) {
                printk(KERN_ERR "regulator: get() with no identifier\n");
                return regulator;
        }
 
+       if (dev)
+               devname = dev_name(dev);
+
        mutex_lock(&regulator_list_mutex);
 
        list_for_each_entry(map, &regulator_map_list, list) {
-               if (dev == map->dev &&
-                   strcmp(map->supply, id) == 0) {
+               /* If the mapping has a device set up it must match */
+               if (map->dev_name &&
+                   (!devname || strcmp(map->dev_name, devname)))
+                       continue;
+
+               if (strcmp(map->supply, id) == 0) {
                        rdev = map->regulator;
                        goto found;
                }
@@ -1038,6 +1073,16 @@ struct regulator *regulator_get(struct device *dev, const char *id)
        return regulator;
 
 found:
+       if (rdev->exclusive) {
+               regulator = ERR_PTR(-EPERM);
+               goto out;
+       }
+
+       if (exclusive && rdev->open_count) {
+               regulator = ERR_PTR(-EBUSY);
+               goto out;
+       }
+
        if (!try_module_get(rdev->owner))
                goto out;
 
@@ -1047,12 +1092,69 @@ found:
                module_put(rdev->owner);
        }
 
+       rdev->open_count++;
+       if (exclusive) {
+               rdev->exclusive = 1;
+
+               ret = _regulator_is_enabled(rdev);
+               if (ret > 0)
+                       rdev->use_count = 1;
+               else
+                       rdev->use_count = 0;
+       }
+
 out:
        mutex_unlock(&regulator_list_mutex);
+
        return regulator;
 }
+
+/**
+ * regulator_get - lookup and obtain a reference to a regulator.
+ * @dev: device for regulator "consumer"
+ * @id: Supply name or regulator ID.
+ *
+ * Returns a struct regulator corresponding to the regulator producer,
+ * or IS_ERR() condition containing errno.
+ *
+ * Use of supply names configured via regulator_set_device_supply() is
+ * strongly encouraged.  It is recommended that the supply name used
+ * should match the name used for the supply and/or the relevant
+ * device pins in the datasheet.
+ */
+struct regulator *regulator_get(struct device *dev, const char *id)
+{
+       return _regulator_get(dev, id, 0);
+}
 EXPORT_SYMBOL_GPL(regulator_get);
 
+/**
+ * regulator_get_exclusive - obtain exclusive access to a regulator.
+ * @dev: device for regulator "consumer"
+ * @id: Supply name or regulator ID.
+ *
+ * Returns a struct regulator corresponding to the regulator producer,
+ * or IS_ERR() condition containing errno.  Other consumers will be
+ * unable to obtain this reference is held and the use count for the
+ * regulator will be initialised to reflect the current state of the
+ * regulator.
+ *
+ * This is intended for use by consumers which cannot tolerate shared
+ * use of the regulator such as those which need to force the
+ * regulator off for correct operation of the hardware they are
+ * controlling.
+ *
+ * Use of supply names configured via regulator_set_device_supply() is
+ * strongly encouraged.  It is recommended that the supply name used
+ * should match the name used for the supply and/or the relevant
+ * device pins in the datasheet.
+ */
+struct regulator *regulator_get_exclusive(struct device *dev, const char *id)
+{
+       return _regulator_get(dev, id, 1);
+}
+EXPORT_SYMBOL_GPL(regulator_get_exclusive);
+
 /**
  * regulator_put - "free" the regulator source
  * @regulator: regulator source
@@ -1081,21 +1183,29 @@ void regulator_put(struct regulator *regulator)
        list_del(&regulator->list);
        kfree(regulator);
 
+       rdev->open_count--;
+       rdev->exclusive = 0;
+
        module_put(rdev->owner);
        mutex_unlock(&regulator_list_mutex);
 }
 EXPORT_SYMBOL_GPL(regulator_put);
 
+static int _regulator_can_change_status(struct regulator_dev *rdev)
+{
+       if (!rdev->constraints)
+               return 0;
+
+       if (rdev->constraints->valid_ops_mask & REGULATOR_CHANGE_STATUS)
+               return 1;
+       else
+               return 0;
+}
+
 /* locks held by regulator_enable() */
 static int _regulator_enable(struct regulator_dev *rdev)
 {
-       int ret = -EINVAL;
-
-       if (!rdev->constraints) {
-               printk(KERN_ERR "%s: %s has no constraints\n",
-                      __func__, rdev->desc->name);
-               return ret;
-       }
+       int ret;
 
        /* do we need to enable the supply regulator first */
        if (rdev->supply) {
@@ -1108,24 +1218,35 @@ static int _regulator_enable(struct regulator_dev *rdev)
        }
 
        /* check voltage and requested load before enabling */
-       if (rdev->desc->ops->enable) {
-
-               if (rdev->constraints &&
-                       (rdev->constraints->valid_ops_mask &
-                       REGULATOR_CHANGE_DRMS))
-                       drms_uA_update(rdev);
-
-               ret = rdev->desc->ops->enable(rdev);
-               if (ret < 0) {
-                       printk(KERN_ERR "%s: failed to enable %s: %d\n",
+       if (rdev->constraints &&
+           (rdev->constraints->valid_ops_mask & REGULATOR_CHANGE_DRMS))
+               drms_uA_update(rdev);
+
+       if (rdev->use_count == 0) {
+               /* The regulator may on if it's not switchable or left on */
+               ret = _regulator_is_enabled(rdev);
+               if (ret == -EINVAL || ret == 0) {
+                       if (!_regulator_can_change_status(rdev))
+                               return -EPERM;
+
+                       if (rdev->desc->ops->enable) {
+                               ret = rdev->desc->ops->enable(rdev);
+                               if (ret < 0)
+                                       return ret;
+                       } else {
+                               return -EINVAL;
+                       }
+               } else if (ret < 0) {
+                       printk(KERN_ERR "%s: is_enabled() failed for %s: %d\n",
                               __func__, rdev->desc->name, ret);
                        return ret;
                }
-               rdev->use_count++;
-               return ret;
+               /* Fallthrough on positive return values - already enabled */
        }
 
-       return ret;
+       rdev->use_count++;
+
+       return 0;
 }
 
 /**
@@ -1165,7 +1286,8 @@ static int _regulator_disable(struct regulator_dev *rdev)
        if (rdev->use_count == 1 && !rdev->constraints->always_on) {
 
                /* we are last user */
-               if (rdev->desc->ops->disable) {
+               if (_regulator_can_change_status(rdev) &&
+                   rdev->desc->ops->disable) {
                        ret = rdev->desc->ops->disable(rdev);
                        if (ret < 0) {
                                printk(KERN_ERR "%s: failed to disable %s\n",
@@ -1265,20 +1387,11 @@ EXPORT_SYMBOL_GPL(regulator_force_disable);
 
 static int _regulator_is_enabled(struct regulator_dev *rdev)
 {
-       int ret;
-
-       mutex_lock(&rdev->mutex);
-
        /* sanity check */
-       if (!rdev->desc->ops->is_enabled) {
-               ret = -EINVAL;
-               goto out;
-       }
+       if (!rdev->desc->ops->is_enabled)
+               return -EINVAL;
 
-       ret = rdev->desc->ops->is_enabled(rdev);
-out:
-       mutex_unlock(&rdev->mutex);
-       return ret;
+       return rdev->desc->ops->is_enabled(rdev);
 }
 
 /**
@@ -1295,7 +1408,13 @@ out:
  */
 int regulator_is_enabled(struct regulator *regulator)
 {
-       return _regulator_is_enabled(regulator->rdev);
+       int ret;
+
+       mutex_lock(&regulator->rdev->mutex);
+       ret = _regulator_is_enabled(regulator->rdev);
+       mutex_unlock(&regulator->rdev->mutex);
+
+       return ret;
 }
 EXPORT_SYMBOL_GPL(regulator_is_enabled);
 
@@ -1349,6 +1468,35 @@ int regulator_list_voltage(struct regulator *regulator, unsigned selector)
 }
 EXPORT_SYMBOL_GPL(regulator_list_voltage);
 
+/**
+ * regulator_is_supported_voltage - check if a voltage range can be supported
+ *
+ * @regulator: Regulator to check.
+ * @min_uV: Minimum required voltage in uV.
+ * @max_uV: Maximum required voltage in uV.
+ *
+ * Returns a boolean or a negative error code.
+ */
+int regulator_is_supported_voltage(struct regulator *regulator,
+                                  int min_uV, int max_uV)
+{
+       int i, voltages, ret;
+
+       ret = regulator_count_voltages(regulator);
+       if (ret < 0)
+               return ret;
+       voltages = ret;
+
+       for (i = 0; i < voltages; i++) {
+               ret = regulator_list_voltage(regulator, i);
+
+               if (ret >= min_uV && ret <= max_uV)
+                       return 1;
+       }
+
+       return 0;
+}
+
 /**
  * regulator_set_voltage - set regulator output voltage
  * @regulator: regulator source
@@ -2091,11 +2239,13 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
        for (i = 0; i < init_data->num_consumer_supplies; i++) {
                ret = set_consumer_device_supply(rdev,
                        init_data->consumer_supplies[i].dev,
+                       init_data->consumer_supplies[i].dev_name,
                        init_data->consumer_supplies[i].supply);
                if (ret < 0) {
                        for (--i; i >= 0; i--)
                                unset_consumer_device_supply(rdev,
-                                       init_data->consumer_supplies[i].dev);
+                                   init_data->consumer_supplies[i].dev_name,
+                                   init_data->consumer_supplies[i].dev);
                        goto scrub;
                }
        }
@@ -2130,6 +2280,7 @@ void regulator_unregister(struct regulator_dev *rdev)
                return;
 
        mutex_lock(&regulator_list_mutex);
+       WARN_ON(rdev->open_count);
        unset_regulator_supplies(rdev);
        list_del(&rdev->list);
        if (rdev->supply)
@@ -2277,14 +2428,14 @@ static int __init regulator_init_complete(void)
                ops = rdev->desc->ops;
                c = rdev->constraints;
 
-               if (c->name)
+               if (c && c->name)
                        name = c->name;
                else if (rdev->desc->name)
                        name = rdev->desc->name;
                else
                        name = "regulator";
 
-               if (!ops->disable || c->always_on)
+               if (!ops->disable || (c && c->always_on))
                        continue;
 
                mutex_lock(&rdev->mutex);
index b8b89ef10a84abdbc44573e30f0fb7c7d545b16d..aa224d936e0de4c92665faf14115bc5592e63bde 100644 (file)
 #define DA9034_MDTV2           (0x33)
 #define DA9034_MVRC            (0x34)
 
+/* DA9035 Registers. DA9034 Registers are comptabile to DA9035. */
+#define DA9035_OVER3           (0x12)
+#define DA9035_VCC2            (0x1f)
+#define DA9035_3DTV1           (0x2c)
+#define DA9035_3DTV2           (0x2d)
+#define DA9035_3VRC            (0x2e)
+#define DA9035_AUTOSKIP                (0x2f)
+
 struct da903x_regulator_info {
        struct regulator_desc desc;
 
@@ -79,6 +87,10 @@ struct da903x_regulator_info {
        int     enable_bit;
 };
 
+static int da9034_ldo12_data[] = { 1700, 1750, 1800, 1850, 1900, 1950,
+                                  2000, 2050, 2700, 2750, 2800, 2850,
+                                  2900, 2950, 3000, 3050 };
+
 static inline struct device *to_da903x_dev(struct regulator_dev *rdev)
 {
        return rdev_get_dev(rdev)->parent->parent;
@@ -162,6 +174,17 @@ static int da903x_is_enabled(struct regulator_dev *rdev)
        return !!(reg_val & (1 << info->enable_bit));
 }
 
+static int da903x_list_voltage(struct regulator_dev *rdev, unsigned selector)
+{
+       struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
+       int ret;
+
+       ret = info->min_uV + info->step_uV * selector;
+       if (ret > info->max_uV)
+               return -EINVAL;
+       return ret;
+}
+
 /* DA9030 specific operations */
 static int da9030_set_ldo1_15_voltage(struct regulator_dev *rdev,
                                       int min_uV, int max_uV)
@@ -278,7 +301,7 @@ static int da9034_set_ldo12_voltage(struct regulator_dev *rdev,
        }
 
        val = (min_uV - info->min_uV + info->step_uV - 1) / info->step_uV;
-       val = (val > 7 || val < 20) ? 8 : val - 12;
+       val = (val >= 20) ? val - 12 : ((val > 7) ? 8 : val);
        val <<= info->vol_shift;
        mask = ((1 << info->vol_nbits) - 1)  << info->vol_shift;
 
@@ -305,9 +328,18 @@ static int da9034_get_ldo12_voltage(struct regulator_dev *rdev)
        return info->min_uV + info->step_uV * val;
 }
 
+static int da9034_list_ldo12_voltage(struct regulator_dev *rdev,
+                                    unsigned selector)
+{
+       if (selector > ARRAY_SIZE(da9034_ldo12_data))
+               return -EINVAL;
+       return da9034_ldo12_data[selector] * 1000;
+}
+
 static struct regulator_ops da903x_regulator_ldo_ops = {
        .set_voltage    = da903x_set_ldo_voltage,
        .get_voltage    = da903x_get_voltage,
+       .list_voltage   = da903x_list_voltage,
        .enable         = da903x_enable,
        .disable        = da903x_disable,
        .is_enabled     = da903x_is_enabled,
@@ -317,6 +349,7 @@ static struct regulator_ops da903x_regulator_ldo_ops = {
 static struct regulator_ops da9030_regulator_ldo14_ops = {
        .set_voltage    = da9030_set_ldo14_voltage,
        .get_voltage    = da9030_get_ldo14_voltage,
+       .list_voltage   = da903x_list_voltage,
        .enable         = da903x_enable,
        .disable        = da903x_disable,
        .is_enabled     = da903x_is_enabled,
@@ -326,6 +359,7 @@ static struct regulator_ops da9030_regulator_ldo14_ops = {
 static struct regulator_ops da9030_regulator_ldo1_15_ops = {
        .set_voltage    = da9030_set_ldo1_15_voltage,
        .get_voltage    = da903x_get_voltage,
+       .list_voltage   = da903x_list_voltage,
        .enable         = da903x_enable,
        .disable        = da903x_disable,
        .is_enabled     = da903x_is_enabled,
@@ -334,6 +368,7 @@ static struct regulator_ops da9030_regulator_ldo1_15_ops = {
 static struct regulator_ops da9034_regulator_dvc_ops = {
        .set_voltage    = da9034_set_dvc_voltage,
        .get_voltage    = da903x_get_voltage,
+       .list_voltage   = da903x_list_voltage,
        .enable         = da903x_enable,
        .disable        = da903x_disable,
        .is_enabled     = da903x_is_enabled,
@@ -343,6 +378,7 @@ static struct regulator_ops da9034_regulator_dvc_ops = {
 static struct regulator_ops da9034_regulator_ldo12_ops = {
        .set_voltage    = da9034_set_ldo12_voltage,
        .get_voltage    = da9034_get_ldo12_voltage,
+       .list_voltage   = da9034_list_ldo12_voltage,
        .enable         = da903x_enable,
        .disable        = da903x_disable,
        .is_enabled     = da903x_is_enabled,
@@ -355,6 +391,7 @@ static struct regulator_ops da9034_regulator_ldo12_ops = {
                .ops    = &da903x_regulator_ldo_ops,                    \
                .type   = REGULATOR_VOLTAGE,                            \
                .id     = _pmic##_ID_LDO##_id,                          \
+               .n_voltages = (step) ? ((max - min) / step + 1) : 1,    \
                .owner  = THIS_MODULE,                                  \
        },                                                              \
        .min_uV         = (min) * 1000,                                 \
@@ -367,24 +404,25 @@ static struct regulator_ops da9034_regulator_ldo12_ops = {
        .enable_bit     = (ebit),                                       \
 }
 
-#define DA9034_DVC(_id, min, max, step, vreg, nbits, ureg, ubit, ereg, ebit) \
+#define DA903x_DVC(_pmic, _id, min, max, step, vreg, nbits, ureg, ubit, ereg, ebit) \
 {                                                                      \
        .desc   = {                                                     \
                .name   = #_id,                                         \
                .ops    = &da9034_regulator_dvc_ops,                    \
                .type   = REGULATOR_VOLTAGE,                            \
-               .id     = DA9034_ID_##_id,                              \
+               .id     = _pmic##_ID_##_id,                             \
+               .n_voltages = (step) ? ((max - min) / step + 1) : 1,    \
                .owner  = THIS_MODULE,                                  \
        },                                                              \
        .min_uV         = (min) * 1000,                                 \
        .max_uV         = (max) * 1000,                                 \
        .step_uV        = (step) * 1000,                                \
-       .vol_reg        = DA9034_##vreg,                                \
+       .vol_reg        = _pmic##_##vreg,                               \
        .vol_shift      = (0),                                          \
        .vol_nbits      = (nbits),                                      \
-       .update_reg     = DA9034_##ureg,                                \
+       .update_reg     = _pmic##_##ureg,                               \
        .update_bit     = (ubit),                                       \
-       .enable_reg     = DA9034_##ereg,                                \
+       .enable_reg     = _pmic##_##ereg,                               \
        .enable_bit     = (ebit),                                       \
 }
 
@@ -394,8 +432,22 @@ static struct regulator_ops da9034_regulator_ldo12_ops = {
 #define DA9030_LDO(_id, min, max, step, vreg, shift, nbits, ereg, ebit)        \
        DA903x_LDO(DA9030, _id, min, max, step, vreg, shift, nbits, ereg, ebit)
 
+#define DA9030_DVC(_id, min, max, step, vreg, nbits, ureg, ubit, ereg, ebit) \
+       DA903x_DVC(DA9030, _id, min, max, step, vreg, nbits, ureg, ubit, \
+                  ereg, ebit)
+
+#define DA9034_DVC(_id, min, max, step, vreg, nbits, ureg, ubit, ereg, ebit) \
+       DA903x_DVC(DA9034, _id, min, max, step, vreg, nbits, ureg, ubit, \
+                  ereg, ebit)
+
+#define DA9035_DVC(_id, min, max, step, vreg, nbits, ureg, ubit, ereg, ebit) \
+       DA903x_DVC(DA9035, _id, min, max, step, vreg, nbits, ureg, ubit, \
+                  ereg, ebit)
+
 static struct da903x_regulator_info da903x_regulator_info[] = {
        /* DA9030 */
+       DA9030_DVC(BUCK2, 850, 1625, 25, BUCK2DVM1, 5, BUCK2DVM1, 7, RCTL11, 0),
+
        DA9030_LDO( 1, 1200, 3200, 100,    LDO1, 0, 5, RCTL12, 1),
        DA9030_LDO( 2, 1800, 3200, 100,   LDO23, 0, 4, RCTL12, 2),
        DA9030_LDO( 3, 1800, 3200, 100,   LDO23, 4, 4, RCTL12, 3),
@@ -417,9 +469,9 @@ static struct da903x_regulator_info da903x_regulator_info[] = {
        DA9030_LDO(13, 2100, 2100, 0, INVAL, 0, 0, RCTL11, 3), /* fixed @2.1V */
 
        /* DA9034 */
-       DA9034_DVC(BUCK1, 725, 1500, 25, ADTV1, 5, VCC1, 0, OVER1, 0),
-       DA9034_DVC(BUCK2, 725, 1500, 25, CDTV1, 5, VCC1, 2, OVER1, 1),
-       DA9034_DVC(LDO2,  725, 1500, 25, SDTV1, 5, VCC1, 4, OVER1, 2),
+       DA9034_DVC(BUCK1, 725, 1500, 25, ADTV2, 5, VCC1, 0, OVER1, 0),
+       DA9034_DVC(BUCK2, 725, 1500, 25, CDTV2, 5, VCC1, 2, OVER1, 1),
+       DA9034_DVC(LDO2,  725, 1500, 25, SDTV2, 5, VCC1, 4, OVER1, 2),
        DA9034_DVC(LDO1, 1700, 2075, 25, MDTV1, 4, VCC1, 6, OVER3, 4),
 
        DA9034_LDO( 3, 1800, 3300, 100,  LDO643, 0, 4, OVER3, 5),
@@ -435,6 +487,9 @@ static struct da903x_regulator_info da903x_regulator_info[] = {
        DA9034_LDO(14, 1800, 3300, 100, LDO1514, 0, 4, OVER3, 0),
        DA9034_LDO(15, 1800, 3300, 100, LDO1514, 4, 4, OVER3, 1),
        DA9034_LDO(5, 3100, 3100, 0, INVAL, 0, 0, OVER3, 7), /* fixed @3.1V */
+
+       /* DA9035 */
+       DA9035_DVC(BUCK3, 1800, 2200, 100, 3DTV1, 3, VCC2, 0, OVER3, 3),
 };
 
 static inline struct da903x_regulator_info *find_regulator_info(int id)
@@ -462,8 +517,10 @@ static int __devinit da903x_regulator_probe(struct platform_device *pdev)
        }
 
        /* Workaround for the weird LDO12 voltage setting */
-       if (ri->desc.id == DA9034_ID_LDO12)
+       if (ri->desc.id == DA9034_ID_LDO12) {
                ri->desc.ops = &da9034_regulator_ldo12_ops;
+               ri->desc.n_voltages = ARRAY_SIZE(da9034_ldo12_data);
+       }
 
        if (ri->desc.id == DA9030_ID_LDO14)
                ri->desc.ops = &da9030_regulator_ldo14_ops;
index cdc674fb46c3371192c7b2975df97ac9794a3e0d..f8b295700d7d706e6a19d6f273e34a149d49e897 100644 (file)
@@ -5,6 +5,9 @@
  *
  * Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
  *
+ * Copyright (c) 2009 Nokia Corporation
+ * Roger Quadros <ext-roger.quadros@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
 #include <linux/platform_device.h>
 #include <linux/regulator/driver.h>
 #include <linux/regulator/fixed.h>
+#include <linux/gpio.h>
 
 struct fixed_voltage_data {
        struct regulator_desc desc;
        struct regulator_dev *dev;
        int microvolts;
+       int gpio;
+       unsigned enable_high:1;
+       unsigned is_enabled:1;
 };
 
 static int fixed_voltage_is_enabled(struct regulator_dev *dev)
 {
-       return 1;
+       struct fixed_voltage_data *data = rdev_get_drvdata(dev);
+
+       return data->is_enabled;
 }
 
 static int fixed_voltage_enable(struct regulator_dev *dev)
 {
+       struct fixed_voltage_data *data = rdev_get_drvdata(dev);
+
+       if (gpio_is_valid(data->gpio)) {
+               gpio_set_value_cansleep(data->gpio, data->enable_high);
+               data->is_enabled = 1;
+       }
+
+       return 0;
+}
+
+static int fixed_voltage_disable(struct regulator_dev *dev)
+{
+       struct fixed_voltage_data *data = rdev_get_drvdata(dev);
+
+       if (gpio_is_valid(data->gpio)) {
+               gpio_set_value_cansleep(data->gpio, !data->enable_high);
+               data->is_enabled = 0;
+       }
+
        return 0;
 }
 
@@ -58,6 +86,7 @@ static int fixed_voltage_list_voltage(struct regulator_dev *dev,
 static struct regulator_ops fixed_voltage_ops = {
        .is_enabled = fixed_voltage_is_enabled,
        .enable = fixed_voltage_enable,
+       .disable = fixed_voltage_disable,
        .get_voltage = fixed_voltage_get_voltage,
        .list_voltage = fixed_voltage_list_voltage,
 };
@@ -70,12 +99,14 @@ static int regulator_fixed_voltage_probe(struct platform_device *pdev)
 
        drvdata = kzalloc(sizeof(struct fixed_voltage_data), GFP_KERNEL);
        if (drvdata == NULL) {
+               dev_err(&pdev->dev, "Failed to allocate device data\n");
                ret = -ENOMEM;
                goto err;
        }
 
        drvdata->desc.name = kstrdup(config->supply_name, GFP_KERNEL);
        if (drvdata->desc.name == NULL) {
+               dev_err(&pdev->dev, "Failed to allocate supply name\n");
                ret = -ENOMEM;
                goto err;
        }
@@ -85,12 +116,62 @@ static int regulator_fixed_voltage_probe(struct platform_device *pdev)
        drvdata->desc.n_voltages = 1;
 
        drvdata->microvolts = config->microvolts;
+       drvdata->gpio = config->gpio;
+
+       if (gpio_is_valid(config->gpio)) {
+               drvdata->enable_high = config->enable_high;
+
+               /* FIXME: Remove below print warning
+                *
+                * config->gpio must be set to -EINVAL by platform code if
+                * GPIO control is not required. However, early adopters
+                * not requiring GPIO control may forget to initialize
+                * config->gpio to -EINVAL. This will cause GPIO 0 to be used
+                * for GPIO control.
+                *
+                * This warning will be removed once there are a couple of users
+                * for this driver.
+                */
+               if (!config->gpio)
+                       dev_warn(&pdev->dev,
+                               "using GPIO 0 for regulator enable control\n");
+
+               ret = gpio_request(config->gpio, config->supply_name);
+               if (ret) {
+                       dev_err(&pdev->dev,
+                          "Could not obtain regulator enable GPIO %d: %d\n",
+                                                       config->gpio, ret);
+                       goto err_name;
+               }
+
+               /* set output direction without changing state
+                * to prevent glitch
+                */
+               drvdata->is_enabled = config->enabled_at_boot;
+               ret = drvdata->is_enabled ?
+                               config->enable_high : !config->enable_high;
+
+               ret = gpio_direction_output(config->gpio, ret);
+               if (ret) {
+                       dev_err(&pdev->dev,
+                          "Could not configure regulator enable GPIO %d direction: %d\n",
+                                                       config->gpio, ret);
+                       goto err_gpio;
+               }
+
+       } else {
+               /* Regulator without GPIO control is considered
+                * always enabled
+                */
+               drvdata->is_enabled = 1;
+       }
 
        drvdata->dev = regulator_register(&drvdata->desc, &pdev->dev,
                                          config->init_data, drvdata);
        if (IS_ERR(drvdata->dev)) {
                ret = PTR_ERR(drvdata->dev);
-               goto err_name;
+               dev_err(&pdev->dev, "Failed to register regulator: %d\n", ret);
+               goto err_gpio;
        }
 
        platform_set_drvdata(pdev, drvdata);
@@ -100,6 +181,9 @@ static int regulator_fixed_voltage_probe(struct platform_device *pdev)
 
        return 0;
 
+err_gpio:
+       if (gpio_is_valid(config->gpio))
+               gpio_free(config->gpio);
 err_name:
        kfree(drvdata->desc.name);
 err:
@@ -115,6 +199,9 @@ static int regulator_fixed_voltage_remove(struct platform_device *pdev)
        kfree(drvdata->desc.name);
        kfree(drvdata);
 
+       if (gpio_is_valid(drvdata->gpio))
+               gpio_free(drvdata->gpio);
+
        return 0;
 }
 
index a61018a2769822b287769897b43e26727b18676e..7803a320543b1da4f9da2d64ed33e0f108b2f634 100644 (file)
@@ -541,7 +541,7 @@ static struct i2c_driver lp3971_i2c_driver = {
 
 static int __init lp3971_module_init(void)
 {
-       int ret = -ENODEV;
+       int ret;
 
        ret = i2c_add_driver(&lp3971_i2c_driver);
        if (ret != 0)
index 8e14900eb686f3a3b2d75dab42b72dac0e2cc8bf..0803ffe6236d03526c66df8fbf6e9bdba0150b7f 100644 (file)
 #include <linux/mfd/pcf50633/core.h>
 #include <linux/mfd/pcf50633/pmic.h>
 
-#define PCF50633_REGULATOR(_name, _id)                 \
+#define PCF50633_REGULATOR(_name, _id, _n)             \
        {                                       \
                .name = _name,                  \
                .id = _id,                      \
                .ops = &pcf50633_regulator_ops, \
+               .n_voltages = _n, \
                .type = REGULATOR_VOLTAGE,      \
                .owner = THIS_MODULE,           \
        }
@@ -149,33 +150,20 @@ static int pcf50633_regulator_set_voltage(struct regulator_dev *rdev,
        return pcf50633_reg_write(pcf, regnr, volt_bits);
 }
 
-static int pcf50633_regulator_get_voltage(struct regulator_dev *rdev)
+static int pcf50633_regulator_voltage_value(enum pcf50633_regulator_id id,
+                                               u8 bits)
 {
-       struct pcf50633 *pcf;
-       int regulator_id, millivolts, volt_bits;
-       u8 regnr;
-
-       pcf = rdev_get_drvdata(rdev);;
+       int millivolts;
 
-       regulator_id = rdev_get_id(rdev);
-       if (regulator_id >= PCF50633_NUM_REGULATORS)
-               return -EINVAL;
-
-       regnr = pcf50633_regulator_registers[regulator_id];
-
-       volt_bits = pcf50633_reg_read(pcf, regnr);
-       if (volt_bits < 0)
-               return -1;
-
-       switch (regulator_id) {
+       switch (id) {
        case PCF50633_REGULATOR_AUTO:
-               millivolts = auto_voltage_value(volt_bits);
+               millivolts = auto_voltage_value(bits);
                break;
        case PCF50633_REGULATOR_DOWN1:
-               millivolts = down_voltage_value(volt_bits);
+               millivolts = down_voltage_value(bits);
                break;
        case PCF50633_REGULATOR_DOWN2:
-               millivolts = down_voltage_value(volt_bits);
+               millivolts = down_voltage_value(bits);
                break;
        case PCF50633_REGULATOR_LDO1:
        case PCF50633_REGULATOR_LDO2:
@@ -184,7 +172,7 @@ static int pcf50633_regulator_get_voltage(struct regulator_dev *rdev)
        case PCF50633_REGULATOR_LDO5:
        case PCF50633_REGULATOR_LDO6:
        case PCF50633_REGULATOR_HCLDO:
-               millivolts = ldo_voltage_value(volt_bits);
+               millivolts = ldo_voltage_value(bits);
                break;
        default:
                return -EINVAL;
@@ -193,6 +181,49 @@ static int pcf50633_regulator_get_voltage(struct regulator_dev *rdev)
        return millivolts * 1000;
 }
 
+static int pcf50633_regulator_get_voltage(struct regulator_dev *rdev)
+{
+       struct pcf50633 *pcf;
+       int regulator_id;
+       u8 volt_bits, regnr;
+
+       pcf = rdev_get_drvdata(rdev);
+
+       regulator_id = rdev_get_id(rdev);
+       if (regulator_id >= PCF50633_NUM_REGULATORS)
+               return -EINVAL;
+
+       regnr = pcf50633_regulator_registers[regulator_id];
+
+       volt_bits = pcf50633_reg_read(pcf, regnr);
+
+       return pcf50633_regulator_voltage_value(regulator_id, volt_bits);
+}
+
+static int pcf50633_regulator_list_voltage(struct regulator_dev *rdev,
+                                               unsigned int index)
+{
+       struct pcf50633 *pcf;
+       int regulator_id;
+
+       pcf = rdev_get_drvdata(rdev);
+
+       regulator_id = rdev_get_id(rdev);
+
+       switch (regulator_id) {
+       case PCF50633_REGULATOR_AUTO:
+               index += 0x2f;
+               break;
+       case PCF50633_REGULATOR_HCLDO:
+               index += 0x01;
+               break;
+       default:
+               break;
+       }
+
+       return pcf50633_regulator_voltage_value(regulator_id, index);
+}
+
 static int pcf50633_regulator_enable(struct regulator_dev *rdev)
 {
        struct pcf50633 *pcf = rdev_get_drvdata(rdev);
@@ -246,6 +277,7 @@ static int pcf50633_regulator_is_enabled(struct regulator_dev *rdev)
 static struct regulator_ops pcf50633_regulator_ops = {
        .set_voltage = pcf50633_regulator_set_voltage,
        .get_voltage = pcf50633_regulator_get_voltage,
+       .list_voltage = pcf50633_regulator_list_voltage,
        .enable = pcf50633_regulator_enable,
        .disable = pcf50633_regulator_disable,
        .is_enabled = pcf50633_regulator_is_enabled,
@@ -253,27 +285,27 @@ static struct regulator_ops pcf50633_regulator_ops = {
 
 static struct regulator_desc regulators[] = {
        [PCF50633_REGULATOR_AUTO] =
-               PCF50633_REGULATOR("auto", PCF50633_REGULATOR_AUTO),
+               PCF50633_REGULATOR("auto", PCF50633_REGULATOR_AUTO, 80),
        [PCF50633_REGULATOR_DOWN1] =
-               PCF50633_REGULATOR("down1", PCF50633_REGULATOR_DOWN1),
+               PCF50633_REGULATOR("down1", PCF50633_REGULATOR_DOWN1, 95),
        [PCF50633_REGULATOR_DOWN2] =
-               PCF50633_REGULATOR("down2", PCF50633_REGULATOR_DOWN2),
+               PCF50633_REGULATOR("down2", PCF50633_REGULATOR_DOWN2, 95),
        [PCF50633_REGULATOR_LDO1] =
-               PCF50633_REGULATOR("ldo1", PCF50633_REGULATOR_LDO1),
+               PCF50633_REGULATOR("ldo1", PCF50633_REGULATOR_LDO1, 27),
        [PCF50633_REGULATOR_LDO2] =
-               PCF50633_REGULATOR("ldo2", PCF50633_REGULATOR_LDO2),
+               PCF50633_REGULATOR("ldo2", PCF50633_REGULATOR_LDO2, 27),
        [PCF50633_REGULATOR_LDO3] =
-               PCF50633_REGULATOR("ldo3", PCF50633_REGULATOR_LDO3),
+               PCF50633_REGULATOR("ldo3", PCF50633_REGULATOR_LDO3, 27),
        [PCF50633_REGULATOR_LDO4] =
-               PCF50633_REGULATOR("ldo4", PCF50633_REGULATOR_LDO4),
+               PCF50633_REGULATOR("ldo4", PCF50633_REGULATOR_LDO4, 27),
        [PCF50633_REGULATOR_LDO5] =
-               PCF50633_REGULATOR("ldo5", PCF50633_REGULATOR_LDO5),
+               PCF50633_REGULATOR("ldo5", PCF50633_REGULATOR_LDO5, 27),
        [PCF50633_REGULATOR_LDO6] =
-               PCF50633_REGULATOR("ldo6", PCF50633_REGULATOR_LDO6),
+               PCF50633_REGULATOR("ldo6", PCF50633_REGULATOR_LDO6, 27),
        [PCF50633_REGULATOR_HCLDO] =
-               PCF50633_REGULATOR("hcldo", PCF50633_REGULATOR_HCLDO),
+               PCF50633_REGULATOR("hcldo", PCF50633_REGULATOR_HCLDO, 26),
        [PCF50633_REGULATOR_MEMLDO] =
-               PCF50633_REGULATOR("memldo", PCF50633_REGULATOR_MEMLDO),
+               PCF50633_REGULATOR("memldo", PCF50633_REGULATOR_MEMLDO, 0),
 };
 
 static int __devinit pcf50633_regulator_probe(struct platform_device *pdev)
diff --git a/drivers/regulator/tps65023-regulator.c b/drivers/regulator/tps65023-regulator.c
new file mode 100644 (file)
index 0000000..07fda0a
--- /dev/null
@@ -0,0 +1,632 @@
+/*
+ * tps65023-regulator.c
+ *
+ * Supports TPS65023 Regulator
+ *
+ * Copyright (C) 2009 Texas Instrument 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/module.h>
+#include <linux/init.h>
+#include <linux/err.h>
+#include <linux/platform_device.h>
+#include <linux/regulator/driver.h>
+#include <linux/regulator/machine.h>
+#include <linux/i2c.h>
+#include <linux/delay.h>
+
+/* Register definitions */
+#define        TPS65023_REG_VERSION            0
+#define        TPS65023_REG_PGOODZ             1
+#define        TPS65023_REG_MASK               2
+#define        TPS65023_REG_REG_CTRL           3
+#define        TPS65023_REG_CON_CTRL           4
+#define        TPS65023_REG_CON_CTRL2          5
+#define        TPS65023_REG_DEF_CORE           6
+#define        TPS65023_REG_DEFSLEW            7
+#define        TPS65023_REG_LDO_CTRL           8
+
+/* PGOODZ bitfields */
+#define        TPS65023_PGOODZ_PWRFAILZ        BIT(7)
+#define        TPS65023_PGOODZ_LOWBATTZ        BIT(6)
+#define        TPS65023_PGOODZ_VDCDC1          BIT(5)
+#define        TPS65023_PGOODZ_VDCDC2          BIT(4)
+#define        TPS65023_PGOODZ_VDCDC3          BIT(3)
+#define        TPS65023_PGOODZ_LDO2            BIT(2)
+#define        TPS65023_PGOODZ_LDO1            BIT(1)
+
+/* MASK bitfields */
+#define        TPS65023_MASK_PWRFAILZ          BIT(7)
+#define        TPS65023_MASK_LOWBATTZ          BIT(6)
+#define        TPS65023_MASK_VDCDC1            BIT(5)
+#define        TPS65023_MASK_VDCDC2            BIT(4)
+#define        TPS65023_MASK_VDCDC3            BIT(3)
+#define        TPS65023_MASK_LDO2              BIT(2)
+#define        TPS65023_MASK_LDO1              BIT(1)
+
+/* REG_CTRL bitfields */
+#define TPS65023_REG_CTRL_VDCDC1_EN    BIT(5)
+#define TPS65023_REG_CTRL_VDCDC2_EN    BIT(4)
+#define TPS65023_REG_CTRL_VDCDC3_EN    BIT(3)
+#define TPS65023_REG_CTRL_LDO2_EN      BIT(2)
+#define TPS65023_REG_CTRL_LDO1_EN      BIT(1)
+
+/* LDO_CTRL bitfields */
+#define TPS65023_LDO_CTRL_LDOx_SHIFT(ldo_id)   ((ldo_id)*4)
+#define TPS65023_LDO_CTRL_LDOx_MASK(ldo_id)    (0xF0 >> ((ldo_id)*4))
+
+/* Number of step-down converters available */
+#define TPS65023_NUM_DCDC              3
+/* Number of LDO voltage regulators  available */
+#define TPS65023_NUM_LDO               2
+/* Number of total regulators available */
+#define TPS65023_NUM_REGULATOR (TPS65023_NUM_DCDC + TPS65023_NUM_LDO)
+
+/* DCDCs */
+#define TPS65023_DCDC_1                        0
+#define TPS65023_DCDC_2                        1
+#define TPS65023_DCDC_3                        2
+/* LDOs */
+#define TPS65023_LDO_1                 3
+#define TPS65023_LDO_2                 4
+
+#define TPS65023_MAX_REG_ID            TPS65023_LDO_2
+
+/* Supported voltage values for regulators */
+static const u16 VDCDC1_VSEL_table[] = {
+       800, 825, 850, 875,
+       900, 925, 950, 975,
+       1000, 1025, 1050, 1075,
+       1100, 1125, 1150, 1175,
+       1200, 1225, 1250, 1275,
+       1300, 1325, 1350, 1375,
+       1400, 1425, 1450, 1475,
+       1500, 1525, 1550, 1600,
+};
+
+static const u16 LDO1_VSEL_table[] = {
+       1000, 1100, 1300, 1800,
+       2200, 2600, 2800, 3150,
+};
+
+static const u16 LDO2_VSEL_table[] = {
+       1050, 1200, 1300, 1800,
+       2500, 2800, 3000, 3300,
+};
+
+static unsigned int num_voltages[] = {ARRAY_SIZE(VDCDC1_VSEL_table),
+                               0, 0, ARRAY_SIZE(LDO1_VSEL_table),
+                               ARRAY_SIZE(LDO2_VSEL_table)};
+
+/* Regulator specific details */
+struct tps_info {
+       const char *name;
+       unsigned min_uV;
+       unsigned max_uV;
+       bool fixed;
+       u8 table_len;
+       const u16 *table;
+};
+
+/* PMIC details */
+struct tps_pmic {
+       struct regulator_desc desc[TPS65023_NUM_REGULATOR];
+       struct i2c_client *client;
+       struct regulator_dev *rdev[TPS65023_NUM_REGULATOR];
+       const struct tps_info *info[TPS65023_NUM_REGULATOR];
+       struct mutex io_lock;
+};
+
+static inline int tps_65023_read(struct tps_pmic *tps, u8 reg)
+{
+       return i2c_smbus_read_byte_data(tps->client, reg);
+}
+
+static inline int tps_65023_write(struct tps_pmic *tps, u8 reg, u8 val)
+{
+       return i2c_smbus_write_byte_data(tps->client, reg, val);
+}
+
+static int tps_65023_set_bits(struct tps_pmic *tps, u8 reg, u8 mask)
+{
+       int err, data;
+
+       mutex_lock(&tps->io_lock);
+
+       data = tps_65023_read(tps, reg);
+       if (data < 0) {
+               dev_err(&tps->client->dev, "Read from reg 0x%x failed\n", reg);
+               err = data;
+               goto out;
+       }
+
+       data |= mask;
+       err = tps_65023_write(tps, reg, data);
+       if (err)
+               dev_err(&tps->client->dev, "Write for reg 0x%x failed\n", reg);
+
+out:
+       mutex_unlock(&tps->io_lock);
+       return err;
+}
+
+static int tps_65023_clear_bits(struct tps_pmic *tps, u8 reg, u8 mask)
+{
+       int err, data;
+
+       mutex_lock(&tps->io_lock);
+
+       data = tps_65023_read(tps, reg);
+       if (data < 0) {
+               dev_err(&tps->client->dev, "Read from reg 0x%x failed\n", reg);
+               err = data;
+               goto out;
+       }
+
+       data &= ~mask;
+
+       err = tps_65023_write(tps, reg, data);
+       if (err)
+               dev_err(&tps->client->dev, "Write for reg 0x%x failed\n", reg);
+
+out:
+       mutex_unlock(&tps->io_lock);
+       return err;
+
+}
+
+static int tps_65023_reg_read(struct tps_pmic *tps, u8 reg)
+{
+       int data;
+
+       mutex_lock(&tps->io_lock);
+
+       data = tps_65023_read(tps, reg);
+       if (data < 0)
+               dev_err(&tps->client->dev, "Read from reg 0x%x failed\n", reg);
+
+       mutex_unlock(&tps->io_lock);
+       return data;
+}
+
+static int tps_65023_reg_write(struct tps_pmic *tps, u8 reg, u8 val)
+{
+       int err;
+
+       mutex_lock(&tps->io_lock);
+
+       err = tps_65023_write(tps, reg, val);
+       if (err < 0)
+               dev_err(&tps->client->dev, "Write for reg 0x%x failed\n", reg);
+
+       mutex_unlock(&tps->io_lock);
+       return err;
+}
+
+static int tps65023_dcdc_is_enabled(struct regulator_dev *dev)
+{
+       struct tps_pmic *tps = rdev_get_drvdata(dev);
+       int data, dcdc = rdev_get_id(dev);
+       u8 shift;
+
+       if (dcdc < TPS65023_DCDC_1 || dcdc > TPS65023_DCDC_3)
+               return -EINVAL;
+
+       shift = TPS65023_NUM_REGULATOR - dcdc;
+       data = tps_65023_reg_read(tps, TPS65023_REG_REG_CTRL);
+
+       if (data < 0)
+               return data;
+       else
+               return (data & 1<<shift) ? 1 : 0;
+}
+
+static int tps65023_ldo_is_enabled(struct regulator_dev *dev)
+{
+       struct tps_pmic *tps = rdev_get_drvdata(dev);
+       int data, ldo = rdev_get_id(dev);
+       u8 shift;
+
+       if (ldo < TPS65023_LDO_1 || ldo > TPS65023_LDO_2)
+               return -EINVAL;
+
+       shift = (ldo == TPS65023_LDO_1 ? 1 : 2);
+       data = tps_65023_reg_read(tps, TPS65023_REG_REG_CTRL);
+
+       if (data < 0)
+               return data;
+       else
+               return (data & 1<<shift) ? 1 : 0;
+}
+
+static int tps65023_dcdc_enable(struct regulator_dev *dev)
+{
+       struct tps_pmic *tps = rdev_get_drvdata(dev);
+       int dcdc = rdev_get_id(dev);
+       u8 shift;
+
+       if (dcdc < TPS65023_DCDC_1 || dcdc > TPS65023_DCDC_3)
+               return -EINVAL;
+
+       shift = TPS65023_NUM_REGULATOR - dcdc;
+       return tps_65023_set_bits(tps, TPS65023_REG_REG_CTRL, 1 << shift);
+}
+
+static int tps65023_dcdc_disable(struct regulator_dev *dev)
+{
+       struct tps_pmic *tps = rdev_get_drvdata(dev);
+       int dcdc = rdev_get_id(dev);
+       u8 shift;
+
+       if (dcdc < TPS65023_DCDC_1 || dcdc > TPS65023_DCDC_3)
+               return -EINVAL;
+
+       shift = TPS65023_NUM_REGULATOR - dcdc;
+       return tps_65023_clear_bits(tps, TPS65023_REG_REG_CTRL, 1 << shift);
+}
+
+static int tps65023_ldo_enable(struct regulator_dev *dev)
+{
+       struct tps_pmic *tps = rdev_get_drvdata(dev);
+       int ldo = rdev_get_id(dev);
+       u8 shift;
+
+       if (ldo < TPS65023_LDO_1 || ldo > TPS65023_LDO_2)
+               return -EINVAL;
+
+       shift = (ldo == TPS65023_LDO_1 ? 1 : 2);
+       return tps_65023_set_bits(tps, TPS65023_REG_REG_CTRL, 1 << shift);
+}
+
+static int tps65023_ldo_disable(struct regulator_dev *dev)
+{
+       struct tps_pmic *tps = rdev_get_drvdata(dev);
+       int ldo = rdev_get_id(dev);
+       u8 shift;
+
+       if (ldo < TPS65023_LDO_1 || ldo > TPS65023_LDO_2)
+               return -EINVAL;
+
+       shift = (ldo == TPS65023_LDO_1 ? 1 : 2);
+       return tps_65023_clear_bits(tps, TPS65023_REG_REG_CTRL, 1 << shift);
+}
+
+static int tps65023_dcdc_get_voltage(struct regulator_dev *dev)
+{
+       struct tps_pmic *tps = rdev_get_drvdata(dev);
+       int data, dcdc = rdev_get_id(dev);
+
+       if (dcdc < TPS65023_DCDC_1 || dcdc > TPS65023_DCDC_3)
+               return -EINVAL;
+
+       if (dcdc == TPS65023_DCDC_1) {
+               data = tps_65023_reg_read(tps, TPS65023_REG_DEF_CORE);
+               if (data < 0)
+                       return data;
+               data &= (tps->info[dcdc]->table_len - 1);
+               return tps->info[dcdc]->table[data] * 1000;
+       } else
+               return tps->info[dcdc]->min_uV;
+}
+
+static int tps65023_dcdc_set_voltage(struct regulator_dev *dev,
+                               int min_uV, int max_uV)
+{
+       struct tps_pmic *tps = rdev_get_drvdata(dev);
+       int dcdc = rdev_get_id(dev);
+       int vsel;
+
+       if (dcdc != TPS65023_DCDC_1)
+               return -EINVAL;
+
+       if (min_uV < tps->info[dcdc]->min_uV
+                       || min_uV > tps->info[dcdc]->max_uV)
+               return -EINVAL;
+       if (max_uV < tps->info[dcdc]->min_uV
+                       || max_uV > tps->info[dcdc]->max_uV)
+               return -EINVAL;
+
+       for (vsel = 0; vsel < tps->info[dcdc]->table_len; vsel++) {
+               int mV = tps->info[dcdc]->table[vsel];
+               int uV = mV * 1000;
+
+               /* Break at the first in-range value */
+               if (min_uV <= uV && uV <= max_uV)
+                       break;
+       }
+
+       /* write to the register in case we found a match */
+       if (vsel == tps->info[dcdc]->table_len)
+               return -EINVAL;
+       else
+               return tps_65023_reg_write(tps, TPS65023_REG_DEF_CORE, vsel);
+}
+
+static int tps65023_ldo_get_voltage(struct regulator_dev *dev)
+{
+       struct tps_pmic *tps = rdev_get_drvdata(dev);
+       int data, ldo = rdev_get_id(dev);
+
+       if (ldo < TPS65023_LDO_1 || ldo > TPS65023_LDO_2)
+               return -EINVAL;
+
+       data = tps_65023_reg_read(tps, TPS65023_REG_LDO_CTRL);
+       if (data < 0)
+               return data;
+
+       data >>= (TPS65023_LDO_CTRL_LDOx_SHIFT(ldo - TPS65023_LDO_1));
+       data &= (tps->info[ldo]->table_len - 1);
+       return tps->info[ldo]->table[data] * 1000;
+}
+
+static int tps65023_ldo_set_voltage(struct regulator_dev *dev,
+                               int min_uV, int max_uV)
+{
+       struct tps_pmic *tps = rdev_get_drvdata(dev);
+       int data, vsel, ldo = rdev_get_id(dev);
+
+       if (ldo < TPS65023_LDO_1 || ldo > TPS65023_LDO_2)
+               return -EINVAL;
+
+       if (min_uV < tps->info[ldo]->min_uV || min_uV > tps->info[ldo]->max_uV)
+               return -EINVAL;
+       if (max_uV < tps->info[ldo]->min_uV || max_uV > tps->info[ldo]->max_uV)
+               return -EINVAL;
+
+       for (vsel = 0; vsel < tps->info[ldo]->table_len; vsel++) {
+               int mV = tps->info[ldo]->table[vsel];
+               int uV = mV * 1000;
+
+               /* Break at the first in-range value */
+               if (min_uV <= uV && uV <= max_uV)
+                       break;
+       }
+
+       if (vsel == tps->info[ldo]->table_len)
+               return -EINVAL;
+
+       data = tps_65023_reg_read(tps, TPS65023_REG_LDO_CTRL);
+       if (data < 0)
+               return data;
+
+       data &= TPS65023_LDO_CTRL_LDOx_MASK(ldo - TPS65023_LDO_1);
+       data |= (vsel << (TPS65023_LDO_CTRL_LDOx_SHIFT(ldo - TPS65023_LDO_1)));
+       return tps_65023_reg_write(tps, TPS65023_REG_LDO_CTRL, data);
+}
+
+static int tps65023_dcdc_list_voltage(struct regulator_dev *dev,
+                                       unsigned selector)
+{
+       struct tps_pmic *tps = rdev_get_drvdata(dev);
+       int dcdc = rdev_get_id(dev);
+
+       if (dcdc < TPS65023_DCDC_1 || dcdc > TPS65023_DCDC_3)
+               return -EINVAL;
+
+       if (dcdc == TPS65023_DCDC_1) {
+               if (selector >= tps->info[dcdc]->table_len)
+                       return -EINVAL;
+               else
+                       return tps->info[dcdc]->table[selector] * 1000;
+       } else
+               return tps->info[dcdc]->min_uV;
+}
+
+static int tps65023_ldo_list_voltage(struct regulator_dev *dev,
+                                       unsigned selector)
+{
+       struct tps_pmic *tps = rdev_get_drvdata(dev);
+       int ldo = rdev_get_id(dev);
+
+       if (ldo < TPS65023_LDO_1 || ldo > TPS65023_LDO_2)
+               return -EINVAL;
+
+       if (selector >= tps->info[ldo]->table_len)
+               return -EINVAL;
+       else
+               return tps->info[ldo]->table[selector] * 1000;
+}
+
+/* Operations permitted on VDCDCx */
+static struct regulator_ops tps65023_dcdc_ops = {
+       .is_enabled = tps65023_dcdc_is_enabled,
+       .enable = tps65023_dcdc_enable,
+       .disable = tps65023_dcdc_disable,
+       .get_voltage = tps65023_dcdc_get_voltage,
+       .set_voltage = tps65023_dcdc_set_voltage,
+       .list_voltage = tps65023_dcdc_list_voltage,
+};
+
+/* Operations permitted on LDOx */
+static struct regulator_ops tps65023_ldo_ops = {
+       .is_enabled = tps65023_ldo_is_enabled,
+       .enable = tps65023_ldo_enable,
+       .disable = tps65023_ldo_disable,
+       .get_voltage = tps65023_ldo_get_voltage,
+       .set_voltage = tps65023_ldo_set_voltage,
+       .list_voltage = tps65023_ldo_list_voltage,
+};
+
+static
+int tps_65023_probe(struct i2c_client *client, const struct i2c_device_id *id)
+{
+       static int desc_id;
+       const struct tps_info *info = (void *)id->driver_data;
+       struct regulator_init_data *init_data;
+       struct regulator_dev *rdev;
+       struct tps_pmic *tps;
+       int i;
+
+       if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
+               return -EIO;
+
+       /**
+        * init_data points to array of regulator_init structures
+        * coming from the board-evm file.
+        */
+       init_data = client->dev.platform_data;
+
+       if (!init_data)
+               return -EIO;
+
+       tps = kzalloc(sizeof(*tps), GFP_KERNEL);
+       if (!tps)
+               return -ENOMEM;
+
+       mutex_init(&tps->io_lock);
+
+       /* common for all regulators */
+       tps->client = client;
+
+       for (i = 0; i < TPS65023_NUM_REGULATOR; i++, info++, init_data++) {
+               /* Store regulator specific information */
+               tps->info[i] = info;
+
+               tps->desc[i].name = info->name;
+               tps->desc[i].id = desc_id++;
+               tps->desc[i].n_voltages = num_voltages[i];
+               tps->desc[i].ops = (i > TPS65023_DCDC_3 ?
+                                       &tps65023_ldo_ops : &tps65023_dcdc_ops);
+               tps->desc[i].type = REGULATOR_VOLTAGE;
+               tps->desc[i].owner = THIS_MODULE;
+
+               /* Register the regulators */
+               rdev = regulator_register(&tps->desc[i], &client->dev,
+                                                               init_data, tps);
+               if (IS_ERR(rdev)) {
+                       dev_err(&client->dev, "failed to register %s\n",
+                               id->name);
+
+                       /* Unregister */
+                       while (i)
+                               regulator_unregister(tps->rdev[--i]);
+
+                       tps->client = NULL;
+
+                       /* clear the client data in i2c */
+                       i2c_set_clientdata(client, NULL);
+                       kfree(tps);
+                       return PTR_ERR(rdev);
+               }
+
+               /* Save regulator for cleanup */
+               tps->rdev[i] = rdev;
+       }
+
+       i2c_set_clientdata(client, tps);
+
+       return 0;
+}
+
+/**
+ * tps_65023_remove - TPS65023 driver i2c remove handler
+ * @client: i2c driver client device structure
+ *
+ * Unregister TPS driver as an i2c client device driver
+ */
+static int __devexit tps_65023_remove(struct i2c_client *client)
+{
+       struct tps_pmic *tps = i2c_get_clientdata(client);
+       int i;
+
+       for (i = 0; i < TPS65023_NUM_REGULATOR; i++)
+               regulator_unregister(tps->rdev[i]);
+
+       tps->client = NULL;
+
+       /* clear the client data in i2c */
+       i2c_set_clientdata(client, NULL);
+       kfree(tps);
+
+       return 0;
+}
+
+static const struct tps_info tps65023_regs[] = {
+       {
+               .name = "VDCDC1",
+               .min_uV =  800000,
+               .max_uV = 1600000,
+               .table_len = ARRAY_SIZE(VDCDC1_VSEL_table),
+               .table = VDCDC1_VSEL_table,
+       },
+       {
+               .name = "VDCDC2",
+               .min_uV =  3300000,
+               .max_uV = 3300000,
+               .fixed = 1,
+       },
+       {
+               .name = "VDCDC3",
+               .min_uV =  1800000,
+               .max_uV = 1800000,
+               .fixed = 1,
+       },
+       {
+               .name = "LDO1",
+               .min_uV = 1000000,
+               .max_uV = 3150000,
+               .table_len = ARRAY_SIZE(LDO1_VSEL_table),
+               .table = LDO1_VSEL_table,
+       },
+       {
+               .name = "LDO2",
+               .min_uV = 1050000,
+               .max_uV = 3300000,
+               .table_len = ARRAY_SIZE(LDO2_VSEL_table),
+               .table = LDO2_VSEL_table,
+       },
+};
+
+static const struct i2c_device_id tps_65023_id[] = {
+       {.name = "tps65023",
+       .driver_data = (unsigned long) tps65023_regs,},
+       { },
+};
+
+MODULE_DEVICE_TABLE(i2c, tps_65023_id);
+
+static struct i2c_driver tps_65023_i2c_driver = {
+       .driver = {
+               .name = "tps65023",
+               .owner = THIS_MODULE,
+       },
+       .probe = tps_65023_probe,
+       .remove = __devexit_p(tps_65023_remove),
+       .id_table = tps_65023_id,
+};
+
+/**
+ * tps_65023_init
+ *
+ * Module init function
+ */
+static int __init tps_65023_init(void)
+{
+       return i2c_add_driver(&tps_65023_i2c_driver);
+}
+subsys_initcall(tps_65023_init);
+
+/**
+ * tps_65023_cleanup
+ *
+ * Module exit function
+ */
+static void __exit tps_65023_cleanup(void)
+{
+       i2c_del_driver(&tps_65023_i2c_driver);
+}
+module_exit(tps_65023_cleanup);
+
+MODULE_AUTHOR("Texas Instruments");
+MODULE_DESCRIPTION("TPS65023 voltage regulator driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/regulator/tps6507x-regulator.c b/drivers/regulator/tps6507x-regulator.c
new file mode 100644 (file)
index 0000000..f8a6dfb
--- /dev/null
@@ -0,0 +1,714 @@
+/*
+ * tps6507x-regulator.c
+ *
+ * Regulator driver for TPS65073 PMIC
+ *
+ * Copyright (C) 2009 Texas Instrument 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/module.h>
+#include <linux/init.h>
+#include <linux/err.h>
+#include <linux/platform_device.h>
+#include <linux/regulator/driver.h>
+#include <linux/regulator/machine.h>
+#include <linux/i2c.h>
+#include <linux/delay.h>
+
+/* Register definitions */
+#define        TPS6507X_REG_PPATH1                             0X01
+#define        TPS6507X_REG_INT                                0X02
+#define        TPS6507X_REG_CHGCONFIG0                         0X03
+#define        TPS6507X_REG_CHGCONFIG1                         0X04
+#define        TPS6507X_REG_CHGCONFIG2                         0X05
+#define        TPS6507X_REG_CHGCONFIG3                         0X06
+#define        TPS6507X_REG_REG_ADCONFIG                       0X07
+#define        TPS6507X_REG_TSCMODE                            0X08
+#define        TPS6507X_REG_ADRESULT_1                         0X09
+#define        TPS6507X_REG_ADRESULT_2                         0X0A
+#define        TPS6507X_REG_PGOOD                              0X0B
+#define        TPS6507X_REG_PGOODMASK                          0X0C
+#define        TPS6507X_REG_CON_CTRL1                          0X0D
+#define        TPS6507X_REG_CON_CTRL2                          0X0E
+#define        TPS6507X_REG_CON_CTRL3                          0X0F
+#define        TPS6507X_REG_DEFDCDC1                           0X10
+#define        TPS6507X_REG_DEFDCDC2_LOW                       0X11
+#define        TPS6507X_REG_DEFDCDC2_HIGH                      0X12
+#define        TPS6507X_REG_DEFDCDC3_LOW                       0X13
+#define        TPS6507X_REG_DEFDCDC3_HIGH                      0X14
+#define        TPS6507X_REG_DEFSLEW                            0X15
+#define        TPS6507X_REG_LDO_CTRL1                          0X16
+#define        TPS6507X_REG_DEFLDO2                            0X17
+#define        TPS6507X_REG_WLED_CTRL1                         0X18
+#define        TPS6507X_REG_WLED_CTRL2                         0X19
+
+/* CON_CTRL1 bitfields */
+#define        TPS6507X_CON_CTRL1_DCDC1_ENABLE         BIT(4)
+#define        TPS6507X_CON_CTRL1_DCDC2_ENABLE         BIT(3)
+#define        TPS6507X_CON_CTRL1_DCDC3_ENABLE         BIT(2)
+#define        TPS6507X_CON_CTRL1_LDO1_ENABLE          BIT(1)
+#define        TPS6507X_CON_CTRL1_LDO2_ENABLE          BIT(0)
+
+/* DEFDCDC1 bitfields */
+#define TPS6507X_DEFDCDC1_DCDC1_EXT_ADJ_EN     BIT(7)
+#define TPS6507X_DEFDCDC1_DCDC1_MASK           0X3F
+
+/* DEFDCDC2_LOW bitfields */
+#define TPS6507X_DEFDCDC2_LOW_DCDC2_MASK       0X3F
+
+/* DEFDCDC2_HIGH bitfields */
+#define TPS6507X_DEFDCDC2_HIGH_DCDC2_MASK      0X3F
+
+/* DEFDCDC3_LOW bitfields */
+#define TPS6507X_DEFDCDC3_LOW_DCDC3_MASK       0X3F
+
+/* DEFDCDC3_HIGH bitfields */
+#define TPS6507X_DEFDCDC3_HIGH_DCDC3_MASK      0X3F
+
+/* TPS6507X_REG_LDO_CTRL1 bitfields */
+#define TPS6507X_REG_LDO_CTRL1_LDO1_MASK       0X0F
+
+/* TPS6507X_REG_DEFLDO2 bitfields */
+#define TPS6507X_REG_DEFLDO2_LDO2_MASK         0X3F
+
+/* VDCDC MASK */
+#define TPS6507X_DEFDCDCX_DCDC_MASK            0X3F
+
+/* DCDC's */
+#define TPS6507X_DCDC_1                                0
+#define TPS6507X_DCDC_2                                1
+#define TPS6507X_DCDC_3                                2
+/* LDOs */
+#define TPS6507X_LDO_1                         3
+#define TPS6507X_LDO_2                         4
+
+#define TPS6507X_MAX_REG_ID                    TPS6507X_LDO_2
+
+/* Number of step-down converters available */
+#define TPS6507X_NUM_DCDC                      3
+/* Number of LDO voltage regulators  available */
+#define TPS6507X_NUM_LDO                       2
+/* Number of total regulators available */
+#define TPS6507X_NUM_REGULATOR         (TPS6507X_NUM_DCDC + TPS6507X_NUM_LDO)
+
+/* Supported voltage values for regulators (in milliVolts) */
+static const u16 VDCDCx_VSEL_table[] = {
+       725, 750, 775, 800,
+       825, 850, 875, 900,
+       925, 950, 975, 1000,
+       1025, 1050, 1075, 1100,
+       1125, 1150, 1175, 1200,
+       1225, 1250, 1275, 1300,
+       1325, 1350, 1375, 1400,
+       1425, 1450, 1475, 1500,
+       1550, 1600, 1650, 1700,
+       1750, 1800, 1850, 1900,
+       1950, 2000, 2050, 2100,
+       2150, 2200, 2250, 2300,
+       2350, 2400, 2450, 2500,
+       2550, 2600, 2650, 2700,
+       2750, 2800, 2850, 2900,
+       3000, 3100, 3200, 3300,
+};
+
+static const u16 LDO1_VSEL_table[] = {
+       1000, 1100, 1200, 1250,
+       1300, 1350, 1400, 1500,
+       1600, 1800, 2500, 2750,
+       2800, 3000, 3100, 3300,
+};
+
+static const u16 LDO2_VSEL_table[] = {
+       725, 750, 775, 800,
+       825, 850, 875, 900,
+       925, 950, 975, 1000,
+       1025, 1050, 1075, 1100,
+       1125, 1150, 1175, 1200,
+       1225, 1250, 1275, 1300,
+       1325, 1350, 1375, 1400,
+       1425, 1450, 1475, 1500,
+       1550, 1600, 1650, 1700,
+       1750, 1800, 1850, 1900,
+       1950, 2000, 2050, 2100,
+       2150, 2200, 2250, 2300,
+       2350, 2400, 2450, 2500,
+       2550, 2600, 2650, 2700,
+       2750, 2800, 2850, 2900,
+       3000, 3100, 3200, 3300,
+};
+
+static unsigned int num_voltages[] = {ARRAY_SIZE(VDCDCx_VSEL_table),
+                               ARRAY_SIZE(VDCDCx_VSEL_table),
+                               ARRAY_SIZE(VDCDCx_VSEL_table),
+                               ARRAY_SIZE(LDO1_VSEL_table),
+                               ARRAY_SIZE(LDO2_VSEL_table)};
+
+struct tps_info {
+       const char *name;
+       unsigned min_uV;
+       unsigned max_uV;
+       u8 table_len;
+       const u16 *table;
+};
+
+struct tps_pmic {
+       struct regulator_desc desc[TPS6507X_NUM_REGULATOR];
+       struct i2c_client *client;
+       struct regulator_dev *rdev[TPS6507X_NUM_REGULATOR];
+       const struct tps_info *info[TPS6507X_NUM_REGULATOR];
+       struct mutex io_lock;
+};
+
+static inline int tps_6507x_read(struct tps_pmic *tps, u8 reg)
+{
+       return i2c_smbus_read_byte_data(tps->client, reg);
+}
+
+static inline int tps_6507x_write(struct tps_pmic *tps, u8 reg, u8 val)
+{
+       return i2c_smbus_write_byte_data(tps->client, reg, val);
+}
+
+static int tps_6507x_set_bits(struct tps_pmic *tps, u8 reg, u8 mask)
+{
+       int err, data;
+
+       mutex_lock(&tps->io_lock);
+
+       data = tps_6507x_read(tps, reg);
+       if (data < 0) {
+               dev_err(&tps->client->dev, "Read from reg 0x%x failed\n", reg);
+               err = data;
+               goto out;
+       }
+
+       data |= mask;
+       err = tps_6507x_write(tps, reg, data);
+       if (err)
+               dev_err(&tps->client->dev, "Write for reg 0x%x failed\n", reg);
+
+out:
+       mutex_unlock(&tps->io_lock);
+       return err;
+}
+
+static int tps_6507x_clear_bits(struct tps_pmic *tps, u8 reg, u8 mask)
+{
+       int err, data;
+
+       mutex_lock(&tps->io_lock);
+
+       data = tps_6507x_read(tps, reg);
+       if (data < 0) {
+               dev_err(&tps->client->dev, "Read from reg 0x%x failed\n", reg);
+               err = data;
+               goto out;
+       }
+
+       data &= ~mask;
+       err = tps_6507x_write(tps, reg, data);
+       if (err)
+               dev_err(&tps->client->dev, "Write for reg 0x%x failed\n", reg);
+
+out:
+       mutex_unlock(&tps->io_lock);
+       return err;
+}
+
+static int tps_6507x_reg_read(struct tps_pmic *tps, u8 reg)
+{
+       int data;
+
+       mutex_lock(&tps->io_lock);
+
+       data = tps_6507x_read(tps, reg);
+       if (data < 0)
+               dev_err(&tps->client->dev, "Read from reg 0x%x failed\n", reg);
+
+       mutex_unlock(&tps->io_lock);
+       return data;
+}
+
+static int tps_6507x_reg_write(struct tps_pmic *tps, u8 reg, u8 val)
+{
+       int err;
+
+       mutex_lock(&tps->io_lock);
+
+       err = tps_6507x_write(tps, reg, val);
+       if (err < 0)
+               dev_err(&tps->client->dev, "Write for reg 0x%x failed\n", reg);
+
+       mutex_unlock(&tps->io_lock);
+       return err;
+}
+
+static int tps6507x_dcdc_is_enabled(struct regulator_dev *dev)
+{
+       struct tps_pmic *tps = rdev_get_drvdata(dev);
+       int data, dcdc = rdev_get_id(dev);
+       u8 shift;
+
+       if (dcdc < TPS6507X_DCDC_1 || dcdc > TPS6507X_DCDC_3)
+               return -EINVAL;
+
+       shift = TPS6507X_MAX_REG_ID - dcdc;
+       data = tps_6507x_reg_read(tps, TPS6507X_REG_CON_CTRL1);
+
+       if (data < 0)
+               return data;
+       else
+               return (data & 1<<shift) ? 1 : 0;
+}
+
+static int tps6507x_ldo_is_enabled(struct regulator_dev *dev)
+{
+       struct tps_pmic *tps = rdev_get_drvdata(dev);
+       int data, ldo = rdev_get_id(dev);
+       u8 shift;
+
+       if (ldo < TPS6507X_LDO_1 || ldo > TPS6507X_LDO_2)
+               return -EINVAL;
+
+       shift = TPS6507X_MAX_REG_ID - ldo;
+       data = tps_6507x_reg_read(tps, TPS6507X_REG_CON_CTRL1);
+
+       if (data < 0)
+               return data;
+       else
+               return (data & 1<<shift) ? 1 : 0;
+}
+
+static int tps6507x_dcdc_enable(struct regulator_dev *dev)
+{
+       struct tps_pmic *tps = rdev_get_drvdata(dev);
+       int dcdc = rdev_get_id(dev);
+       u8 shift;
+
+       if (dcdc < TPS6507X_DCDC_1 || dcdc > TPS6507X_DCDC_3)
+               return -EINVAL;
+
+       shift = TPS6507X_MAX_REG_ID - dcdc;
+       return tps_6507x_set_bits(tps, TPS6507X_REG_CON_CTRL1, 1 << shift);
+}
+
+static int tps6507x_dcdc_disable(struct regulator_dev *dev)
+{
+       struct tps_pmic *tps = rdev_get_drvdata(dev);
+       int dcdc = rdev_get_id(dev);
+       u8 shift;
+
+       if (dcdc < TPS6507X_DCDC_1 || dcdc > TPS6507X_DCDC_3)
+               return -EINVAL;
+
+       shift = TPS6507X_MAX_REG_ID - dcdc;
+       return tps_6507x_clear_bits(tps, TPS6507X_REG_CON_CTRL1, 1 << shift);
+}
+
+static int tps6507x_ldo_enable(struct regulator_dev *dev)
+{
+       struct tps_pmic *tps = rdev_get_drvdata(dev);
+       int ldo = rdev_get_id(dev);
+       u8 shift;
+
+       if (ldo < TPS6507X_LDO_1 || ldo > TPS6507X_LDO_2)
+               return -EINVAL;
+
+       shift = TPS6507X_MAX_REG_ID - ldo;
+       return tps_6507x_set_bits(tps, TPS6507X_REG_CON_CTRL1, 1 << shift);
+}
+
+static int tps6507x_ldo_disable(struct regulator_dev *dev)
+{
+       struct tps_pmic *tps = rdev_get_drvdata(dev);
+       int ldo = rdev_get_id(dev);
+       u8 shift;
+
+       if (ldo < TPS6507X_LDO_1 || ldo > TPS6507X_LDO_2)
+               return -EINVAL;
+
+       shift = TPS6507X_MAX_REG_ID - ldo;
+       return tps_6507x_clear_bits(tps, TPS6507X_REG_CON_CTRL1, 1 << shift);
+}
+
+static int tps6507x_dcdc_get_voltage(struct regulator_dev *dev)
+{
+       struct tps_pmic *tps = rdev_get_drvdata(dev);
+       int data, dcdc = rdev_get_id(dev);
+       u8 reg;
+
+       switch (dcdc) {
+       case TPS6507X_DCDC_1:
+               reg = TPS6507X_REG_DEFDCDC1;
+               break;
+       case TPS6507X_DCDC_2:
+               reg = TPS6507X_REG_DEFDCDC2_LOW;
+               break;
+       case TPS6507X_DCDC_3:
+               reg = TPS6507X_REG_DEFDCDC3_LOW;
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       data = tps_6507x_reg_read(tps, reg);
+       if (data < 0)
+               return data;
+
+       data &= TPS6507X_DEFDCDCX_DCDC_MASK;
+       return tps->info[dcdc]->table[data] * 1000;
+}
+
+static int tps6507x_dcdc_set_voltage(struct regulator_dev *dev,
+                               int min_uV, int max_uV)
+{
+       struct tps_pmic *tps = rdev_get_drvdata(dev);
+       int data, vsel, dcdc = rdev_get_id(dev);
+       u8 reg;
+
+       switch (dcdc) {
+       case TPS6507X_DCDC_1:
+               reg = TPS6507X_REG_DEFDCDC1;
+               break;
+       case TPS6507X_DCDC_2:
+               reg = TPS6507X_REG_DEFDCDC2_LOW;
+               break;
+       case TPS6507X_DCDC_3:
+               reg = TPS6507X_REG_DEFDCDC3_LOW;
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       if (min_uV < tps->info[dcdc]->min_uV
+               || min_uV > tps->info[dcdc]->max_uV)
+               return -EINVAL;
+       if (max_uV < tps->info[dcdc]->min_uV
+               || max_uV > tps->info[dcdc]->max_uV)
+               return -EINVAL;
+
+       for (vsel = 0; vsel < tps->info[dcdc]->table_len; vsel++) {
+               int mV = tps->info[dcdc]->table[vsel];
+               int uV = mV * 1000;
+
+               /* Break at the first in-range value */
+               if (min_uV <= uV && uV <= max_uV)
+                       break;
+       }
+
+       /* write to the register in case we found a match */
+       if (vsel == tps->info[dcdc]->table_len)
+               return -EINVAL;
+
+       data = tps_6507x_reg_read(tps, reg);
+       if (data < 0)
+               return data;
+
+       data &= ~TPS6507X_DEFDCDCX_DCDC_MASK;
+       data |= vsel;
+
+       return tps_6507x_reg_write(tps, reg, data);
+}
+
+static int tps6507x_ldo_get_voltage(struct regulator_dev *dev)
+{
+       struct tps_pmic *tps = rdev_get_drvdata(dev);
+       int data, ldo = rdev_get_id(dev);
+       u8 reg, mask;
+
+       if (ldo < TPS6507X_LDO_1 || ldo > TPS6507X_LDO_2)
+               return -EINVAL;
+       else {
+               reg = (ldo == TPS6507X_LDO_1 ?
+                       TPS6507X_REG_LDO_CTRL1 : TPS6507X_REG_DEFLDO2);
+               mask = (ldo == TPS6507X_LDO_1 ?
+                       TPS6507X_REG_LDO_CTRL1_LDO1_MASK :
+                               TPS6507X_REG_DEFLDO2_LDO2_MASK);
+       }
+
+       data = tps_6507x_reg_read(tps, reg);
+       if (data < 0)
+               return data;
+
+       data &= mask;
+       return tps->info[ldo]->table[data] * 1000;
+}
+
+static int tps6507x_ldo_set_voltage(struct regulator_dev *dev,
+                               int min_uV, int max_uV)
+{
+       struct tps_pmic *tps = rdev_get_drvdata(dev);
+       int data, vsel, ldo = rdev_get_id(dev);
+       u8 reg, mask;
+
+       if (ldo < TPS6507X_LDO_1 || ldo > TPS6507X_LDO_2)
+               return -EINVAL;
+       else {
+               reg = (ldo == TPS6507X_LDO_1 ?
+                       TPS6507X_REG_LDO_CTRL1 : TPS6507X_REG_DEFLDO2);
+               mask = (ldo == TPS6507X_LDO_1 ?
+                       TPS6507X_REG_LDO_CTRL1_LDO1_MASK :
+                               TPS6507X_REG_DEFLDO2_LDO2_MASK);
+       }
+
+       if (min_uV < tps->info[ldo]->min_uV || min_uV > tps->info[ldo]->max_uV)
+               return -EINVAL;
+       if (max_uV < tps->info[ldo]->min_uV || max_uV > tps->info[ldo]->max_uV)
+               return -EINVAL;
+
+       for (vsel = 0; vsel < tps->info[ldo]->table_len; vsel++) {
+               int mV = tps->info[ldo]->table[vsel];
+               int uV = mV * 1000;
+
+               /* Break at the first in-range value */
+               if (min_uV <= uV && uV <= max_uV)
+                       break;
+       }
+
+       if (vsel == tps->info[ldo]->table_len)
+               return -EINVAL;
+
+       data = tps_6507x_reg_read(tps, reg);
+       if (data < 0)
+               return data;
+
+       data &= ~mask;
+       data |= vsel;
+
+       return tps_6507x_reg_write(tps, reg, data);
+}
+
+static int tps6507x_dcdc_list_voltage(struct regulator_dev *dev,
+                                       unsigned selector)
+{
+       struct tps_pmic *tps = rdev_get_drvdata(dev);
+       int dcdc = rdev_get_id(dev);
+
+       if (dcdc < TPS6507X_DCDC_1 || dcdc > TPS6507X_DCDC_3)
+               return -EINVAL;
+
+       if (selector >= tps->info[dcdc]->table_len)
+               return -EINVAL;
+       else
+               return tps->info[dcdc]->table[selector] * 1000;
+}
+
+static int tps6507x_ldo_list_voltage(struct regulator_dev *dev,
+                                       unsigned selector)
+{
+       struct tps_pmic *tps = rdev_get_drvdata(dev);
+       int ldo = rdev_get_id(dev);
+
+       if (ldo < TPS6507X_LDO_1 || ldo > TPS6507X_LDO_2)
+               return -EINVAL;
+
+       if (selector >= tps->info[ldo]->table_len)
+               return -EINVAL;
+       else
+               return tps->info[ldo]->table[selector] * 1000;
+}
+
+/* Operations permitted on VDCDCx */
+static struct regulator_ops tps6507x_dcdc_ops = {
+       .is_enabled = tps6507x_dcdc_is_enabled,
+       .enable = tps6507x_dcdc_enable,
+       .disable = tps6507x_dcdc_disable,
+       .get_voltage = tps6507x_dcdc_get_voltage,
+       .set_voltage = tps6507x_dcdc_set_voltage,
+       .list_voltage = tps6507x_dcdc_list_voltage,
+};
+
+/* Operations permitted on LDOx */
+static struct regulator_ops tps6507x_ldo_ops = {
+       .is_enabled = tps6507x_ldo_is_enabled,
+       .enable = tps6507x_ldo_enable,
+       .disable = tps6507x_ldo_disable,
+       .get_voltage = tps6507x_ldo_get_voltage,
+       .set_voltage = tps6507x_ldo_set_voltage,
+       .list_voltage = tps6507x_ldo_list_voltage,
+};
+
+static
+int tps_6507x_probe(struct i2c_client *client, const struct i2c_device_id *id)
+{
+       static int desc_id;
+       const struct tps_info *info = (void *)id->driver_data;
+       struct regulator_init_data *init_data;
+       struct regulator_dev *rdev;
+       struct tps_pmic *tps;
+       int i;
+
+       if (!i2c_check_functionality(client->adapter,
+                               I2C_FUNC_SMBUS_BYTE_DATA))
+               return -EIO;
+
+       /**
+        * init_data points to array of regulator_init structures
+        * coming from the board-evm file.
+        */
+       init_data = client->dev.platform_data;
+
+       if (!init_data)
+               return -EIO;
+
+       tps = kzalloc(sizeof(*tps), GFP_KERNEL);
+       if (!tps)
+               return -ENOMEM;
+
+       mutex_init(&tps->io_lock);
+
+       /* common for all regulators */
+       tps->client = client;
+
+       for (i = 0; i < TPS6507X_NUM_REGULATOR; i++, info++, init_data++) {
+               /* Register the regulators */
+               tps->info[i] = info;
+               tps->desc[i].name = info->name;
+               tps->desc[i].id = desc_id++;
+               tps->desc[i].n_voltages = num_voltages[i];
+               tps->desc[i].ops = (i > TPS6507X_DCDC_3 ?
+                               &tps6507x_ldo_ops : &tps6507x_dcdc_ops);
+               tps->desc[i].type = REGULATOR_VOLTAGE;
+               tps->desc[i].owner = THIS_MODULE;
+
+               rdev = regulator_register(&tps->desc[i],
+                                       &client->dev, init_data, tps);
+               if (IS_ERR(rdev)) {
+                       dev_err(&client->dev, "failed to register %s\n",
+                               id->name);
+
+                       /* Unregister */
+                       while (i)
+                               regulator_unregister(tps->rdev[--i]);
+
+                       tps->client = NULL;
+
+                       /* clear the client data in i2c */
+                       i2c_set_clientdata(client, NULL);
+
+                       kfree(tps);
+                       return PTR_ERR(rdev);
+               }
+
+               /* Save regulator for cleanup */
+               tps->rdev[i] = rdev;
+       }
+
+       i2c_set_clientdata(client, tps);
+
+       return 0;
+}
+
+/**
+ * tps_6507x_remove - TPS6507x driver i2c remove handler
+ * @client: i2c driver client device structure
+ *
+ * Unregister TPS driver as an i2c client device driver
+ */
+static int __devexit tps_6507x_remove(struct i2c_client *client)
+{
+       struct tps_pmic *tps = i2c_get_clientdata(client);
+       int i;
+
+       for (i = 0; i < TPS6507X_NUM_REGULATOR; i++)
+               regulator_unregister(tps->rdev[i]);
+
+       tps->client = NULL;
+
+       /* clear the client data in i2c */
+       i2c_set_clientdata(client, NULL);
+       kfree(tps);
+
+       return 0;
+}
+
+static const struct tps_info tps6507x_regs[] = {
+       {
+               .name = "VDCDC1",
+               .min_uV = 725000,
+               .max_uV = 3300000,
+               .table_len = ARRAY_SIZE(VDCDCx_VSEL_table),
+               .table = VDCDCx_VSEL_table,
+       },
+       {
+               .name = "VDCDC2",
+               .min_uV = 725000,
+               .max_uV = 3300000,
+               .table_len = ARRAY_SIZE(VDCDCx_VSEL_table),
+               .table = VDCDCx_VSEL_table,
+       },
+       {
+               .name = "VDCDC3",
+               .min_uV = 725000,
+               .max_uV = 3300000,
+               .table_len = ARRAY_SIZE(VDCDCx_VSEL_table),
+               .table = VDCDCx_VSEL_table,
+       },
+       {
+               .name = "LDO1",
+               .min_uV = 1000000,
+               .max_uV = 3300000,
+               .table_len = ARRAY_SIZE(LDO1_VSEL_table),
+               .table = LDO1_VSEL_table,
+       },
+       {
+               .name = "LDO2",
+               .min_uV = 725000,
+               .max_uV = 3300000,
+               .table_len = ARRAY_SIZE(LDO2_VSEL_table),
+               .table = LDO2_VSEL_table,
+       },
+};
+
+static const struct i2c_device_id tps_6507x_id[] = {
+       {.name = "tps6507x",
+       .driver_data = (unsigned long) tps6507x_regs,},
+       { },
+};
+MODULE_DEVICE_TABLE(i2c, tps_6507x_id);
+
+static struct i2c_driver tps_6507x_i2c_driver = {
+       .driver = {
+               .name = "tps6507x",
+               .owner = THIS_MODULE,
+       },
+       .probe = tps_6507x_probe,
+       .remove = __devexit_p(tps_6507x_remove),
+       .id_table = tps_6507x_id,
+};
+
+/**
+ * tps_6507x_init
+ *
+ * Module init function
+ */
+static int __init tps_6507x_init(void)
+{
+       return i2c_add_driver(&tps_6507x_i2c_driver);
+}
+subsys_initcall(tps_6507x_init);
+
+/**
+ * tps_6507x_cleanup
+ *
+ * Module exit function
+ */
+static void __exit tps_6507x_cleanup(void)
+{
+       i2c_del_driver(&tps_6507x_i2c_driver);
+}
+module_exit(tps_6507x_cleanup);
+
+MODULE_AUTHOR("Texas Instruments");
+MODULE_DESCRIPTION("TPS6507x voltage regulator driver");
+MODULE_LICENSE("GPL v2");
index 06d2fa96a8b4f644d5f6cf9e3c697c4b1402cf1f..44917da4ac97a3853420ca99856c1c436c15e985 100644 (file)
@@ -93,16 +93,21 @@ static ssize_t reg_set_state(struct device *dev, struct device_attribute *attr,
 static DEVICE_ATTR(name, 0444, reg_show_name, NULL);
 static DEVICE_ATTR(state, 0644, reg_show_state, reg_set_state);
 
-static struct device_attribute *attributes[] = {
-       &dev_attr_name,
-       &dev_attr_state,
+static struct attribute *attributes[] = {
+       &dev_attr_name.attr,
+       &dev_attr_state.attr,
+       NULL,
+};
+
+static const struct attribute_group attr_group = {
+       .attrs  = attributes,
 };
 
 static int regulator_userspace_consumer_probe(struct platform_device *pdev)
 {
        struct regulator_userspace_consumer_data *pdata;
        struct userspace_consumer_data *drvdata;
-       int ret, i;
+       int ret;
 
        pdata = pdev->dev.platform_data;
        if (!pdata)
@@ -125,31 +130,29 @@ static int regulator_userspace_consumer_probe(struct platform_device *pdev)
                goto err_alloc_supplies;
        }
 
-       for (i = 0; i < ARRAY_SIZE(attributes); i++) {
-               ret = device_create_file(&pdev->dev, attributes[i]);
-               if (ret != 0)
-                       goto err_create_attrs;
-       }
+       ret = sysfs_create_group(&pdev->dev.kobj, &attr_group);
+       if (ret != 0)
+               goto err_create_attrs;
 
-       if (pdata->init_on)
+       if (pdata->init_on) {
                ret = regulator_bulk_enable(drvdata->num_supplies,
                                            drvdata->supplies);
-
-       drvdata->enabled = pdata->init_on;
-
-       if (ret) {
-               dev_err(&pdev->dev, "Failed to set initial state: %d\n", ret);
-               goto err_create_attrs;
+               if (ret) {
+                       dev_err(&pdev->dev,
+                               "Failed to set initial state: %d\n", ret);
+                       goto err_enable;
+               }
        }
 
+       drvdata->enabled = pdata->init_on;
        platform_set_drvdata(pdev, drvdata);
 
        return 0;
 
-err_create_attrs:
-       for (i = 0; i < ARRAY_SIZE(attributes); i++)
-               device_remove_file(&pdev->dev, attributes[i]);
+err_enable:
+       sysfs_remove_group(&pdev->dev.kobj, &attr_group);
 
+err_create_attrs:
        regulator_bulk_free(drvdata->num_supplies, drvdata->supplies);
 
 err_alloc_supplies:
@@ -160,10 +163,8 @@ err_alloc_supplies:
 static int regulator_userspace_consumer_remove(struct platform_device *pdev)
 {
        struct userspace_consumer_data *data = platform_get_drvdata(pdev);
-       int i;
 
-       for (i = 0; i < ARRAY_SIZE(attributes); i++)
-               device_remove_file(&pdev->dev, attributes[i]);
+       sysfs_remove_group(&pdev->dev.kobj, &attr_group);
 
        if (data->enabled)
                regulator_bulk_disable(data->num_supplies, data->supplies);
index e7db5664722e962f1e7c60c2bea1c6f8910b5aeb..addc032c84bfea6e5aef207a796408df025a12a5 100644 (file)
@@ -27,71 +27,81 @@ struct virtual_consumer_data {
        unsigned int mode;
 };
 
-static void update_voltage_constraints(struct virtual_consumer_data *data)
+static void update_voltage_constraints(struct device *dev,
+                                      struct virtual_consumer_data *data)
 {
        int ret;
 
        if (data->min_uV && data->max_uV
            && data->min_uV <= data->max_uV) {
+               dev_dbg(dev, "Requesting %d-%duV\n",
+                       data->min_uV, data->max_uV);
                ret = regulator_set_voltage(data->regulator,
-                                           data->min_uV, data->max_uV);
+                                       data->min_uV, data->max_uV);
                if (ret != 0) {
-                       printk(KERN_ERR "regulator_set_voltage() failed: %d\n",
-                              ret);
+                       dev_err(dev,
+                               "regulator_set_voltage() failed: %d\n", ret);
                        return;
                }
        }
 
        if (data->min_uV && data->max_uV && !data->enabled) {
+               dev_dbg(dev, "Enabling regulator\n");
                ret = regulator_enable(data->regulator);
                if (ret == 0)
                        data->enabled = 1;
                else
-                       printk(KERN_ERR "regulator_enable() failed: %d\n",
+                       dev_err(dev, "regulator_enable() failed: %d\n",
                                ret);
        }
 
        if (!(data->min_uV && data->max_uV) && data->enabled) {
+               dev_dbg(dev, "Disabling regulator\n");
                ret = regulator_disable(data->regulator);
                if (ret == 0)
                        data->enabled = 0;
                else
-                       printk(KERN_ERR "regulator_disable() failed: %d\n",
+                       dev_err(dev, "regulator_disable() failed: %d\n",
                                ret);
        }
 }
 
-static void update_current_limit_constraints(struct virtual_consumer_data
-                                               *data)
+static void update_current_limit_constraints(struct device *dev,
+                                         struct virtual_consumer_data *data)
 {
        int ret;
 
        if (data->max_uA
            && data->min_uA <= data->max_uA) {
+               dev_dbg(dev, "Requesting %d-%duA\n",
+                       data->min_uA, data->max_uA);
                ret = regulator_set_current_limit(data->regulator,
                                        data->min_uA, data->max_uA);
                if (ret != 0) {
-                       pr_err("regulator_set_current_limit() failed: %d\n",
-                              ret);
+                       dev_err(dev,
+                               "regulator_set_current_limit() failed: %d\n",
+                               ret);
                        return;
                }
        }
 
        if (data->max_uA && !data->enabled) {
+               dev_dbg(dev, "Enabling regulator\n");
                ret = regulator_enable(data->regulator);
                if (ret == 0)
                        data->enabled = 1;
                else
-                       printk(KERN_ERR "regulator_enable() failed: %d\n",
+                       dev_err(dev, "regulator_enable() failed: %d\n",
                                ret);
        }
 
        if (!(data->min_uA && data->max_uA) && data->enabled) {
+               dev_dbg(dev, "Disabling regulator\n");
                ret = regulator_disable(data->regulator);
                if (ret == 0)
                        data->enabled = 0;
                else
-                       printk(KERN_ERR "regulator_disable() failed: %d\n",
+                       dev_err(dev, "regulator_disable() failed: %d\n",
                                ret);
        }
 }
@@ -115,7 +125,7 @@ static ssize_t set_min_uV(struct device *dev, struct device_attribute *attr,
        mutex_lock(&data->lock);
 
        data->min_uV = val;
-       update_voltage_constraints(data);
+       update_voltage_constraints(dev, data);
 
        mutex_unlock(&data->lock);
 
@@ -141,7 +151,7 @@ static ssize_t set_max_uV(struct device *dev, struct device_attribute *attr,
        mutex_lock(&data->lock);
 
        data->max_uV = val;
-       update_voltage_constraints(data);
+       update_voltage_constraints(dev, data);
 
        mutex_unlock(&data->lock);
 
@@ -167,7 +177,7 @@ static ssize_t set_min_uA(struct device *dev, struct device_attribute *attr,
        mutex_lock(&data->lock);
 
        data->min_uA = val;
-       update_current_limit_constraints(data);
+       update_current_limit_constraints(dev, data);
 
        mutex_unlock(&data->lock);
 
@@ -193,7 +203,7 @@ static ssize_t set_max_uA(struct device *dev, struct device_attribute *attr,
        mutex_lock(&data->lock);
 
        data->max_uA = val;
-       update_current_limit_constraints(data);
+       update_current_limit_constraints(dev, data);
 
        mutex_unlock(&data->lock);
 
@@ -276,8 +286,7 @@ static int regulator_virtual_consumer_probe(struct platform_device *pdev)
 
        drvdata = kzalloc(sizeof(struct virtual_consumer_data), GFP_KERNEL);
        if (drvdata == NULL) {
-               ret = -ENOMEM;
-               goto err;
+               return -ENOMEM;
        }
 
        mutex_init(&drvdata->lock);
@@ -285,13 +294,18 @@ static int regulator_virtual_consumer_probe(struct platform_device *pdev)
        drvdata->regulator = regulator_get(&pdev->dev, reg_id);
        if (IS_ERR(drvdata->regulator)) {
                ret = PTR_ERR(drvdata->regulator);
+               dev_err(&pdev->dev, "Failed to obtain supply '%s': %d\n",
+                       reg_id, ret);
                goto err;
        }
 
        for (i = 0; i < ARRAY_SIZE(attributes); i++) {
                ret = device_create_file(&pdev->dev, attributes[i]);
-               if (ret != 0)
-                       goto err;
+               if (ret != 0) {
+                       dev_err(&pdev->dev, "Failed to create attr %d: %d\n",
+                               i, ret);
+                       goto err_regulator;
+               }
        }
 
        drvdata->mode = regulator_get_mode(drvdata->regulator);
@@ -300,6 +314,8 @@ static int regulator_virtual_consumer_probe(struct platform_device *pdev)
 
        return 0;
 
+err_regulator:
+       regulator_put(drvdata->regulator);
 err:
        for (i = 0; i < ARRAY_SIZE(attributes); i++)
                device_remove_file(&pdev->dev, attributes[i]);
index 17a00b0fafd11f6e311c4091da1db38387d37535..768bd0e5b48bdd00293796554807fb2523ecc01d 100644 (file)
@@ -1419,6 +1419,8 @@ int wm8350_register_regulator(struct wm8350 *wm8350, int reg,
 {
        struct platform_device *pdev;
        int ret;
+       if (reg < 0 || reg >= NUM_WM8350_REGULATORS)
+               return -EINVAL;
 
        if (wm8350->pmic.pdev[reg])
                return -EBUSY;
index 73771b09fbd37dd0ab2a757ecb317ec818501c78..3c20dae43ce25e65c77b929cdc8b77f361d584af 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 5e152ffe505819291917118a511c4ee56d053f9f..aa3fbd5517a1fd91c47778ec3ad408310193ad4c 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 b5bf937069134937d064306b92e8e885948feaf0..bc8bbca9a2e29329ba7638a0cb924522aace48b3 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 a118eb0f1e6729029be1a4fdb61aea52634ed260..b11485b9f21ca1c3c90f7bc96cfffb32c66e0b8c 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 8f410e59d9f536583c4a1509e65b2ecacd70bbcd..2736b11a1b1ec4e45e12e391d6ddee5b95c2e8b0 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 47a93c022d91b20bc840bd8158bb1097514eaa7b..eb99ee4fa0f5778a39e4faddd892766b06d0f078 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 e01b955db077e6be2a60387ec9a4b6777dd80692..cdb705057091f1cb8bbbca35f42be3154e86d07a 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 c51589ede5b72dcd7584015cbb05d75f0ffd9414..a774ca35b5f728540f8895f435f0c3d878af6f06 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 551332e4ed02a28122b72b817bf0682814ed13c2..9da02d108b73370d79f45dea06f016143b93ac90 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 c3a18c58daf6ed80745f2c2c7fc7f8d5dcf2bde4..c8c97a4169d4e22e46ed3aa6a7b0a72fa65ec4ba 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 36a8ea9ed8ba61682d9cc1077dbfc49cbd204604..657403ebd54a81fe7ddeda43d2c693234f148c81 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 bd1ce8e2bc1866d8a6fbeff8318b5ac7d105675a..0587d53987fe7db838e77ebac4555b1ba11bb76f 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 42028f233bef6d596ae05c632cb50cbbd1845892..9beba49c3c5b48c2abcca65c916eabc0d782a49a 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 dd1e2bc7a472093a77e76719478e6ea1c6f02ae7..2099037cb3eab5921be8497205e74e4f2ba84127 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 2531ce4c9db082d94cd3b1afba7ac7f4acf93f85..7dd23a6fc8256954b384bfa027e81987e3dd2e29 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 e109da4583a88cd4d71bad470cc20e3205096309..dad0449475b698fdeae045db1b06b1393a70a21d 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 a1ce573648a292255290c1fb1c0c0a335c022d8d..ab352175558885861ab3426dd8a3e921ec67bab6 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)
@@ -935,6 +935,7 @@ static int dasd_eckd_read_features(struct dasd_device *device)
        struct dasd_eckd_private *private;
 
        private = (struct dasd_eckd_private *) device->private;
+       memset(&private->features, 0, sizeof(struct dasd_rssd_features));
        cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1 /* PSF */ + 1 /* RSSD */,
                                   (sizeof(struct dasd_psf_prssd_data) +
                                    sizeof(struct dasd_rssd_features)),
@@ -982,7 +983,9 @@ static int dasd_eckd_read_features(struct dasd_device *device)
                features = (struct dasd_rssd_features *) (prssdp + 1);
                memcpy(&private->features, features,
                       sizeof(struct dasd_rssd_features));
-       }
+       } else
+               dev_warn(&device->cdev->dev, "Reading device feature codes"
+                        " failed with rc=%d\n", rc);
        dasd_sfree_request(cqr, cqr->memdev);
        return rc;
 }
@@ -1144,9 +1147,7 @@ dasd_eckd_check_characteristics(struct dasd_device *device)
        }
 
        /* Read Feature Codes */
-       rc = dasd_eckd_read_features(device);
-       if (rc)
-               goto out_err3;
+       dasd_eckd_read_features(device);
 
        /* Read Device Characteristics */
        rc = dasd_generic_read_dev_chars(device, DASD_ECKD_MAGIC,
@@ -3241,9 +3242,7 @@ int dasd_eckd_restore_device(struct dasd_device *device)
        }
 
        /* Read Feature Codes */
-       rc = dasd_eckd_read_features(device);
-       if (rc)
-               goto out_err;
+       dasd_eckd_read_features(device);
 
        /* Read Device Characteristics */
        memset(&private->rdc_data, 0, sizeof(private->rdc_data));
index 5e47a1ee52b9c21c64893b029b34a0755232e3db..8afd9fa0087592d555f1bbcbcac59806f0c24355 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 d34617682a6295172a2c0d5d5fa47e258e4d2b23..f76f4bd82b9f9810e3bae0b4d914f1f8673803ab 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 ee604e92a5fa65580717c8207384c61615bb7c04..116d1b3eeb157093002ea32edbf7c45133dc695b 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 4cb9e70507abf442e924a923033f352ea69166c7..64f57ef2763c394e1f6e62584da3b002e3d7d24a 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 393c73c47f87280678f4db2263c44b7f1fca2a66..91c25706fa8334dad0768f9ddda2d521fd84219c 100644 (file)
@@ -31,8 +31,7 @@
 #include "chp.h"
 
 int css_init_done = 0;
-static int need_reprobe = 0;
-static int max_ssid = 0;
+int max_ssid;
 
 struct channel_subsystem *channel_subsystems[__MAX_CSSID + 1];
 
@@ -315,12 +314,18 @@ int css_probe_device(struct subchannel_id schid)
        int ret;
        struct subchannel *sch;
 
-       sch = css_alloc_subchannel(schid);
-       if (IS_ERR(sch))
-               return PTR_ERR(sch);
+       if (cio_is_console(schid))
+               sch = cio_get_console_subchannel();
+       else {
+               sch = css_alloc_subchannel(schid);
+               if (IS_ERR(sch))
+                       return PTR_ERR(sch);
+       }
        ret = css_register_subchannel(sch);
-       if (ret)
-               put_device(&sch->dev);
+       if (ret) {
+               if (!cio_is_console(schid))
+                       put_device(&sch->dev);
+       }
        return ret;
 }
 
@@ -409,10 +414,14 @@ static void css_evaluate_subchannel(struct subchannel_id schid, int slow)
 
 static struct idset *slow_subchannel_set;
 static spinlock_t slow_subchannel_lock;
+static wait_queue_head_t css_eval_wq;
+static atomic_t css_eval_scheduled;
 
 static int __init slow_subchannel_init(void)
 {
        spin_lock_init(&slow_subchannel_lock);
+       atomic_set(&css_eval_scheduled, 0);
+       init_waitqueue_head(&css_eval_wq);
        slow_subchannel_set = idset_sch_new();
        if (!slow_subchannel_set) {
                CIO_MSG_EVENT(0, "could not allocate slow subchannel set\n");
@@ -468,9 +477,17 @@ static int slow_eval_unknown_fn(struct subchannel_id schid, void *data)
 
 static void css_slow_path_func(struct work_struct *unused)
 {
+       unsigned long flags;
+
        CIO_TRACE_EVENT(4, "slowpath");
        for_each_subchannel_staged(slow_eval_known_fn, slow_eval_unknown_fn,
                                   NULL);
+       spin_lock_irqsave(&slow_subchannel_lock, flags);
+       if (idset_is_empty(slow_subchannel_set)) {
+               atomic_set(&css_eval_scheduled, 0);
+               wake_up(&css_eval_wq);
+       }
+       spin_unlock_irqrestore(&slow_subchannel_lock, flags);
 }
 
 static DECLARE_WORK(slow_path_work, css_slow_path_func);
@@ -482,6 +499,7 @@ void css_schedule_eval(struct subchannel_id schid)
 
        spin_lock_irqsave(&slow_subchannel_lock, flags);
        idset_sch_add(slow_subchannel_set, schid);
+       atomic_set(&css_eval_scheduled, 1);
        queue_work(slow_path_wq, &slow_path_work);
        spin_unlock_irqrestore(&slow_subchannel_lock, flags);
 }
@@ -492,80 +510,53 @@ void css_schedule_eval_all(void)
 
        spin_lock_irqsave(&slow_subchannel_lock, flags);
        idset_fill(slow_subchannel_set);
+       atomic_set(&css_eval_scheduled, 1);
        queue_work(slow_path_wq, &slow_path_work);
        spin_unlock_irqrestore(&slow_subchannel_lock, flags);
 }
 
-void css_wait_for_slow_path(void)
+static int __unset_registered(struct device *dev, void *data)
 {
-       flush_workqueue(slow_path_wq);
-}
-
-/* Reprobe subchannel if unregistered. */
-static int reprobe_subchannel(struct subchannel_id schid, void *data)
-{
-       int ret;
-
-       CIO_MSG_EVENT(6, "cio: reprobe 0.%x.%04x\n",
-                     schid.ssid, schid.sch_no);
-       if (need_reprobe)
-               return -EAGAIN;
-
-       ret = css_probe_device(schid);
-       switch (ret) {
-       case 0:
-               break;
-       case -ENXIO:
-       case -ENOMEM:
-       case -EIO:
-               /* These should abort looping */
-               break;
-       default:
-               ret = 0;
-       }
-
-       return ret;
-}
+       struct idset *set = data;
+       struct subchannel *sch = to_subchannel(dev);
 
-static void reprobe_after_idle(struct work_struct *unused)
-{
-       /* Make sure initial subchannel scan is done. */
-       wait_event(ccw_device_init_wq,
-                  atomic_read(&ccw_device_init_count) == 0);
-       if (need_reprobe)
-               css_schedule_reprobe();
+       idset_sch_del(set, sch->schid);
+       return 0;
 }
 
-static DECLARE_WORK(reprobe_idle_work, reprobe_after_idle);
-
-/* Work function used to reprobe all unregistered subchannels. */
-static void reprobe_all(struct work_struct *unused)
+void css_schedule_eval_all_unreg(void)
 {
-       int ret;
-
-       CIO_MSG_EVENT(4, "reprobe start\n");
+       unsigned long flags;
+       struct idset *unreg_set;
 
-       /* Make sure initial subchannel scan is done. */
-       if (atomic_read(&ccw_device_init_count) != 0) {
-               queue_work(ccw_device_work, &reprobe_idle_work);
+       /* Find unregistered subchannels. */
+       unreg_set = idset_sch_new();
+       if (!unreg_set) {
+               /* Fallback. */
+               css_schedule_eval_all();
                return;
        }
-       need_reprobe = 0;
-       ret = for_each_subchannel_staged(NULL, reprobe_subchannel, NULL);
-
-       CIO_MSG_EVENT(4, "reprobe done (rc=%d, need_reprobe=%d)\n", ret,
-                     need_reprobe);
+       idset_fill(unreg_set);
+       bus_for_each_dev(&css_bus_type, NULL, unreg_set, __unset_registered);
+       /* Apply to slow_subchannel_set. */
+       spin_lock_irqsave(&slow_subchannel_lock, flags);
+       idset_add_set(slow_subchannel_set, unreg_set);
+       atomic_set(&css_eval_scheduled, 1);
+       queue_work(slow_path_wq, &slow_path_work);
+       spin_unlock_irqrestore(&slow_subchannel_lock, flags);
+       idset_free(unreg_set);
 }
 
-static DECLARE_WORK(css_reprobe_work, reprobe_all);
+void css_wait_for_slow_path(void)
+{
+       flush_workqueue(slow_path_wq);
+}
 
 /* Schedule reprobing of all unregistered subchannels. */
 void css_schedule_reprobe(void)
 {
-       need_reprobe = 1;
-       queue_work(slow_path_wq, &css_reprobe_work);
+       css_schedule_eval_all_unreg();
 }
-
 EXPORT_SYMBOL_GPL(css_schedule_reprobe);
 
 /*
@@ -601,49 +592,6 @@ static void css_process_crw(struct crw *crw0, struct crw *crw1, int overflow)
        css_evaluate_subchannel(mchk_schid, 0);
 }
 
-static int __init
-__init_channel_subsystem(struct subchannel_id schid, void *data)
-{
-       struct subchannel *sch;
-       int ret;
-
-       if (cio_is_console(schid))
-               sch = cio_get_console_subchannel();
-       else {
-               sch = css_alloc_subchannel(schid);
-               if (IS_ERR(sch))
-                       ret = PTR_ERR(sch);
-               else
-                       ret = 0;
-               switch (ret) {
-               case 0:
-                       break;
-               case -ENOMEM:
-                       panic("Out of memory in init_channel_subsystem\n");
-               /* -ENXIO: no more subchannels. */
-               case -ENXIO:
-                       return ret;
-               /* -EIO: this subchannel set not supported. */
-               case -EIO:
-                       return ret;
-               default:
-                       return 0;
-               }
-       }
-       /*
-        * We register ALL valid subchannels in ioinfo, even those
-        * that have been present before init_channel_subsystem.
-        * These subchannels can't have been registered yet (kmalloc
-        * not working) so we do it now. This is true e.g. for the
-        * console subchannel.
-        */
-       if (css_register_subchannel(sch)) {
-               if (!cio_is_console(schid))
-                       put_device(&sch->dev);
-       }
-       return 0;
-}
-
 static void __init
 css_generate_pgid(struct channel_subsystem *css, u32 tod_high)
 {
@@ -854,19 +802,30 @@ static struct notifier_block css_power_notifier = {
  * The struct subchannel's are created during probing (except for the
  * static console subchannel).
  */
-static int __init
-init_channel_subsystem (void)
+static int __init css_bus_init(void)
 {
        int ret, i;
 
        ret = chsc_determine_css_characteristics();
        if (ret == -ENOMEM)
-               goto out; /* No need to continue. */
+               goto out;
 
        ret = chsc_alloc_sei_area();
        if (ret)
                goto out;
 
+       /* Try to enable MSS. */
+       ret = chsc_enable_facility(CHSC_SDA_OC_MSS);
+       switch (ret) {
+       case 0: /* Success. */
+               max_ssid = __MAX_SSID;
+               break;
+       case -ENOMEM:
+               goto out;
+       default:
+               max_ssid = 0;
+       }
+
        ret = slow_subchannel_init();
        if (ret)
                goto out;
@@ -878,17 +837,6 @@ init_channel_subsystem (void)
        if ((ret = bus_register(&css_bus_type)))
                goto out;
 
-       /* Try to enable MSS. */
-       ret = chsc_enable_facility(CHSC_SDA_OC_MSS);
-       switch (ret) {
-       case 0: /* Success. */
-               max_ssid = __MAX_SSID;
-               break;
-       case -ENOMEM:
-               goto out_bus;
-       default:
-               max_ssid = 0;
-       }
        /* Setup css structure. */
        for (i = 0; i <= __MAX_CSSID; i++) {
                struct channel_subsystem *css;
@@ -934,7 +882,6 @@ init_channel_subsystem (void)
        /* Enable default isc for I/O subchannels. */
        isc_register(IO_SCH_ISC);
 
-       for_each_subchannel(__init_channel_subsystem, NULL);
        return 0;
 out_file:
        if (css_chsc_characteristics.secm)
@@ -955,17 +902,76 @@ out_unregister:
                                           &dev_attr_cm_enable);
                device_unregister(&css->device);
        }
-out_bus:
        bus_unregister(&css_bus_type);
 out:
        crw_unregister_handler(CRW_RSC_CSS);
        chsc_free_sei_area();
-       kfree(slow_subchannel_set);
+       idset_free(slow_subchannel_set);
        pr_alert("The CSS device driver initialization failed with "
                 "errno=%d\n", ret);
        return ret;
 }
 
+static void __init css_bus_cleanup(void)
+{
+       struct channel_subsystem *css;
+       int i;
+
+       for (i = 0; i <= __MAX_CSSID; i++) {
+               css = channel_subsystems[i];
+               device_unregister(&css->pseudo_subchannel->dev);
+               css->pseudo_subchannel = NULL;
+               if (css_chsc_characteristics.secm)
+                       device_remove_file(&css->device, &dev_attr_cm_enable);
+               device_unregister(&css->device);
+       }
+       bus_unregister(&css_bus_type);
+       crw_unregister_handler(CRW_RSC_CSS);
+       chsc_free_sei_area();
+       idset_free(slow_subchannel_set);
+       isc_unregister(IO_SCH_ISC);
+}
+
+static int __init channel_subsystem_init(void)
+{
+       int ret;
+
+       ret = css_bus_init();
+       if (ret)
+               return ret;
+
+       ret = io_subchannel_init();
+       if (ret)
+               css_bus_cleanup();
+
+       return ret;
+}
+subsys_initcall(channel_subsystem_init);
+
+static int css_settle(struct device_driver *drv, void *unused)
+{
+       struct css_driver *cssdrv = to_cssdriver(drv);
+
+       if (cssdrv->settle)
+               cssdrv->settle();
+       return 0;
+}
+
+/*
+ * Wait for the initialization of devices to finish, to make sure we are
+ * done with our setup if the search for the root device starts.
+ */
+static int __init channel_subsystem_init_sync(void)
+{
+       /* Start initial subchannel evaluation. */
+       css_schedule_eval_all();
+       /* Wait for the evaluation of subchannels to finish. */
+       wait_event(css_eval_wq, atomic_read(&css_eval_scheduled) == 0);
+       /* Wait for the subchannel type specific initialization to finish */
+       return bus_for_each_drv(&css_bus_type, NULL, NULL, css_settle);
+}
+subsys_initcall_sync(channel_subsystem_init_sync);
+
 int sch_is_pseudo_sch(struct subchannel *sch)
 {
        return sch == to_css(sch->dev.parent)->pseudo_subchannel;
@@ -1135,7 +1141,5 @@ void css_driver_unregister(struct css_driver *cdrv)
 }
 EXPORT_SYMBOL_GPL(css_driver_unregister);
 
-subsys_initcall(init_channel_subsystem);
-
 MODULE_LICENSE("GPL");
 EXPORT_SYMBOL(css_bus_type);
index 9763eeec74587d3a106dc5eae49eacd40505f899..68d6b0bf151c1a460dcd52751ed1eb117385b673 100644 (file)
@@ -75,6 +75,7 @@ struct chp_link;
  * @freeze: callback for freezing during hibernation snapshotting
  * @thaw: undo work done in @freeze
  * @restore: callback for restoring after hibernation
+ * @settle: wait for asynchronous work to finish
  * @name: name of the device driver
  */
 struct css_driver {
@@ -92,6 +93,7 @@ struct css_driver {
        int (*freeze)(struct subchannel *);
        int (*thaw) (struct subchannel *);
        int (*restore)(struct subchannel *);
+       void (*settle)(void);
        const char *name;
 };
 
@@ -109,6 +111,7 @@ extern void css_sch_device_unregister(struct subchannel *);
 extern int css_probe_device(struct subchannel_id);
 extern struct subchannel *get_subchannel_by_schid(struct subchannel_id);
 extern int css_init_done;
+extern int max_ssid;
 int for_each_subchannel_staged(int (*fn_known)(struct subchannel *, void *),
                               int (*fn_unknown)(struct subchannel_id,
                               void *), void *data);
index 6527f3f34493cfb74b4a3e58cdd529610e1ad01c..f780bdd3a04ea6093f4b3a6a41ba61425c1da164 100644 (file)
@@ -131,6 +131,10 @@ static void io_subchannel_shutdown(struct subchannel *);
 static int io_subchannel_sch_event(struct subchannel *, int);
 static int io_subchannel_chp_event(struct subchannel *, struct chp_link *,
                                   int);
+static void recovery_func(unsigned long data);
+struct workqueue_struct *ccw_device_work;
+wait_queue_head_t ccw_device_init_wq;
+atomic_t ccw_device_init_count;
 
 static struct css_device_id io_subchannel_ids[] = {
        { .match_flags = 0x1, .type = SUBCHANNEL_TYPE_IO, },
@@ -151,6 +155,13 @@ static int io_subchannel_prepare(struct subchannel *sch)
        return 0;
 }
 
+static void io_subchannel_settle(void)
+{
+       wait_event(ccw_device_init_wq,
+                  atomic_read(&ccw_device_init_count) == 0);
+       flush_workqueue(ccw_device_work);
+}
+
 static struct css_driver io_subchannel_driver = {
        .owner = THIS_MODULE,
        .subchannel_type = io_subchannel_ids,
@@ -162,16 +173,10 @@ static struct css_driver io_subchannel_driver = {
        .remove = io_subchannel_remove,
        .shutdown = io_subchannel_shutdown,
        .prepare = io_subchannel_prepare,
+       .settle = io_subchannel_settle,
 };
 
-struct workqueue_struct *ccw_device_work;
-wait_queue_head_t ccw_device_init_wq;
-atomic_t ccw_device_init_count;
-
-static void recovery_func(unsigned long data);
-
-static int __init
-init_ccw_bus_type (void)
+int __init io_subchannel_init(void)
 {
        int ret;
 
@@ -181,10 +186,10 @@ init_ccw_bus_type (void)
 
        ccw_device_work = create_singlethread_workqueue("cio");
        if (!ccw_device_work)
-               return -ENOMEM; /* FIXME: better errno ? */
+               return -ENOMEM;
        slow_path_wq = create_singlethread_workqueue("kslowcrw");
        if (!slow_path_wq) {
-               ret = -ENOMEM; /* FIXME: better errno ? */
+               ret = -ENOMEM;
                goto out_err;
        }
        if ((ret = bus_register (&ccw_bus_type)))
@@ -194,9 +199,6 @@ init_ccw_bus_type (void)
        if (ret)
                goto out_err;
 
-       wait_event(ccw_device_init_wq,
-                  atomic_read(&ccw_device_init_count) == 0);
-       flush_workqueue(ccw_device_work);
        return 0;
 out_err:
        if (ccw_device_work)
@@ -206,16 +208,6 @@ out_err:
        return ret;
 }
 
-static void __exit
-cleanup_ccw_bus_type (void)
-{
-       css_driver_unregister(&io_subchannel_driver);
-       bus_unregister(&ccw_bus_type);
-       destroy_workqueue(ccw_device_work);
-}
-
-subsys_initcall(init_ccw_bus_type);
-module_exit(cleanup_ccw_bus_type);
 
 /************************ device handling **************************/
 
index e3975107a5787fa314b0ec16feb7c1d313b2d1b1..ed39a2caaf4757e0837a6ac9e054234c77034e2d 100644 (file)
@@ -74,6 +74,7 @@ dev_fsm_final_state(struct ccw_device *cdev)
 extern struct workqueue_struct *ccw_device_work;
 extern wait_queue_head_t ccw_device_init_wq;
 extern atomic_t ccw_device_init_count;
+int __init io_subchannel_init(void);
 
 void io_subchannel_recog_done(struct ccw_device *cdev);
 void io_subchannel_init_config(struct subchannel *sch);
index cf8f24a4b5ebf7e4e0cba41ebfa4a6060730f1f8..4d10981c7cc102a3ffe1bf8c107cb08d5280d212 100644 (file)
@@ -78,7 +78,7 @@ static inline int idset_get_first(struct idset *set, int *ssid, int *id)
 
 struct idset *idset_sch_new(void)
 {
-       return idset_new(__MAX_SSID + 1, __MAX_SUBCHANNEL + 1);
+       return idset_new(max_ssid + 1, __MAX_SUBCHANNEL + 1);
 }
 
 void idset_sch_add(struct idset *set, struct subchannel_id schid)
@@ -110,3 +110,23 @@ int idset_sch_get_first(struct idset *set, struct subchannel_id *schid)
        }
        return rc;
 }
+
+int idset_is_empty(struct idset *set)
+{
+       int bitnum;
+
+       bitnum = find_first_bit(set->bitmap, set->num_ssid * set->num_id);
+       if (bitnum >= set->num_ssid * set->num_id)
+               return 1;
+       return 0;
+}
+
+void idset_add_set(struct idset *to, struct idset *from)
+{
+       unsigned long i, len;
+
+       len = min(__BITOPS_WORDS(to->num_ssid * to->num_id),
+                 __BITOPS_WORDS(from->num_ssid * from->num_id));
+       for (i = 0; i < len ; i++)
+               to->bitmap[i] |= from->bitmap[i];
+}
index 528065cb50212adc78c5c326197ee42d58e7351a..7543da4529f9f05ded52997b45dbbc34cbaf420d 100644 (file)
@@ -21,5 +21,7 @@ void idset_sch_add(struct idset *set, struct subchannel_id id);
 void idset_sch_del(struct idset *set, struct subchannel_id id);
 int idset_sch_contains(struct idset *set, struct subchannel_id id);
 int idset_sch_get_first(struct idset *set, struct subchannel_id *id);
+int idset_is_empty(struct idset *set);
+void idset_add_set(struct idset *to, struct idset *from);
 
 #endif /* S390_IDSET_H */
index 9aef402a5f1ba11160c5c66f3cc605bcac2c069a..4be6e84b9599c4aa905cf085a1ee75220ac5e1eb 100644 (file)
@@ -401,7 +401,7 @@ static void announce_buffer_error(struct qdio_q *q, int count)
        if ((!q->is_input_q &&
            (q->sbal[q->first_to_check]->element[15].flags & 0xff) == 0x10)) {
                qdio_perf_stat_inc(&perf_stats.outbound_target_full);
-               DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "OUTFULL FTC:%3d",
+               DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "OUTFULL FTC:%02x",
                              q->first_to_check);
                return;
        }
@@ -418,7 +418,7 @@ static inline void inbound_primed(struct qdio_q *q, int count)
 {
        int new;
 
-       DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "in prim: %3d", count);
+       DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "in prim: %02x", count);
 
        /* for QEBSM the ACK was already set by EQBS */
        if (is_qebsm(q)) {
@@ -455,6 +455,8 @@ static inline void inbound_primed(struct qdio_q *q, int count)
        count--;
        if (!count)
                return;
+       /* need to change ALL buffers to get more interrupts */
+       set_buf_states(q, q->first_to_check, SLSB_P_INPUT_NOT_INIT, count);
 }
 
 static int get_inbound_buffer_frontier(struct qdio_q *q)
@@ -545,7 +547,7 @@ static inline int qdio_inbound_q_done(struct qdio_q *q)
         * has (probably) not moved (see qdio_inbound_processing).
         */
        if (get_usecs() > q->u.in.timestamp + QDIO_INPUT_THRESHOLD) {
-               DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "in done:%3d",
+               DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "in done:%02x",
                              q->first_to_check);
                return 1;
        } else
@@ -565,11 +567,10 @@ static void qdio_kick_handler(struct qdio_q *q)
 
        if (q->is_input_q) {
                qdio_perf_stat_inc(&perf_stats.inbound_handler);
-               DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "kih s:%3d c:%3d", start, count);
-       } else {
-               DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "koh: nr:%1d", q->nr);
-               DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "s:%3d c:%3d", start, count);
-       }
+               DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "kih s:%02x c:%02x", start, count);
+       } else
+               DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "koh: s:%02x c:%02x",
+                             start, count);
 
        q->handler(q->irq_ptr->cdev, q->qdio_error, q->nr, start, count,
                   q->irq_ptr->int_parm);
@@ -633,7 +634,7 @@ static int get_outbound_buffer_frontier(struct qdio_q *q)
        switch (state) {
        case SLSB_P_OUTPUT_EMPTY:
                /* the adapter got it */
-               DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "out empty:%1d %3d", q->nr, count);
+               DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "out empty:%1d %02x", q->nr, count);
 
                atomic_sub(count, &q->nr_buf_used);
                q->first_to_check = add_buf(q->first_to_check, count);
@@ -1481,10 +1482,9 @@ static int handle_outbound(struct qdio_q *q, unsigned int callflags,
        get_buf_state(q, prev_buf(bufnr), &state, 0);
        if (state != SLSB_CU_OUTPUT_PRIMED)
                rc = qdio_kick_outbound_q(q);
-       else {
-               DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "fast-req");
+       else
                qdio_perf_stat_inc(&perf_stats.fast_requeue);
-       }
+
 out:
        tasklet_schedule(&q->tasklet);
        return rc;
@@ -1510,12 +1510,8 @@ int do_QDIO(struct ccw_device *cdev, unsigned int callflags,
        if (!irq_ptr)
                return -ENODEV;
 
-       if (callflags & QDIO_FLAG_SYNC_INPUT)
-               DBF_DEV_EVENT(DBF_INFO, irq_ptr, "doQDIO input");
-       else
-               DBF_DEV_EVENT(DBF_INFO, irq_ptr, "doQDIO output");
-       DBF_DEV_EVENT(DBF_INFO, irq_ptr, "q:%1d flag:%4x", q_nr, callflags);
-       DBF_DEV_EVENT(DBF_INFO, irq_ptr, "buf:%2d cnt:%3d", bufnr, count);
+       DBF_DEV_EVENT(DBF_INFO, irq_ptr,
+                     "do%02x b:%02x c:%02x", callflags, bufnr, count);
 
        if (irq_ptr->state != QDIO_IRQ_STATE_ACTIVE)
                return -EBUSY;
index 090b32a339c6042863862f8ab8006b7a47352896..1294876bf7b406da1a739d308032b0efa4e0382c 100644 (file)
@@ -60,6 +60,7 @@ static int ap_device_probe(struct device *dev);
 static void ap_interrupt_handler(void *unused1, void *unused2);
 static void ap_reset(struct ap_device *ap_dev);
 static void ap_config_timeout(unsigned long ptr);
+static int ap_select_domain(void);
 
 /*
  * Module description.
@@ -109,6 +110,10 @@ static unsigned long long poll_timeout = 250000;
 
 /* Suspend flag */
 static int ap_suspend_flag;
+/* Flag to check if domain was set through module parameter domain=. This is
+ * important when supsend and resume is done in a z/VM environment where the
+ * domain might change. */
+static int user_set_domain = 0;
 static struct bus_type ap_bus_type;
 
 /**
@@ -643,6 +648,7 @@ static int ap_bus_suspend(struct device *dev, pm_message_t state)
                        destroy_workqueue(ap_work_queue);
                        ap_work_queue = NULL;
                }
+
                tasklet_disable(&ap_tasklet);
        }
        /* Poll on the device until all requests are finished. */
@@ -653,7 +659,10 @@ static int ap_bus_suspend(struct device *dev, pm_message_t state)
                spin_unlock_bh(&ap_dev->lock);
        } while ((flags & 1) || (flags & 2));
 
-       ap_device_remove(dev);
+       spin_lock_bh(&ap_dev->lock);
+       ap_dev->unregistered = 1;
+       spin_unlock_bh(&ap_dev->lock);
+
        return 0;
 }
 
@@ -666,11 +675,10 @@ static int ap_bus_resume(struct device *dev)
                ap_suspend_flag = 0;
                if (!ap_interrupts_available())
                        ap_interrupt_indicator = NULL;
-               ap_device_probe(dev);
-               ap_reset(ap_dev);
-               setup_timer(&ap_dev->timeout, ap_request_timeout,
-                           (unsigned long) ap_dev);
-               ap_scan_bus(NULL);
+               if (!user_set_domain) {
+                       ap_domain_index = -1;
+                       ap_select_domain();
+               }
                init_timer(&ap_config_timer);
                ap_config_timer.function = ap_config_timeout;
                ap_config_timer.data = 0;
@@ -686,12 +694,14 @@ static int ap_bus_resume(struct device *dev)
                        tasklet_schedule(&ap_tasklet);
                if (ap_thread_flag)
                        rc = ap_poll_thread_start();
-       } else {
-               ap_device_probe(dev);
-               ap_reset(ap_dev);
-               setup_timer(&ap_dev->timeout, ap_request_timeout,
-                           (unsigned long) ap_dev);
        }
+       if (AP_QID_QUEUE(ap_dev->qid) != ap_domain_index) {
+               spin_lock_bh(&ap_dev->lock);
+               ap_dev->qid = AP_MKQID(AP_QID_DEVICE(ap_dev->qid),
+                                      ap_domain_index);
+               spin_unlock_bh(&ap_dev->lock);
+       }
+       queue_work(ap_work_queue, &ap_config_work);
 
        return rc;
 }
@@ -1079,6 +1089,8 @@ static void ap_scan_bus(struct work_struct *unused)
                        spin_lock_bh(&ap_dev->lock);
                        if (rc || ap_dev->unregistered) {
                                spin_unlock_bh(&ap_dev->lock);
+                               if (ap_dev->unregistered)
+                                       i--;
                                device_unregister(dev);
                                put_device(dev);
                                continue;
@@ -1586,6 +1598,12 @@ int __init ap_module_init(void)
                           ap_domain_index);
                return -EINVAL;
        }
+       /* In resume callback we need to know if the user had set the domain.
+        * If so, we can not just reset it.
+        */
+       if (ap_domain_index >= 0)
+               user_set_domain = 1;
+
        if (ap_instructions_available() != 0) {
                pr_warning("The hardware system does not support "
                           "AP instructions\n");
index a4b2c576144bee8000be14bf42781b1d7bc0e512..c84eadd3602af2883dbc8aa719aa2f576962c831 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 3ff726afafc6cf0b1bf92bfbe0342374f4618240..0e1a34627a2e694d25d3abe135991df91c997035 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 6d46516846884515bd56b35a9f0d28b342df1b03..869a30b49edc93620b38848b369395dbae37bf13 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 e6f2bb7365e64da1736a7a45759ddb3a2ec34638..8dfb59d58992fb96e1825480ca2a76a4ec011e89 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 906cef5cda86e113b4563419eded632a8edc3bc5..41e1b0e7e2ef30403909c226c21f6365afa73c1c 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 9df7ed38e1be8df7714463918a246910b199d11b..9a1bd9534d744fd2e3454ea3c8ff67673324e02b 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 7dc3d1894b1a281580a83aff2f4660b46daebfa1..a39addc3a596625ad03b9c0dbe0183c610d5194c 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 40e3cafb3a9c54e44e813f738a01eec9c060498a..83c8b5e4fc8b45856a37f2a58fb5727a4a740fa7 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 a89c421dab51b0b6d29dd94273b934244adf0c52..8dd96dcd716ce66089c13204166170446193c75a 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 4968c4ced385f0c46a46bbd903586bef7c68dc12..848b59466850ac1427a1647047aa35a4f607ff8e 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 cce0fe4c8a3b91fb86f535fa2ae6d6bf2f79f226..eb61f7a70e1d45f37da30e0ec773379f3c29017d 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 75ab00631c417710a36bc1779525fd6f49a74520..3c30c56aa2e16eb4c24907545d1d423d39b10c08 100644 (file)
@@ -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 2514d00c0f6f127ca8b8c3b41dd85c01935f95d5..1689bda1d13b0b486096c584ec8d73da4464b965 100644 (file)
@@ -2426,7 +2426,7 @@ struct tty_driver *uart_console_device(struct console *co, int *index)
 /**
  *     uart_add_one_port - attach a driver-defined port structure
  *     @drv: pointer to the uart low level driver structure for this port
- *     @port: uart port structure to use for this port.
+ *     @uport: uart port structure to use for this port.
  *
  *     This allows the driver to register its own uart_port structure
  *     with the core driver.  The main purpose is to allow the low
@@ -2499,7 +2499,7 @@ int uart_add_one_port(struct uart_driver *drv, struct uart_port *uport)
 /**
  *     uart_remove_one_port - detach a driver defined port structure
  *     @drv: pointer to the uart low level driver structure for this port
- *     @port: uart port structure for this port
+ *     @uport: uart port structure for this port
  *
  *     This unhooks (and hangs up) the specified port structure from the
  *     core driver.  No further calls will be made to the low-level code
diff --git a/drivers/sfi/Kconfig b/drivers/sfi/Kconfig
new file mode 100644 (file)
index 0000000..dd11512
--- /dev/null
@@ -0,0 +1,17 @@
+#
+# SFI Configuration
+#
+
+menuconfig SFI
+       bool "SFI (Simple Firmware Interface) Support"
+       ---help---
+       The Simple Firmware Interface (SFI) provides a lightweight method
+       for platform firmware to pass information to the operating system
+       via static tables in memory.  Kernel SFI support is required to
+       boot on SFI-only platforms.  Currently, all SFI-only platforms are
+       based on the 2nd generation Intel Atom processor platform,
+       code-named Moorestown.
+
+       For more information, see http://simplefirmware.org
+
+       Say 'Y' here to enable the kernel to boot on SFI-only platforms.
diff --git a/drivers/sfi/Makefile b/drivers/sfi/Makefile
new file mode 100644 (file)
index 0000000..2343732
--- /dev/null
@@ -0,0 +1,3 @@
+obj-y  += sfi_acpi.o
+obj-y  += sfi_core.o
+
diff --git a/drivers/sfi/sfi_acpi.c b/drivers/sfi/sfi_acpi.c
new file mode 100644 (file)
index 0000000..34aba30
--- /dev/null
@@ -0,0 +1,175 @@
+/* sfi_acpi.c Simple Firmware Interface - ACPI extensions */
+
+/*
+
+  This file is provided under a dual BSD/GPLv2 license.  When using or
+  redistributing this file, you may do so under either license.
+
+  GPL LICENSE SUMMARY
+
+  Copyright(c) 2009 Intel Corporation. All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of version 2 of the GNU General Public License 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., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+  The full GNU General Public License is included in this distribution
+  in the file called LICENSE.GPL.
+
+  BSD LICENSE
+
+  Copyright(c) 2009 Intel Corporation. All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * 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.
+    * Neither the name of Intel Corporation nor the names of its
+      contributors may 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.
+
+*/
+
+#define KMSG_COMPONENT "SFI"
+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
+
+#include <linux/kernel.h>
+#include <acpi/acpi.h>
+
+#include <linux/sfi.h>
+#include "sfi_core.h"
+
+/*
+ * SFI can access ACPI-defined tables via an optional ACPI XSDT.
+ *
+ * This allows re-use, and avoids re-definition, of standard tables.
+ * For example, the "MCFG" table is defined by PCI, reserved by ACPI,
+ * and is expected to be present many SFI-only systems.
+ */
+
+static struct acpi_table_xsdt *xsdt_va __read_mostly;
+
+#define XSDT_GET_NUM_ENTRIES(ptable, entry_type) \
+       ((ptable->header.length - sizeof(struct acpi_table_header)) / \
+       (sizeof(entry_type)))
+
+static inline struct sfi_table_header *acpi_to_sfi_th(
+                               struct acpi_table_header *th)
+{
+       return (struct sfi_table_header *)th;
+}
+
+static inline struct acpi_table_header *sfi_to_acpi_th(
+                               struct sfi_table_header *th)
+{
+       return (struct acpi_table_header *)th;
+}
+
+/*
+ * sfi_acpi_parse_xsdt()
+ *
+ * Parse the ACPI XSDT for later access by sfi_acpi_table_parse().
+ */
+static int __init sfi_acpi_parse_xsdt(struct sfi_table_header *th)
+{
+       struct sfi_table_key key = SFI_ANY_KEY;
+       int tbl_cnt, i;
+       void *ret;
+
+       xsdt_va = (struct acpi_table_xsdt *)th;
+       tbl_cnt = XSDT_GET_NUM_ENTRIES(xsdt_va, u64);
+       for (i = 0; i < tbl_cnt; i++) {
+               ret = sfi_check_table(xsdt_va->table_offset_entry[i], &key);
+               if (IS_ERR(ret)) {
+                       disable_sfi();
+                       return -1;
+               }
+       }
+
+       return 0;
+}
+
+int __init sfi_acpi_init(void)
+{
+       struct sfi_table_key xsdt_key = { .sig = SFI_SIG_XSDT };
+
+       sfi_table_parse(SFI_SIG_XSDT, NULL, NULL, sfi_acpi_parse_xsdt);
+
+       /* Only call the get_table to keep the table mapped */
+       xsdt_va = (struct acpi_table_xsdt *)sfi_get_table(&xsdt_key);
+       return 0;
+}
+
+static struct acpi_table_header *sfi_acpi_get_table(struct sfi_table_key *key)
+{
+       u32 tbl_cnt, i;
+       void *ret;
+
+       tbl_cnt = XSDT_GET_NUM_ENTRIES(xsdt_va, u64);
+       for (i = 0; i < tbl_cnt; i++) {
+               ret = sfi_check_table(xsdt_va->table_offset_entry[i], key);
+               if (!IS_ERR(ret) && ret)
+                       return sfi_to_acpi_th(ret);
+       }
+
+       return NULL;
+}
+
+static void sfi_acpi_put_table(struct acpi_table_header *table)
+{
+       sfi_put_table(acpi_to_sfi_th(table));
+}
+
+/*
+ * sfi_acpi_table_parse()
+ *
+ * Find specified table in XSDT, run handler on it and return its return value
+ */
+int sfi_acpi_table_parse(char *signature, char *oem_id, char *oem_table_id,
+                       int(*handler)(struct acpi_table_header *))
+{
+       struct acpi_table_header *table = NULL;
+       struct sfi_table_key key;
+       int ret = 0;
+
+       if (sfi_disabled)
+               return -1;
+
+       key.sig = signature;
+       key.oem_id = oem_id;
+       key.oem_table_id = oem_table_id;
+
+       table = sfi_acpi_get_table(&key);
+       if (!table)
+               return -EINVAL;
+
+       ret = handler(table);
+       sfi_acpi_put_table(table);
+       return ret;
+}
diff --git a/drivers/sfi/sfi_core.c b/drivers/sfi/sfi_core.c
new file mode 100644 (file)
index 0000000..d3b4968
--- /dev/null
@@ -0,0 +1,407 @@
+/* sfi_core.c Simple Firmware Interface - core internals */
+
+/*
+
+  This file is provided under a dual BSD/GPLv2 license.  When using or
+  redistributing this file, you may do so under either license.
+
+  GPL LICENSE SUMMARY
+
+  Copyright(c) 2009 Intel Corporation. All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of version 2 of the GNU General Public License 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., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+  The full GNU General Public License is included in this distribution
+  in the file called LICENSE.GPL.
+
+  BSD LICENSE
+
+  Copyright(c) 2009 Intel Corporation. All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * 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.
+    * Neither the name of Intel Corporation nor the names of its
+      contributors may 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.
+
+*/
+
+#define KMSG_COMPONENT "SFI"
+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
+
+#include <linux/bootmem.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/errno.h>
+#include <linux/types.h>
+#include <linux/acpi.h>
+#include <linux/init.h>
+#include <linux/sfi.h>
+
+#include "sfi_core.h"
+
+#define ON_SAME_PAGE(addr1, addr2) \
+       (((unsigned long)(addr1) & PAGE_MASK) == \
+       ((unsigned long)(addr2) & PAGE_MASK))
+#define TABLE_ON_PAGE(page, table, size) (ON_SAME_PAGE(page, table) && \
+                               ON_SAME_PAGE(page, table + size))
+
+int sfi_disabled __read_mostly;
+EXPORT_SYMBOL(sfi_disabled);
+
+static u64 syst_pa __read_mostly;
+static struct sfi_table_simple *syst_va __read_mostly;
+
+/*
+ * FW creates and saves the SFI tables in memory. When these tables get
+ * used, they may need to be mapped to virtual address space, and the mapping
+ * can happen before or after the ioremap() is ready, so a flag is needed
+ * to indicating this
+ */
+static u32 sfi_use_ioremap __read_mostly;
+
+static void __iomem *sfi_map_memory(u64 phys, u32 size)
+{
+       if (!phys || !size)
+               return NULL;
+
+       if (sfi_use_ioremap)
+               return ioremap(phys, size);
+       else
+               return early_ioremap(phys, size);
+}
+
+static void sfi_unmap_memory(void __iomem *virt, u32 size)
+{
+       if (!virt || !size)
+               return;
+
+       if (sfi_use_ioremap)
+               iounmap(virt);
+       else
+               early_iounmap(virt, size);
+}
+
+static void sfi_print_table_header(unsigned long long pa,
+                               struct sfi_table_header *header)
+{
+       pr_info("%4.4s %llX, %04X (v%d %6.6s %8.8s)\n",
+               header->sig, pa,
+               header->len, header->rev, header->oem_id,
+               header->oem_table_id);
+}
+
+/*
+ * sfi_verify_table()
+ * Sanity check table lengh, calculate checksum
+ */
+static __init int sfi_verify_table(struct sfi_table_header *table)
+{
+
+       u8 checksum = 0;
+       u8 *puchar = (u8 *)table;
+       u32 length = table->len;
+
+       /* Sanity check table length against arbitrary 1MB limit */
+       if (length > 0x100000) {
+               pr_err("Invalid table length 0x%x\n", length);
+               return -1;
+       }
+
+       while (length--)
+               checksum += *puchar++;
+
+       if (checksum) {
+               pr_err("Checksum %2.2X should be %2.2X\n",
+                       table->csum, table->csum - checksum);
+               return -1;
+       }
+       return 0;
+}
+
+/*
+ * sfi_map_table()
+ *
+ * Return address of mapped table
+ * Check for common case that we can re-use mapping to SYST,
+ * which requires syst_pa, syst_va to be initialized.
+ */
+struct sfi_table_header *sfi_map_table(u64 pa)
+{
+       struct sfi_table_header *th;
+       u32 length;
+
+       if (!TABLE_ON_PAGE(syst_pa, pa, sizeof(struct sfi_table_header)))
+               th = sfi_map_memory(pa, sizeof(struct sfi_table_header));
+       else
+               th = (void *)syst_va + (pa - syst_pa);
+
+        /* If table fits on same page as its header, we are done */
+       if (TABLE_ON_PAGE(th, th, th->len))
+               return th;
+
+       /* Entire table does not fit on same page as SYST */
+       length = th->len;
+       if (!TABLE_ON_PAGE(syst_pa, pa, sizeof(struct sfi_table_header)))
+               sfi_unmap_memory(th, sizeof(struct sfi_table_header));
+
+       return sfi_map_memory(pa, length);
+}
+
+/*
+ * sfi_unmap_table()
+ *
+ * Undoes effect of sfi_map_table() by unmapping table
+ * if it did not completely fit on same page as SYST.
+ */
+void sfi_unmap_table(struct sfi_table_header *th)
+{
+       if (!TABLE_ON_PAGE(syst_va, th, th->len))
+               sfi_unmap_memory(th, TABLE_ON_PAGE(th, th, th->len) ?
+                                       sizeof(*th) : th->len);
+}
+
+static int sfi_table_check_key(struct sfi_table_header *th,
+                               struct sfi_table_key *key)
+{
+
+       if (strncmp(th->sig, key->sig, SFI_SIGNATURE_SIZE)
+               || (key->oem_id && strncmp(th->oem_id,
+                               key->oem_id, SFI_OEM_ID_SIZE))
+               || (key->oem_table_id && strncmp(th->oem_table_id,
+                               key->oem_table_id, SFI_OEM_TABLE_ID_SIZE)))
+               return -1;
+
+       return 0;
+}
+
+/*
+ * This function will be used in 2 cases:
+ * 1. used to enumerate and verify the tables addressed by SYST/XSDT,
+ *    thus no signature will be given (in kernel boot phase)
+ * 2. used to parse one specific table, signature must exist, and
+ *    the mapped virt address will be returned, and the virt space
+ *    will be released by call sfi_put_table() later
+ *
+ * Return value:
+ *     NULL:                   when can't find a table matching the key
+ *     ERR_PTR(error):         error value
+ *     virt table address:     when a matched table is found
+ */
+struct sfi_table_header *sfi_check_table(u64 pa, struct sfi_table_key *key)
+{
+       struct sfi_table_header *th;
+       void *ret = NULL;
+
+       th = sfi_map_table(pa);
+       if (!th)
+               return ERR_PTR(-ENOMEM);
+
+       if (!key->sig) {
+               sfi_print_table_header(pa, th);
+               if (sfi_verify_table(th))
+                       ret = ERR_PTR(-EINVAL);
+       } else {
+               if (!sfi_table_check_key(th, key))
+                       return th;      /* Success */
+       }
+
+       sfi_unmap_table(th);
+       return ret;
+}
+
+/*
+ * sfi_get_table()
+ *
+ * Search SYST for the specified table with the signature in
+ * the key, and return the mapped table
+ */
+struct sfi_table_header *sfi_get_table(struct sfi_table_key *key)
+{
+       struct sfi_table_header *th;
+       u32 tbl_cnt, i;
+
+       tbl_cnt = SFI_GET_NUM_ENTRIES(syst_va, u64);
+       for (i = 0; i < tbl_cnt; i++) {
+               th = sfi_check_table(syst_va->pentry[i], key);
+               if (!IS_ERR(th) && th)
+                       return th;
+       }
+
+       return NULL;
+}
+
+void sfi_put_table(struct sfi_table_header *th)
+{
+       sfi_unmap_table(th);
+}
+
+/* Find table with signature, run handler on it */
+int sfi_table_parse(char *signature, char *oem_id, char *oem_table_id,
+                       sfi_table_handler handler)
+{
+       struct sfi_table_header *table = NULL;
+       struct sfi_table_key key;
+       int ret = -EINVAL;
+
+       if (sfi_disabled || !handler || !signature)
+               goto exit;
+
+       key.sig = signature;
+       key.oem_id = oem_id;
+       key.oem_table_id = oem_table_id;
+
+       table = sfi_get_table(&key);
+       if (!table)
+               goto exit;
+
+       ret = handler(table);
+       sfi_put_table(table);
+exit:
+       return ret;
+}
+EXPORT_SYMBOL_GPL(sfi_table_parse);
+
+/*
+ * sfi_parse_syst()
+ * Checksum all the tables in SYST and print their headers
+ *
+ * success: set syst_va, return 0
+ */
+static int __init sfi_parse_syst(void)
+{
+       struct sfi_table_key key = SFI_ANY_KEY;
+       int tbl_cnt, i;
+       void *ret;
+
+       syst_va = sfi_map_memory(syst_pa, sizeof(struct sfi_table_simple));
+       if (!syst_va)
+               return -ENOMEM;
+
+       tbl_cnt = SFI_GET_NUM_ENTRIES(syst_va, u64);
+       for (i = 0; i < tbl_cnt; i++) {
+               ret = sfi_check_table(syst_va->pentry[i], &key);
+               if (IS_ERR(ret))
+                       return PTR_ERR(ret);
+       }
+
+       return 0;
+}
+
+/*
+ * The OS finds the System Table by searching 16-byte boundaries between
+ * physical address 0x000E0000 and 0x000FFFFF. The OS shall search this region
+ * starting at the low address and shall stop searching when the 1st valid SFI
+ * System Table is found.
+ *
+ * success: set syst_pa, return 0
+ * fail: return -1
+ */
+static __init int sfi_find_syst(void)
+{
+       unsigned long offset, len;
+       void *start;
+
+       len = SFI_SYST_SEARCH_END - SFI_SYST_SEARCH_BEGIN;
+       start = sfi_map_memory(SFI_SYST_SEARCH_BEGIN, len);
+       if (!start)
+               return -1;
+
+       for (offset = 0; offset < len; offset += 16) {
+               struct sfi_table_header *syst_hdr;
+
+               syst_hdr = start + offset;
+               if (strncmp(syst_hdr->sig, SFI_SIG_SYST,
+                               SFI_SIGNATURE_SIZE))
+                       continue;
+
+               if (syst_hdr->len > PAGE_SIZE)
+                       continue;
+
+               sfi_print_table_header(SFI_SYST_SEARCH_BEGIN + offset,
+                                       syst_hdr);
+
+               if (sfi_verify_table(syst_hdr))
+                       continue;
+
+               /*
+                * Enforce SFI spec mandate that SYST reside within a page.
+                */
+               if (!ON_SAME_PAGE(syst_pa, syst_pa + syst_hdr->len)) {
+                       pr_info("SYST 0x%llx + 0x%x crosses page\n",
+                                       syst_pa, syst_hdr->len);
+                       continue;
+               }
+
+               /* Success */
+               syst_pa = SFI_SYST_SEARCH_BEGIN + offset;
+               sfi_unmap_memory(start, len);
+               return 0;
+       }
+
+       sfi_unmap_memory(start, len);
+       return -1;
+}
+
+void __init sfi_init(void)
+{
+       if (!acpi_disabled)
+               disable_sfi();
+
+       if (sfi_disabled)
+               return;
+
+       pr_info("Simple Firmware Interface v0.7 http://simplefirmware.org\n");
+
+       if (sfi_find_syst() || sfi_parse_syst() || sfi_platform_init())
+               disable_sfi();
+
+       return;
+}
+
+void __init sfi_init_late(void)
+{
+       int length;
+
+       if (sfi_disabled)
+               return;
+
+       length = syst_va->header.len;
+       sfi_unmap_memory(syst_va, sizeof(struct sfi_table_simple));
+
+       /* Use ioremap now after it is ready */
+       sfi_use_ioremap = 1;
+       syst_va = sfi_map_memory(syst_pa, length);
+
+       sfi_acpi_init();
+}
diff --git a/drivers/sfi/sfi_core.h b/drivers/sfi/sfi_core.h
new file mode 100644 (file)
index 0000000..da82d39
--- /dev/null
@@ -0,0 +1,70 @@
+/* sfi_core.h Simple Firmware Interface, internal header */
+
+/*
+
+  This file is provided under a dual BSD/GPLv2 license.  When using or
+  redistributing this file, you may do so under either license.
+
+  GPL LICENSE SUMMARY
+
+  Copyright(c) 2009 Intel Corporation. All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of version 2 of the GNU General Public License 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., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+  The full GNU General Public License is included in this distribution
+  in the file called LICENSE.GPL.
+
+  BSD LICENSE
+
+  Copyright(c) 2009 Intel Corporation. All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * 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.
+    * Neither the name of Intel Corporation nor the names of its
+      contributors may 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.
+
+*/
+struct sfi_table_key{
+       char    *sig;
+       char    *oem_id;
+       char    *oem_table_id;
+};
+
+#define SFI_ANY_KEY { .sig = NULL, .oem_id = NULL, .oem_table_id = NULL }
+
+extern int __init sfi_acpi_init(void);
+extern  struct sfi_table_header *sfi_check_table(u64 paddr,
+                                       struct sfi_table_key *key);
+struct sfi_table_header *sfi_get_table(struct sfi_table_key *key);
+extern void sfi_put_table(struct sfi_table_header *table);
index 2c733c27db2f4dd95d938528d52104ab4c9d0a85..4b6f7cba3b3dc536d6e8480d5c2b1e14523bb329 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 3de408d294bac6910a1ff71997367043bbd5b1f9..6d7a3f82c54b400e3d51adf59b3189857e699833 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 9b80ad36dbbad224c28d89475d0f91e8794d826b..ba1a872b221e3ea30d287c01f41ba67b694ff953 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 8980a5640bd9d16021367720b77690d783dfac3b..e75ba9b2889828a8930d68a6f7c37c25bf926063 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 d949dbf1141f58c97317c4211cd58999c65b895f..31dd56f0dae93a21626c8ec1ffe3a02eca834b3a 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 70845ccd85c380ce148683232c609bdd933f0635..b76f2468a84a10d6afa8f6a583b1e9bb44c79bc3 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 3f3119d760db71fc653b75e77615ce8069b7c300..33d94f76b9ef47fd92bddd54815e72262b6dffda 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 606e7a40a8da85d415b7d69efe65664528b681bd..f921bd1109e1c1ff9a26e851e19a484860b19c08 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 455991fbe28f0cb300ff354d0b5106d12cd7125a..bf9540f5fb98de7ad1f7c523a96548382984848d 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 3f498f6f3ff623f03fb6285cd403ce93551c1498..90fd40f24734244b52fb617ed642e3da45810088 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 12d414deaad651ed7e2b0edeeeffafcb1e314631..be99eb33d8177c61f4de1a4dec665edbd1218d1b 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 a86e952ed4ca4de05891b19d54ef185802048bfc..bf7c687519ef4026ea2a4a7b6506287a47843d6e 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 dcd49f1e96d006d1abb04271687d90f0f52a9ef5..ebd7237230e34107398929f6b662a0a04f54fc40 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 19cb7d5480d78636f3eb036dbd77c37fc99a16d9..be3c9b80bc9fb1bfda456f77fc9e83b681ca4dec 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 85a1a55815cfce2ee4391b38fd1e20ca68b1354f..e3861b21e776600fb721699c8ede4e62dc51f8fc 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);
index ba589d4ca8bcb9e8783cc47bce18cab3faaa8301..3e564bfe17d16b8673f26bdd32fc4da64e201fdc 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 b09a527f73411499e2ab712c0f4d1b6f7d2c1946..333ee02e7b2b2a7bcf94baf5a2af0245185c0da7 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 a16c538d0132958ab330b6993267663d45d4c4ef..0d3af6a6ee4992d258e44bc9228d7e91c81a4f2a 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 4247eccf858c62c656cc58e91a40591eb3789786..181f78c84105c090df4689b44845638472ccb8ef 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 69e5773abfce2459cd65d11a939f9f6250ab7468..4f864472c5c4db4eea4004cd49e902cb4acd75c9 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 30ecac3af15a4a3749750b680f4e66b2aa284912..05e6d313961e3e3ce9ed3a09126f80ba65f7daff 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 95ccfa0b9fc52876f5166b3edea039409adf9a33..34de475f016e790efbba02ada9067131870c294d 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 ec5c67ea07b745a95b92e8db88349abadc1bbca1..79782a1c43f6098d98ac008bb5591b8607911ca1 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 71f86c60d83c3962cf8b7eabe1d709d2d87b7a76..5ce839137ad6a8350b4a6053f5076582ce076487 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 ffe75e83787c2216c7655dcb81abc51b7e52ccbb..97b40ce133f0a8b7165a742d885dd91656843bc1 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 9720e699f4729737cbdd90946f234e567fc0d874..da718e84d58d17fc0bc66d6f44472bea11484ea8 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 43ee943d757aaaafa200c982f32135678b24e975..b1b85abb9a2df7c4177491c06f216daa9e40a3be 100644 (file)
@@ -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 c0e0ae2bb8e72e50e40fe62492cd37d4559ce4fb..9a8b15e6377acab8cf23be6b864f14577561fdbe 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 9f986b417c5b0ce538b6ca08d5309a9bf6989072..33351312327fbe900bcb370bebc49c37bc5a4cd3 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 77352ccc245e0ab3a456b22ce0ed6a8b2f7e411b..d5b65962dd36a0bf9050cd61c51140979f9ca3d2 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 72bae8f39d814310ef477df5c987318e79000835..66450a1abc227a3fc437e165a385b161fd7b9792 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 9f80f4e970bd00693cf3140483940eb46843cdef..a3a0f4a27ef0d9edea1720aba630050ab9abd7ab 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 59e85234fa0ad614cfb9a181d27007653c250a51..d05397ec8a183ebb4467b10f55fe9b67e1cce189 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 a56b24d305f8209e869e8877091720b4b880e9b0..5e0966485188910b8716477c8422aebcdc03afef 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 bd102f5052ba67453c3a2dd30a2eefde46ce59ee..f37de283d0ab769e37c506c24e4e433ba2ffb583 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 66527ba2d2ea990f987fe7720726f258b91653b1..98e9bb977291f3b61139c945df3cd5d9c4fda2a9 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 424a37c5773f5ac341b9659bc4480cb9ee3e9df6..c9966cc07d3a87576ab749286650e5c5ab3e6b0f 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 d701bf4698d222f5b6a3ed50ff159b4de854f626..7881f12413c40386924629ad0f5a3ff30ea09440 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 b9312dc6e04151f60c4dea4dce27b36c74e3ae87..d0b1e836f0e051582880e5f04a27829967508389 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 7d33f50b5874bc683ed42db17aa87c8b59544035..c44367fea185822919231f87e16fcf9a6d994461 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 ed21e263f832f05d977aa4c4acd41881dd013002..e6fedbd5a6545d539329983ec4c2a0e666cfd118 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 1d51aa21e6eb0d6f16e5d49c0dd8a8968b60a780..f572c5617462f4c15130d53ef33b1a628064dad0 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 ca41b0b5afb352233e86c5ccbd45dace08f4431a..48267bc0b2e00c151bf05e8ed6caa2662e1de9a5 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 aac61dfe0f034d170a74151bb1070b1260341fa4..c236aaa9dcd174db90b7991f719bdda860658b9d 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 50c71aae2cc26046bfed0a8320319951ef7534ed..4b5dbd0127f500a458094d4e7fc4fc267de146be 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 a9b452fe622195ad832acdc78fba40759218f820..d5f4c1d45c9703add01e29e582e5f705e87cc83f 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 0f3d22fc030e54c6315400cef10215fffb61363d..b5200d551458d9dc6a75fe88c9c1ac014e588d13 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 c665219539170988c1083d6b379dec303b68fb08..f8751ff863cdfa0711e661812f4ed0bc066aae59 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 0d1f7ae3b0713877abc8c1f4d04b392ca1f0c2e9..91b39ffdf6eacc56b4a56807913bf166d2657398 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 fc6e709f45b1b184891b0201cffcbeef17daf09f..adf8260c3a6aeff9f295e4ad5bf45cdfcb23233c 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 f21ca7d27a4305d7e27a093a7561cde91cfa9d3f..9b43b226817f161d89324c965e647b18611e66d2 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 289d748bb41422ae6d607130a09fe3c410037049..f58b2494c44a841ed87ad0edbbedaa274054f0a0 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 59d208d94d4e772d5b1a8cc6f8a009d94132625f..ed77be76d6bb0102f4a6078a2b76f65d769ce1ac 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 7f4ace73d44aee2da8e9484be8f103d8ec1e9bea..874d2000bf92b54b42eb94ab6d80d7f884ebdff2 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 11c627ce60224754978bf495e40cd94496c3b7c7..9835e0713943397fde9b5200f58fa36ab7db547a 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 f46ad27c9a90e2cda2e8bbb8b9b45c861af765c5..1b6f1c0e5cee23c6c62f406c204a655d9b13fe67 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 10d52919abbb1513feefe95ecaa5c5aa518a7443..aeda96e0af67bd6eb43b3b607e2c7a3817da8c5d 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 c2f1b7df918cd52ddd62385e3f02f5696d7f6f06..378861b9d79a96fe926dcf86755c984646528a22 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 7673554fa64df28317e4edb9e97eecedd3272fc8..00ad9ce392ed6871c35a31b429865909874f33e5 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 edd61ee90323ce99a5b8fe9eba5fec0c18b2fd23..3ea05936851ff72568ff1e655300eee6bd013df9 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 2bfff30f4704f7521678239df30c07323e0d3e59..064e76821ff5852e557b9c9dd5de9a297e79caf2 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 15438469f21aae35b49543c5bd95d6c6a6c086d6..9600a58299db3f8c29ac575fccda0d97dacccbc2 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 462f4943cb1b8d4d65cb3675a6bc9a2ae40d968c..6931ef5c9650999ee68807632e026082ff92b09c 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 d4feebfc63bd1b51088a9e22cc618db1eb0f092b..1c9f977a5c9c4bcfa16b86a4f295360dfc8a1059 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 bb5e6f67157837691f4b22130133c4dc1283469e..7ccffcbe7b6f48f7ef1f0dc24b183f7be0e7a3ab 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 2ac4e022a13f6fc68c6ea32702f1bab05713b88a..e4380082ebb110a0e77a8b509da9cc72e66837d2 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 b0dbf4157d29d5b26779f95e081e358beec4c86d..4e681613e7ae1fc846b42c40b8db5f4b8ffa97eb 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 58151687d3518ef8da2938ae1fb34babe1a3caca..78bb7710f36d9ef641f7857b3f688b5c2c9640af 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 e44dc2cbca24006e1b81d57cf589213ee823295c..b5294a9344de4984e79138226bd9edfa92939d1d 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 c2d80f80448b2e77690f8f29cc64f3402cd9dd78..16fecb8ecc39dde0360153ac4f1637c036fd0ab5 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 5ac489ee3dab80a766db23a0199186e9f3628585..50f57f468836da478f87c19e353dfb811f112b93 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 83b5f9cea85ac9f43af8d3b1eb87a259517cc05c..23cf3bde476262d417ded0792a87933cb58efb36 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 a949259f18b984794d9bc46200e1f0e3303e1f6e..5b22a4d1c9e491e3489e31ce3803623cec5c67c6 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 64e57bfe236ba89019c0884432cb44e9f2d72fd8..acd582c0280203910bdfbdb0acb8c4120ec5353d 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 c2050785a819f76b0157bc0490b66d31977999c8..c632437c7649db90d22219e0ad421caafb8e5db2 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 e019a5058ab86b355ac9106691d7a67fc20dd204..687b622a1612e49d024c9b2494c33cb3064bbe2d 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 ff4ef9e910d975ce5b6584cd66f420f1c58249cf..a9e05bac66463c919cc0943d9df25b0b6d142c3d 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 640b38fbd0518904f6102d2594f4991e1f8d6bfd..1b9dc15715703781922100186a7e354277969e73 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 794dba0d0f0a08440f78f899a4ad17b7af678575..e8d0001605be2c7192d2a01d0400877bbd2b234d 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 705e34324156f069ce4d56f7e596732bbc2fcc93..33128d52f21285ae04272e56659b6f800ea4bebd 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 816c39caca1cf6bf5e1ca9b4a9c8c5d03684fcf3..99911e727e0b7950e4a11dec17bb17f08151e5e4 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 e6b9a1c6002d3da5b43c65161cca881d18a8e214..1db4fea8c1704e62cdc33ddfeacc353f70273a09 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 592fe7e623f7a0d8f863a5d72a67dae42c4ea7aa..06595ec27bb71af11cd4524c316070c61da1f2d0 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 aa88a067148bb70584bdaaaf9c56ccb39b32d3c3..173c39c7648912a1e63ef53a38881c4091094a07 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 d31d32206ba318fbf28ea23a105a0bfa81f82f92..4b254b6fa2456468731925199a69de85afd84602 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 4541dfcea88fa8d294e8c05ba1eccbbaff5bb34b..459a7287fe01972ceecd944a32cb85efdf297a3c 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 6da8887538c7ecd0d4359eade1285e8800cbb159..1337a9ce80b9c8a66a546c646e24261ae6e73433 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 ad4fb15b5dcbcaa6a12b26037880e4121900d9a2..90f130126c10d605db2115ee6c16afe8329266cb 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 97efeaec4d523a6c854084355117abc6ee6a6305..faa6d623de789ea5e6334e84651ba0675f852cf9 100644 (file)
@@ -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 b4ec716de7dadc12b766e445822edbc4f35f537a..0025847743f30fc12500045e7980bd5568e4e83c 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 cf0b4a5883f665f27f2f9d34d13e9854d080565f..55492a5930bd19c75bb76d77d3d3ba42945e90db 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 28a6a3a09538599d94326c3a5ff5aa33f1206b04..3db255537e7913d2de5d0b03781fc20768af2a91 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 f28f350cd96aebb3a08e6ac31b0e8f063ae613d4..635745f57fbdf4c8a1dafbdd01245c56ff75fc1d 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 c6516b56673182cd6a3425f4ee495d83c6320eb1..384b198faa7c0365f941267cee267cf8587e4153 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 0f7a30b7d2d16e08f7c63ddc1711833d0667fc15..dfdc43e2e00df86414fd2097e24a578c53e16174 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 5e0ab4201c00894def56d3c182461173c89344c7..e0c2db3b767b7cb91539e1ed1fe8f386beebc268 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 a7eb4c99342c91d0fabdb8a6d9beab5e09b093b9..9f1a9227ebe6571454ee3081d4df80ec5490f4c7 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 f5d84ff8c101b2c783a5b3cca9307ffb600ed21c..df9a4df342c7b80fdf28049ccfaa331a8279e2ea 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 1d26beddf2ca846f92ecfd8fa294fa8bb24ff363..3a61ddb62bd28a45947a1e4d198fe6304c2d0d5b 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 e0d56ef2bcb08dd522958e8456369563436e107e..77a5f4188999c20a737fc0f0874d205b8371ddf4 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 5d25d3e52bf61016a2619a2ae1520826ccee3972..131e61adaaf72bdab5da517830ed43293eb2a69e 100644 (file)
@@ -31,10 +31,20 @@ 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);
 
+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,
                               __u16 value, __u16 index)
@@ -84,11 +94,21 @@ static int ark3116_attach(struct usb_serial *serial)
                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);
@@ -125,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);
index 8c894a7d5dcfcfc2e498e3e010956bb2079e6648..59eff721fcc5bb1e3374b1bfd098b0a67b558ddc 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 [] = {
@@ -373,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)
 {
@@ -576,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 e772b01ac3ac0a6159b508dced9cb2132d0b8222..1fd360e040654ffba4d620ad78af1c1c3d614bbb 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 76a17f915eef60d09a30c78b684c3a3ddba83e71..4f883b1773d0541f2b2a536c2908c68a149affe1 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 */
 };
index 8c92b88166aec7a50be1f14aba009b802d518193..6f31e0d7189889aca4f47758f0790aebe40f747d 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 d9398e9f30ce7ae6ef50f5d867973966e4047079..deba08c7a0151da060ffc66f01a02325da1cbe6b 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;
 
@@ -166,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);
@@ -272,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);
 
@@ -287,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);
 
@@ -355,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);
@@ -377,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;
@@ -485,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);
@@ -559,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 dc0f832657e699fd12728b8ccbc139122b307e1d..b97960ac92f2762bbe4938ddc1d76812fd726864 100644 (file)
@@ -2540,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 6138c1cda35ff00a94383da4d0be4002a257d19d..e6e02b178d2bbef5df8c27967061b7e0b1587ed4 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);
 
@@ -79,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) */
 };
 
 
@@ -114,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);
@@ -1009,11 +1012,7 @@ 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);
        }
 }
 
@@ -1182,6 +1181,95 @@ static int iuu_open(struct tty_struct *tty, struct usb_serial_port *port)
        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,
@@ -1189,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,
@@ -1238,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 a61673133d7db07e4b92b53df48a465c7036d01d..f7373371b137fd996a100ffbdfc74375a847afe4 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.
index b66b71ccd12b5da5b5519663398e012b40fe4610..99bd00f5188aeb1b76904e4c4edac767223a1645 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 fe47051dbef27a8000bdcd17b07cdfc8b785028f..f66e39883218c6052b3da7420cb6200818733787 100644 (file)
@@ -291,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
@@ -299,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
@@ -502,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) },
@@ -571,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) },
@@ -592,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,
@@ -639,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];
@@ -647,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) */
@@ -693,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;
 }
 
@@ -755,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);
 
@@ -782,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;
@@ -836,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;
 }
@@ -845,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();
@@ -963,10 +1009,13 @@ static int option_chars_in_buffer(struct tty_struct *tty)
 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__);
 
@@ -985,6 +1034,12 @@ static int option_open(struct tty_struct *tty, struct usb_serial_port *port)
 
        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;
 }
 
@@ -1009,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;
        }
 }
 
@@ -1123,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);
@@ -1225,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 */
@@ -1251,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;
                }
        }
 
@@ -1259,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 a63ea99936f79b46fec8a989890da0564d8fbf52..1128e01525b117001841dfd3462871bbbdc7e299 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);
 
index ee9505e1dd9273f17f5cede9f0e3418ec820b13f..d640dc951568dc705c3d7c2ae22ea7321d9afe11 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 55391bbe12304c508f9275602b2fe46abe566953..68fa0e43b78107fd7b02bac3d6ede9049edcbf01 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,6 +788,8 @@ 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;
        }
 }
 
@@ -738,6 +797,7 @@ 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;
@@ -771,6 +831,12 @@ static int sierra_open(struct tty_struct *tty, struct usb_serial_port *port)
        }
        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;
 }
 
@@ -818,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);
        }
@@ -844,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,
@@ -864,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 61e7c40b94fbd05b72b81765c48553d708e45bbd..1e58220403d1f7f466425d77c1d3ccf124fa993a 100644 (file)
@@ -544,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;
index 9d7ca4868d37cf642ba47fa1f34caa122d14be92..ff75a3589e7e9f809a6839053c20fb2442784d50 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"
 
 /*
@@ -292,8 +293,6 @@ static int serial_open(struct tty_struct *tty, struct file *filp)
 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
@@ -309,12 +308,8 @@ static void serial_down(struct usb_serial_port *port)
                return;
 
        mutex_lock(&port->mutex);
-       serial = port->serial;
-       owner = serial->type->driver.owner;
-
        if (drv->close)
                drv->close(port);
-
        mutex_unlock(&port->mutex);
 }
 
@@ -631,6 +626,8 @@ static void port_release(struct device *dev)
        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);
@@ -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;
@@ -1163,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);
index 2b6e565262c24d3801b418b7c1b2d529d4e694b3..ded836b02d7b87f03e507c6806f3d215f59e754f 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 ec17c96371afc7a71297ef8e8cbfd17299a0c5e3..105d900150c1a80155c2afcec6a61f4fb07fd0b4 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 1c69420e3acfbca73efd926d10d2f592dfdc685d..6168596c5ac68eccc72b6bacf1a42770df8a12c5 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 380233bd6a393c3522655922297849fa346f3f7a..80e65f29921cbed01c80406dddbe838feac5d11a 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 7477d411959f6ab30f73b1b4d03a4b9d880dd8a3..079ae0f7bec1b0b640eb6fa3d04a01f50c2f2cca 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 60ba631e99c22c07568e23daa6340d0563598f1e..b62f2bc064f695f732696dea3d5fd54d450e2704 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 586d350cdb4d23c65e0ea4d05d9a007dfddd001e..d6bea3e0b54a3c3493bb4b6106aad0d80c294770 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 73055530e60f487b8176225c659bb63870fd479d..b236e6969942f29b4031095e000e2ed4d6d287b0 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 11af4cb8924ef37282742fa23b3059d3b0c3524c..9bbb2855ea91918e7c56c97a095f46a01a6b93ce 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 01a819f47371420ed9c138155ce77d2c417a2d13..80232e124889b1eab9b26f4869c3a1a010aaade4 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 63d3739d43a85bf0e6264a51562f01283bb486ab..913b4a47ae52c6b90b028fa7ea3d8ed9f59be930 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 378f27745a1db94e18e8fd3b70d0318c2e88b490..a699aab638205c01b0765610cd9846a5468a8944 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 f8a4bb20f41af0f008cf4c260cc212984ce467d1..2211a852af9cfbfa01bb0af08fd88d492456afdb 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 2eb206bf73e65fb54026d318f281107ab601ec3f..4631ca8fa4a4a33dcc39eb3801dfbc5ee21de121 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 51422fc4f6060ff12b28ff05db0c55ea99613979..bbfb502add6717832a6675883be3722afd879907 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 b7fbc75a62fc7ec6c0dd6097af8a355d677724a8..50ec17dfc51725ad202cf1860da56c6241cf4ff9 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 8e653b8a6f17dcbdaa46f2942393e48c6d398a8b..b49063c831e76ca57811ab0afe23652ade90be46 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 df03f3776dcc3b41503018c0cc7d8045bbe67d88..79e5f40e6486687c8e43062c6aaece0c1dc2a071 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 69864b1b3f9ee149aa7f2adbf2676574d09c8d49..6b7c8fbc5495cf6429a9206e4ebb92a1ec85caee 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 3a44695b9c09b6c5c46b8fe9735b53df436177f8..5a686cea23f4931db5ad56b8cfe7f07471de90fd 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 d31b203bf6549bdb94b337e9f28f7265d8b544e4..3772433c49d16da2045b22939d54fd3b6139287c 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 74e96cf83b7e78af48e22013be8127cb3315acb0..da55ccaf4d55043bc3889bdba7feff1b6326213b 100644 (file)
@@ -589,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 a85c818be9453ecbdf11310b8a77f41435652000..a1f2e7ce730bd1881a4c2519617bb549761f4f72 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 30ae3022f63337f0426453eda4024d5aeea866f0..66358fa825f3888b763a4e513fece8869c6f602f 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 d42346e7fdda104da9e64776c21f3b8332812a7a..09f6e045d5beb19755a3449c711cf746321d9c4e 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 c17ed74501e9bcab890d748b91e77930b5db75d2..aac615d18440e39a0dde7497030bf4f407280cb8 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 c14e3e2212b395f911909b0d72b3342f83364bd6..f3728ab262f8a7d7c9c63b5d93940e5c7f4e37b7 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 a74e5da17aa074b2454d70e1f30f0b7c2c5223e4..f9fa0fd002922ba91f10e8508c8093817ad8fef6 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 7a98ce8043d7a95ca4abfd91c5e09a2349a4f716..c6ed7801efe2e15ec4b5ba2e6c23488ed9211a3a 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 4e825112a60173980018acd77f3398cfdb3d10b0..835aaaae6b9658eed7f22a4322e27254d01f1bf6 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 9c3aeee1cc4f4236ca070c25a82566dbe934915c..8335a6fe303e3ac9e4dd42423e6512f10355daee 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 f40c314b4c3006fda515384efc9d980c1e66f7e5..1e418e62c22d3b9f08732a024722adac32269a5c 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 0c1049b308bf3bb433867b0047b1b0afdda65e42..7064fb4427b6f44b2c45fd26860e31a2e6ccdefc 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 95883236c0cd902e3ac91d9fa28410ebfeeb6e63..f3a4e15672d929dfbedc0ff3bbed375a9bc27b57 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 ebcb5c6b4962bb23cfab791073c9803244efa85f..78414baa5a54f185da5d43f2b9deaa7c70e66e0d 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 6209a761f674e990c7c93d5746f065f504dc83c9..cff0546ea6fd40ef37cb1f45f435b35b522b7999 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 a0822a6033e5e149a3b5d06d7e790cb785a572e0..3a3e654444b8782b9dc9823c4e0d2d575b973ce7 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 042408a8c631d32d36e73ff806176f6eb01c3177..91af9159111ffb58c83fb3f572c0c8a48417934c 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 5b5f072fc1a818f57ec989daaac4c0afef79ddb4..9948ca2a30460c713b8ac9134af5c3ab5776ea9c 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 cb62cc0ead96ef64a14539cbf9475cb9ca74a31a..351c823f1f74ae5cd87429a83369cb75d51760ce 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 44408850e2ebc2d0047e1bae7d7a82a5d735e135..551e3e9c4cbee0e3b43a246f0997b9787bf511a7 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 ed13889c116223e16f99ec32de9c0c1762e54897..b63b198d1f03285ad5240253250512798ea68f38 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 9dfcf39d3367370c0d3ec2507aa3bb3e036edef6..d5e59556f9e2d3a056432535129021a7d42d25ef 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 915439dc05a0c9b8f3bd0e5c6785f3046c703594..80a11d078df4554a2823e6f75c043674686afeb4 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 ef720a78f6d513155d38ae1cba4061c966d0d1fa..c15ea77f0604ebd36cd025fff977f9cc47c20def 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 5d4f34887a22bb370f6f5bc2bedd05d2fc190b83..ca51583ec98a8040bbba3d4b0039cf707ae9ef60 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 2486237ebba5c9e457b6830c8c186a3d3f2133f9..417ae5efa8bbf9dc211d37b5e358bba0bb8ab784 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 6ff56430341b862a21dbbbaec416b13f17e484a1..0c398bda7601fd55b39d2d57bec982fe6f8803be 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 6953ed4b58209ebf7894953cc64f8bdf4b7dae63..cdbd8bb607be4cf076ffea0591aaafee68eef0aa 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 4c4f7ee6d733a66e739c6be1e9cd65ad370f8633..268f7f808a4ec7748078e9275e90baf684c71cba 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 379c96d36da5833377e5d5df97085662ed6b52f5..b3fa88bc6269fcd4380ecebb8b97b35026065754 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 218317366e6e511c2d2eb029b3ddf7856616ba76..4bf3c79f3cc7b0317f6b955472975c55e74b57bc 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 57b0f6cf6a5a63eb84f64aac601d819144c795cb..48ea1f9f2cbf386db999e60f5ec1454d72e53d5b 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 d33d78b11723782feabccb7910439cf3d06e7daf..0697d29b4d3bbd8788e040dc6aa3f584777a9981 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 8862233d57b65c0e9d779c680027339a004f7fd8..125e605b8c6827e60c707a37939598b4468d482e 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 9332d6ca6456d986f69c1ba1ec4db75d50b2e39a..ee01e84e19c1b1d679617ff0dd7f36cca7e4acec 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 bacfabd9ce1653825e14e85a6d702b067f54d9c6..0a366d86f08ea8faf50918128266431e9f4abd21 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 5a72083dc67c76c4b7f9f9f2fbb4c5604cab5eca..adf9632c6b1f5db885bfc31274e0f712b4014163 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 7da0027e2409f498ac88a175c78e1fb9f0f4b30e..aac661225c78903d512fb2cb56b48095ee5f6c7a 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 4a067f0d0ceb49135dc3ef2c53f728600c6c8f18..a4e05e4d7501256e5311a1a2fc7e808c3d05f1f5 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 705c85360526138c1fb236a41cf89c7f8f7be446..bef4aae388d0fb98305c6dd2d9143cd7c862a491 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 a1eb0862255b2e4e51cffa93bf644a99d1ab7b9d..6913fe168c25f6d4249b2898c5663ede06fe2d8c 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 45c54bfe99bb86f68b94be7dc73879d50b78d74d..9d4f3a49ba4a5038a333c940351dd85cf5df0deb 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 29bf854e8ccf0f16e836f4f60c95bfa9b5f7b86f..615c84ad0f010ab9db12f9c2c98632343a8d9191 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 dde95edc387a6656f44c37442690379d863ff334..474f428aea9299c8706a8d3d3eace84a491d47b6 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 d6965447ca6924f77f97dd0ea33d207b0458f7c8..c5c32b6b6e6c7835d7c1b0a63fb4bb54e5f0f80a 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 468be2425af38753ba8a7e63fdcf7ab737e35de6..b675cdbb03adfff6d3338638404aa9fa20c060d2 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 7543d5f7e30911c5b0e374de947821a7b800a998..d69d0ca99c2fb7cc3951fbe50a7f14416c35bb80 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 c8960003f47dc4e0e8ed4de2e0b62c91633af8ae..3e083ff67ae20b458704f89c1a56ceab061d2278 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 6ff38fa8569af57bd9aee46b43be2d7e86af6f93..b874d952b446657bc73fc48b69c70ea2b8f97237 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 842fe30b9868892e52e211d91197b1dd46980c82..de899807eade5886472d54386d9565ef67c275e4 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 78c6b3387947e1a207525158b4924ca0cb0ffb71..e3e597f937a532927f19d1b4b8b635f765ffa691 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 2e1254da9c8ccfb45e4d400fca0e1a78190b0c7a..7cd03e2a1275a531101f44a4e8519c98f84f1128 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 0f3ed4eb236d44f4e9e9d6e38a949919980d7821..15543e9682489b97fd04922b23d78f5311f7e0b4 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 72833f3334b53ed583610906188c79e621811513..56ec696e8afa504af10d58b2413e79b5c2240e83 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 227b000feb3839f289a5bea173d54aff1c4c38c7..0c94d2441922fd08fff50aa0ef071cf15bb5e9d8 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 6dcf583a837d012aae13006ac0f41e06acb44c80..b74f8a67923cfa3c7bc049a43c7f06cab136f808 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 1a5de50a23a2098b9c78eb48192568c2826e9dd5..a9d6554fabdf0560b850f7c1627b775661c00eb4 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 322a9f993550a8702ec80573060066f71880db71..a6b37494e79a78f127adedd132f5ab0cbc0a4c01 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 26b278264796b31a4b98403d728b1e9ccfd8257b..200c22f55130ba890d37a73a0e565460e8240315 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 248e00ec4dc12fc32cc606eb02d4c67aa79b90d2..4a1f1ebff7bf232ab60f507331b60aa71b3903a3 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 a882f2606515796334e403baa411ebcbe45c592a..f536005807269728f3285f7bbf6f176cd790e5c2 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 f05d2a368367cca553c9da79e0949416ecba5c99..ba3d71f5c7d09a1464a3bfdaf09dc6bf646e80b0 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 f5bbd9e8341660a6d4f5195d1b42350db0288d5d..d31505b6f7a465fd965257210da53466cc83e34e 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 8f7fdaa9e010b39157eee6121b6e1b5e0f265295..5a03ba8c8364e9cc4dde9655871d4a13b6ff2463 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");
index 455aa207e67e84c0ab97b0e865d099e16b7317ce..d4bf8caad8d0827e627fb995b1db4e189d2142e3 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 3ff8bdd18fb3b90de6829780d65b3d4bc3cbeb51..0931bc1325ebd26fe38b9b6cd515d82d6d3fc618 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 8630615e57fe512ca9c7a10472ce5f959f317234..852739d262a9f7eecff472d33845adb2a0a310f0 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 d065b2c3273ea03615ae883558100b4962a2ddbb..02a2c9340573cf5946e0083187353d4517319844 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 47d4a01c53933afd77717c5e1616eda796055f78..d11c51fc2a3fd144ac8de14702207078743cd353 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 2316e944a109d9daa82a322c566e8621087e2098..e947915109e5aac39392c8863433c7f2bf903857 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 615d5496fe0f929509cca53a5cbbb2ea4aa745b0..dd376c124e71561193f0a824f407314d6edda4aa 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 7c1e65d54872bfea6611743a8ea7636c9dca2949..442d94fe255cfab4c81e26bdf0aa8cc46c3283ac 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 20fbeced472b82c8653e963bc8fe2bb2455c0023..76285471073ec18193edaf0304cb4e385affae3f 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 71e7e03ac34313ed2fcb890d727bf1e47e006317..5d1ed50bd46c591c1ef63b312c4844d013f5239b 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 8b81927900117b34368191495f78e5bca6e954ac..6c4173146bb739060de46b6776b3f471250491ee 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 59cba180fe833f08f815f4ca968956eaa7f33e18..9096fd0ca3ca447a7195f489f03d862340173494 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 6d6d06cb6dfce1e0bf950ca6d0175e9993f53010..2db17cd66fc55d32ba19a77cee7ea54b170efa34 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 d91b0de7c502d13ef51eaeaf667b61cc0230d8a8..30c0d45c1b5e6d7bfda1a07748ac8d86b9dd0b7d 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 90a98865b0ccc38bc74d62a46d7243e683d9fe50..209f7f15f5f801b4023f6e121643b3744ce1b11e 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 606912d8f2a885d9272a843e34542adc1cc9c3d0..fea9e898c4ba52ef453eda892115908f0290d2d9 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 3610e9958b4cedd2f7264a134f3bdb6ac0a4f8d1..d79ce2e95c2357a92cf8e252ed27cf7d59557dc5 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 094325e3f7147cd26c78da12fd842a3f223843d8..ac2b24c192f881d229ccf5fb64e99dfe07b2a76a 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 6d6f98fe64a086ae02c864d1e93ab3b597ef216e..3aa48834a222b87819eb5302a63a507b1b910071 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 75efb028974b991ebe49886f6b3c1b5f78e604ff..d5f8c96964be9a25f8235c869472b95a77ebbecc 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 1d1d27442235b9487c3db8a8490a6a0da7c6122c..1c8bb8c3a82efd92519c16e0a01088e9bf9bf5bf 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 00b30a2d54662937da35f382c49057b8acf797fd..542f625312f30a424023e07b7146af58e9b57144 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 5c6bab9786e3c4f0251fed0b821934ecafe2e341..05772aeaa8f4ce09a9cf31e446315802c6cc1969 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 31d12de83a2a9584245e8c983e6c5f0e1a74ea29..8b47e4200e65e00a64be1bb60a80091b6940ddb2 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 434dba778ccc761befe61c26a62f26037993ba32..5c833c18d0d47bef760c9a4053f5188e34781105 100644 (file)
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -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();
 
@@ -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 23701f289e985b94e9a9d4024b70a361917d3b25..dd7175ce56068b18acecc048e88635ca26ef9909 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 b72b85884223fc3761208f6bc891b39e3213d034..c18fbf3e4068c33429c6c8e3bf3ebcc1844fe505 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 a8d80a7f11050d7a518e79ac003701d12865b3a7..72743d3605091d886247cd21310d656f4ea91421 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 4abd683b963d85f1dbbc4961fc58f5c26d5b38bc..3a798737e305756a493e6ad13f865b302f9174a8 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 a6b1ab7347287e120abd4c3fe4a8de79a284e40c..df539ba277798daa6ded137dd79efab7906f0a52 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 28c590b7c9da07581bbea2dde237872a035902c0..8f1cfb02a6cb2ffef145e02ee07279d7196169d6 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 a93b885311d82f472c306451c3ff686d5afc9ea3..eba6d552d9c901668d7803c5f3a3569bbaab081b 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 b2ba83d2c4e12425629ed3681f2d2ca2d147f2e1..76582b06ab975d76afcba7f5800d6c8e3873ebc6 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 a8a358bc0f21792f5f675889f63d0c4123ecc04d..53b86e16e5fe3a4bc29f8825db8b2a54b7e60fde 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 e9580104b6ba477894b60c6bb3e69839c5677d2f..3ff50da94789111a4707082eefb4289c377e1a51 100644 (file)
@@ -15,6 +15,7 @@
 #include <linux/completion.h>
 #include <linux/sched.h>
 #include <linux/freezer.h>
+#include <linux/kthread.h>
 #include "nodelist.h"
 
 
@@ -31,7 +32,7 @@ void jffs2_garbage_collect_trigger(struct jffs2_sb_info *c)
 /* This must only ever be called when no GC thread is currently running */
 int jffs2_start_garbage_collect_thread(struct jffs2_sb_info *c)
 {
-       pid_t pid;
+       struct task_struct *tsk;
        int ret = 0;
 
        BUG_ON(c->gc_task);
@@ -39,15 +40,16 @@ int jffs2_start_garbage_collect_thread(struct jffs2_sb_info *c)
        init_completion(&c->gc_thread_start);
        init_completion(&c->gc_thread_exit);
 
-       pid = kernel_thread(jffs2_garbage_collect_thread, c, CLONE_FS|CLONE_FILES);
-       if (pid < 0) {
-               printk(KERN_WARNING "fork failed for JFFS2 garbage collect thread: %d\n", -pid);
+       tsk = kthread_run(jffs2_garbage_collect_thread, c, "jffs2_gcd_mtd%d", c->mtd->index);
+       if (IS_ERR(tsk)) {
+               printk(KERN_WARNING "fork failed for JFFS2 garbage collect thread: %ld\n", -PTR_ERR(tsk));
                complete(&c->gc_thread_exit);
-               ret = pid;
+               ret = PTR_ERR(tsk);
        } else {
                /* Wait for it... */
-               D1(printk(KERN_DEBUG "JFFS2: Garbage collect thread is pid %d\n", pid));
+               D1(printk(KERN_DEBUG "JFFS2: Garbage collect thread is pid %d\n", tsk->pid));
                wait_for_completion(&c->gc_thread_start);
+               ret = tsk->pid;
        }
 
        return ret;
@@ -71,7 +73,6 @@ static int jffs2_garbage_collect_thread(void *_c)
 {
        struct jffs2_sb_info *c = _c;
 
-       daemonize("jffs2_gcd_mtd%d", c->mtd->index);
        allow_signal(SIGKILL);
        allow_signal(SIGSTOP);
        allow_signal(SIGCONT);
@@ -107,6 +108,11 @@ static int jffs2_garbage_collect_thread(void *_c)
                 * the GC thread get there first. */
                schedule_timeout_interruptible(msecs_to_jiffies(50));
 
+               if (kthread_should_stop()) {
+                       D1(printk(KERN_DEBUG "jffs2_garbage_collect_thread():  kthread_stop() called.\n"));
+                       goto die;
+               }
+
                /* Put_super will send a SIGKILL and then wait on the sem.
                 */
                while (signal_pending(current) || freezing(current)) {
index 9eff2bdae8a798631cb2c987215e92eaddd75538..c082868910f2b54482fcd20340c493e804ea375e 100644 (file)
@@ -39,13 +39,13 @@ int __init jffs2_create_slab_caches(void)
 
        raw_dirent_slab = kmem_cache_create("jffs2_raw_dirent",
                                            sizeof(struct jffs2_raw_dirent),
-                                           0, 0, NULL);
+                                           0, SLAB_HWCACHE_ALIGN, NULL);
        if (!raw_dirent_slab)
                goto err;
 
        raw_inode_slab = kmem_cache_create("jffs2_raw_inode",
                                           sizeof(struct jffs2_raw_inode),
-                                          0, 0, NULL);
+                                          0, SLAB_HWCACHE_ALIGN, NULL);
        if (!raw_inode_slab)
                goto err;
 
index 0035c021395ac840cd71bd38c82f28b4ad154f19..9a80e8e595d0d462aa38b2d47aee57f0ea10a07e 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 1f3b0fc0d351de0f6bd6ea7f48e3344e99f1fe56..fc9032dc8862df3408a56e7208aef0fb446e3a5e 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 4336adba952a770343150468053a866fe49016c7..c81249fef11f9a3f48b02d772e4d09d3216a2557 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 7cb076ac6b453b939924b6fc173b362cf98ce8b4..4600c2037b8bb8dd71dee46c2cac3cec5cfce296 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 30c933188dd79567ad234d4089d452f60ce03b42..f956651d0f651a66a00d4bb9a1d05febf761d524 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 e577a78d7bacf9e07d3cb50f4bb657d30d5e9446..d1001790fa9ac77569ede0eae646b7b116f2211f 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 9e4d6aab611b829a22640e7bcdbcbecfc6ee5c45..ad478da7ca63138e6dda728ed6640c4630c5e02e 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 19ee18a6829b9ae443778d63d57a8d8924131748..a8794f233bc9c38d45c47f69d03652f7f6f8d533 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 d407e7a0b6fe4e73faf237e6d5a3b21dee89555d..6198731d7fcd4750132be0b77693bf91c91a7f29 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 9c590722d87ea87fd458041815da3cd8a519b3d1..b8b5b30d53f0c03a8c11c580bf29470225246293 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 fa038df63ac8dbea24c47789a13c7a933d8c54b0..53a7ed7eb9c66da4b69090789afae1e3c5772e7b 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 e5a2dac5f715fe3a98c8c42a6059a29e3914dba3..76b0aa0f73bfca33ac620c6569cbe926f099f901 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 a7ce15d3c24835a0f66c76f7d5141b7552d2d389..152025358dad53ce354b662163f1a9cee0205393 100644 (file)
@@ -1531,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,
@@ -1552,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 1434080aefeb22e77896c4f2a18f26e77df535bc..2ef4fecf39847049cce4a5af771760255dca29c5 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 d9462643155cc15cae02c014f5e8d66654a56d2a..c1c9e035d4a4777e483872ed82ae4b68056c49b1 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 01d4ec1c88e0ff064ed2b5de697257766945c412..edf926e1062f8be520b4b64de72e9f26e7aaa0f6 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 54b8b4140c8f6e32203363bd9b53e8aa2ed09f7e..725d02f210e272bc3c99306c1e2400f201095fb5 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 3fd23f7acecaf7473d10a026db0490b7d1ad39b5..24e8d78f8ddeb8a547827e259a7b60170dce3ee1 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 7c8801769a3cf8279dc74b980775e1437f98ccd6..bebc0c2e1b0a9022dbd1dcf4d9204de8f9ef0434 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 980a216a48c8da9c13ed10fe3713f9a6064e8af8..2153f9bdbebdcb3cb094a76c73b9948815b30e2d 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 2dcc7feaa6ff0bdf5dad74bdd7b1e5d144240ea0..0fbd50cee1f60e8c437102fb4b2cb2cee53afbe1 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 7e906c5b7671ee05409edde58fd0d3efa44f6457..00388d2a3c9970a3fdfccec1c4dda85904b6fd4e 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 8847f3fbfc1e31b4260c92bc65e074c1469b41eb..01965b2f3a7697e28598346e1fc32c6535a7fa2d 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 24d58adfe5fdc1a014caf1d92249146821fd5ca3..67ea83eedd43eb7b69e896e1db54f8fd995a0d9e 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 8fa09bfbcba7f51664f3cf67e68695952f9e348b..a293f0273263fb18dd1837a2a906769b8a9b71d6 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 c668bca579c1baca6c25fc345462d881b227edb4..6a2711f4c32122e9900c209f0521ec6b5f6d59f3 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 6bd84a0d82385cf26e6bc8194dfe5340d73d149a..fc8278c77cdda4028565931f1c678fb0cd1121b2 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 1b3c2bb20da92665c84fe3ca3a0ab85399865cce..e6de0a27ab5d7980076318ad6093c70548912311 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 807e584b163d8db488cec503570712090b2493c9..2d2c501deb54e8e88fac474267eac501d9964581 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 156bf6091a96da8bdd14e16474d78e9ba4093bf3..b18c4998f8d0c1834727ecf089d48d3235851766 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 df70dadb336f1349dd2661184695c70d8673415b..ed02e886fa79ba8ad64d8f5180a3d1cc67e31541 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 724c63766e827c9232bd197a99b93af8064aea20..bad7368782d08a7759ca5964c9dda18b130f4819 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 55f3d6b60732abd1693e72cb3b5a43941e9d80be..644e66727dd0e6f5464eb092b9d6db6caeac837f 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 4350d4993b189a9fc3eefa0aa643201eda4335d6..663c0e341f8bb556289f1334575cd9a01fcfd534 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 50931b1ce4b9bac7a7089a4f97c1dd93af21c9d0..8b2549f672bf85f94427f24294635017b0c805be 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 cd0be3f5c3cd34a5d5209adafcf6ad518ff7da0b..a44b14cbceebcd9f8fd7cb9be561c12373c0c271 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 01596079dd631022281eca93b34574cb8f4659ed..31f25ce32c977442b108b5be22db50cd2fcca094 100644 (file)
@@ -28,6 +28,7 @@ ocfs2-objs := \
        locks.o                 \
        mmap.o                  \
        namei.o                 \
+       refcounttree.o          \
        resize.o                \
        slot_map.o              \
        suballoc.o              \
index ab513ddaeff2f6944c5f0d54356e7484fa63cfeb..38a42f5d59ff70345b7a8f5840000dc850ea6cff 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 353254ba29e15ca2c3625d6537128eed590d182e..9c122d574464284ef5c998e53f3685939c76213b 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 8a1e61545f4169de491eb00ee6c661ebf0054a30..72e76062a900d2555fac2dae44ef325a5d8aa897 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 503e49232e118b574737a087992c0863c1eeeaf7..c48e93ffc513025b737ea38d59b63a886c0b0b88 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 15c8e6deee2ec76c06ac9c45105b4b6d4c3e93c9..d43d34a1dd31aa3225673cdbcaf7ed07620a0388 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 c75d682dadd8ee3ac1b29c7b7978d73212656db4..b97bcc6dde7c22ab1578d63c92a55f403cbfcddc 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 96df5416993ee4335d283e1ba0d619bdbb2ea4f4..1cd2934de61530d42dc09bd9947227495dd3328f 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 696c32e507160d80fde6d0fed3fd7b5724c3d6dc..9b4d11726cf2aeb90fcfaca7ff9f45033642a81d 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 f8424874fa0725b95065d5ce7031f63d0cdde586..cfb2be708abe33b255ed8f3208f93569a92339e8 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 b358f3bf896dbb5bf299fe7976397994c59c6b8d..28c3ec2387962b380e61c4b50258e15d399f92bb 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 df52f706f66971026b2f09ae0f978a8ba17858f7..c5c88124096df424fdb6d248512f239b7d87a2b1 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 d490b66ad9d75e1ca24667cd6a7c8626d30200e0..98569e86c61309ff78066dbb15770821d365098e 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 110bb57c46abe76bb83ae1b689e185684384c944..0d38d67194cbb07aeae46432a9d07825568afb81 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 7553836931de8f7e5c5b72a9a55fdc3c428d94a9..d1ce48e1b3d6029e5861cf2863cbb0a544511b40 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 f2bb1a04d2530451f137b091923025b5d9cad555..843db64e9d4ae9d5b9a353a3e7b3d001c3456297 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 b7dd9731b4629a942d10c44472d925dc49738fa7..e79d41c2c90972fe801a99ec040b229a92debe98 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 221c5e98957b59212e9ad21314bd3645c2f4fbc9..89fc8ee1f5a5932ea40bba6537bd9a8e319f1c84 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 172f9fbc9fc7c3c35841b2bf0ad85766d2c55c7e..d66cf4f7c70e34bbec1d63eccd25096eeac7e976 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 4dc8890ba31615a3e8ce450d8b33fd38fcc202e8..0297fb8982b861afdae1d974e9fdae96bf0a1f13 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 ea71525aad41fdc4070cd52890d6385359dec7f5..ba4fe07b293c6f4c2d6d864a7e5a491ad082d7ea 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 467b413bec21e7b407f45a2adba2002e72504e72..31fbb061951035d3211e1041e5b39bb6ed8d6db9 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 c48b93ac6b65c55bc2b90daf8b3efa1397b9b6e4..54c16b66327e7bcf4ac7d057963bace3f34b9273 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 2c3222aec6228a83b9acac2122e42beea94042fb..3f74e09b0d80ec929c6f74f853c1e39ad6730a47 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 bac7e6abaf4763f75f873592beec3c0d4cb63472..ac10f83edb95a47650ed5c19ee583476478347f1 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 8601f934010b80e37c528b326e9121c72213ea7b..f010b22b1c4412046a56c24c100efdf032ddf52d 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 688aef64c879b1bac95d660c2cecde1a607d1409..e5d059d4f11532422f9e3f15fc90da80e373d353 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 39e1d5a39505221a458846ab37950c922d6da76b..eae4046024241131eb948a9d8539fc5158878c44 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 7ab6e9e5e77c0beda01c3d4bcfb6d95551127b61..e9431e4a5e7cf16f2e4bf299ed0866392d6bf361 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 c212cf5a2bdf3ad9e8e6c02672f4b76189202f5a..d277aabf5dfb30978bb4e42e896d5d1462e16eeb 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 3fb96fcd4c81cd185db0e7b5132f831c322dedca..e5df9d170b0cbd6cc8541f68fda5d34a1f62c7f5 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 44f2a5e1d04233bae9fc5b72bf894cbdd67461f2..b437dc0c4caddd814c824822ff93aa48d26afd65 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 bdb09cb6e1fef216821b7e7a8d94503ce7d097fd..1a2c50a759faaef1f2b5eca5e6d7d865ecdbd47a 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 424adaa5f9005c9e4b0f5427de250d4925e3a95d..3c3d673a4d2069d7cbfc04b7f56059be1f4fd8df 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 40661e7824e962d2bf36eac01b4f1f6721f88452..bfbd7e9e949f0a26bbf0afecba362a449c6e45cf 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 73a16d4666dc463472e9254449ac98c9a6363188..c30b644d9572408816154db8c91c275d3136a0ac 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 a3f8871d21fd516fb29aefbc040e30e6be016069..24feb449a1dc1f7329e0784d34b470db520d2684 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 187b99ff03688992fc0f141390ca6bec667fa027..b6284f235d2ff9e54e15834014ebc8f3e059851d 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 531b4b3a0c47ffa66fc680fc38dfc890cf09a34b..0d826fe2da0d9bb8800f70676299661bf3336e09 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 d1a27cda984f10811fb66fe7a7a53e76f6036d34..fe3419068df2efa5ed33ff7cdc424327d04431f0 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 1ca7e9a1b7bccbf4b34c270c7cc2009b53e3d370..08e36389f56d025858dc377d0294911682e657fe 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 c7275cfbdcfb92d4ca1a17a0444546c52d7b38c1..3680bae335b5b37464dbf6ba126855be69e8d021 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 d17e774eaf456ba86118a99e7cbcee3eff4a1ad3..4845fbb18e6e96c579384e3dfa53271a0b577343 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 379ae5fb441154a0f2e27fb0f9b34846c7ca089a..f3b7c1541f3a38f38c42be8eaf92f062170da55a 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 2bc0f06704063d33af9ec9b1b8ada71d4c00ff22..df71039945ac2f15124bdba6e2a7c3c16ac485dc 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 31191bf513e40ebcbd05668cc0db2bc46c1c1311..4f01e06227c69190525944d4a6da07b850715172 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 fbeaddf595d3ce8c456c4a58a9b31698f51b6506..7b685e10cbad8cc9b052cec48737fbf7bf6f7afb 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 725a650bbbb8bf3c1e90d1c84a6a7e1701f1ea96..0c6bc602e6c453c17e52c6e7a647989130d50eec 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 6f742f6658a9897503568c3ea7b78407829e760f..837469a9659843dd031f5bbf85536d62eae103b5 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 59b43a068872de286df70b7632ae982f4ce149ab..56013371f9f3cdcd8c89a4455233522a415291aa 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 d5c410d47faef162d3edf1876f8582baec0936e9..171e052c07b3684f4a4264ebb44e802affc20f6e 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 7e14d1a0400122700df380aeb0746cac9c5ff8a3..9fe7d7ebe1157864561a8cb3d0166eb827e5839a 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 2707c6c7a20f0dc8bac60ad129103570b4cb10d0..2281c2cbfe2b4ddeefc5d4417de1e40dd7df4dfb 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 9bd8be1d235c2b420e348d25e801bdce88efd977..2a1bef9203c6e73734e7fa359873bbb45456d0ae 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 be8e0e1445b65dd6cdd1ec360db3797b38a21808..5f6089994042176586a0c661639295184649b91a 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 e4d408cc5473cf316dbf58fe04dc4e04cfca811e..4a283b3f87f8ebde43991444576b480eb0f41c21 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 e1cd061a25f748dec3d77bf7c2b3d0a428cbb385..0afba069d5676e03562a3b8ee2d26ef95d00b166 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 003c68f3238b47d1686a41b7232b1cfd885eb93e..86cc39cb1398da3a2af03b5c2389ee098f5e5c57 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 681df5fcd161402485e5768696897728450b705c..d2cd1798d8c4993fd773e18d7c516c72cb324ffb 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 5972ed21493725d762995d8d8110c8abb0b1529c..ae1e7edbacd671d14b4e4e5ffa46cdc6078e7719 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 9efc089454f6de3059c93ba501daaf6a55e5fa56..33a60858203b8141f2d96a280b7b2a96b2490d4e 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 38f7bd559f35eff8c690cebaf50958f352bd02d1..39b49c42a7ed85ace513954d411bcbea72d5fb8f 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 a7f0110fca4c546eb6c4941d513fb0983082560f..a6090aa1a7c138e31fd71eb3b99b8f9c3cbc6ab4 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 7adea74d6a8ac829d3c1efb877b9feec5027ccaa..f0ad05f380223736cd9a8a121c59d6f1c7ecd7e3 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 4ab3c03d8f9563a588a3b1a0e152bc528dd9d601..47f132df0c3f0a630673831c2b862ce96ac72968 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 8084834e123efed4e100fe030e2e26ced3ede1c9..a201fc370223b01c918ae9767432c3060c6de95e 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 9468168b9af5e6f22bdbcfb178d91d98d15a75d0..71c29b6670b402719f8475ed34b39a306bda807d 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 cb5fc57e370be3babf4de90514fa89c2656f99f3..6c197ef53adda0e8300e416d1a13008fbfe4004a 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 b03fea8fbfb6e0c1d5276e59141ec620f0050db7..0e7207b9815c78a33f237e678da91f0adb969c45 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 c08467a5d7cb73d2988157c8c5fa4ab33ee2f48d..d104591b066bf474f62f665e87e04154c4da5da1 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 7998cc3782502d10a7dea7de22acb6c2e90d6fd3..195830f47569988d1b6ce815c15ce576e5d3cdea 100644 (file)
@@ -79,7 +79,7 @@ enum {
 };
 
 static const struct inode_operations none_inode_operations;
-static struct address_space_operations none_address_operations;
+static const struct address_space_operations none_address_operations;
 static const struct file_operations none_file_operations;
 
 /**
index cb6e2cca214f4b82528571c11e7dcd3138c7bf37..9e41f91aa269f392ae4eb00490b785e21d74049d 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 5d7c60ac77b4967d262fbca08037993109c9c39b..bdd41c8c342ff7b052de193a998076d00b62667b 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 5a2ea3a217810be4efc6ebde932ece2d58d90360..18175ebd58eda0206f6d659cab9b4dddd9d19489 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 c4ea51b55dce09999174e329ca44334d48856b6a..f52ac276277e47a66b35ab78e39734a8108fcfbb 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 1b3b36068ca5573762acb677d14c4f4543b3b66f..1cef1398e35883c453bff73c8c85d7332b7d1138 100644 (file)
@@ -30,8 +30,6 @@
 
 #include <acpi/acpi.h>
 
-#define PREFIX                 "ACPI: "
-
 /* TBD: Make dynamic */
 #define ACPI_MAX_HANDLES       10
 struct acpi_handle_list {
@@ -89,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);
@@ -106,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;
@@ -173,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; /*        "          */
 };
@@ -314,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 *);
@@ -327,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);
index ab0b85cf21f38df08b0eb3a3b752b42e2453d8fa..eb0e7189075f374d7f4370fb40d9fcf28e0c6510 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 82ec6a3c050095a018e4594fe28dec4d5408e49e..e723b0fd8e413cc2c5cf56cec8231779d9266583 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 222733d01f362d98df6d973f175889a7d4a4bb4a..1b658795260447b775eea26d2ac81e4730dfe16f 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 59ade0752473c8068b617b2647766ac5fcfc8472..0b9b430b092bea5e5b96fe478905e57bb890a48c 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 37ba576d06e857c51a4c9b62f3d7464eee87fbd2..153f12dc3373802798a59a8e595bb722f9b42d79 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 935c5d7fc86eb44f2050e5f21ba1aedd8ef0b930..6aadbf84ae71c014acf2d1a091756a0a83bd8e73 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 fcb8e4b159b1cde3060d27fd1761c898fa0a0250..9d7febde10a172f7bc22f7b72e7ffa6456836788 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 1c1fa422d18ab0dea14dbd7fc1e2d3b4731d7d76..ca0f239f0e13cec272e373dabec7d4c4b6bc941c 100644 (file)
@@ -7,6 +7,7 @@
 typedef unsigned long cputime_t;
 
 #define cputime_zero                   (0UL)
+#define cputime_one_jiffy              jiffies_to_cputime(1)
 #define cputime_max                    ((~0UL >> 1) - 1)
 #define cputime_add(__a, __b)          ((__a) +  (__b))
 #define cputime_sub(__a, __b)          ((__a) -  (__b))
index d6c379dc64fac63797364c7e385dc91778df5ac4..9cca3785cab881c854236b00a37fa5e478f06a3a 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 eddbce0f9fb9447f8fae3534ed0a0d3f4373dc7f..e5f234a08540a86763a03806e6f1ca77764c822c 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 3b69ad34189a9d87e267e131daeb23557b7bfc7a..dd63bd38864b23627f36e57b53c8413af63cd238 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 7cab4de2bca6a3a74cad234301fa69a013f8273b..32c8bd6a196dffe0cc2cfd367792754faf88836e 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 d083561337f2204bfd7e456e308ef75fc3b12d37..b3bfabc258f369b576d3660c41955521dbeb21ac 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 ea8087b55ffc18ecedfc5d7e754b2457b7189f92..5c122ae6bfa61a925d0b94665097c2e9b4332e08 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 34321cfffeab02010ac142f353b06c4cb7e501ad..dfcd920c3e5495cc9aeb0296714bb192bf80105f 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);
@@ -292,7 +288,10 @@ void __init acpi_s4_no_nvs(void);
 extern acpi_status acpi_pci_osc_control_set(acpi_handle handle, u32 flags);
 extern void acpi_early_init(void);
 
-#else  /* CONFIG_ACPI */
+#else  /* !CONFIG_ACPI */
+
+#define acpi_disabled 1
+
 static inline void acpi_early_init(void) { }
 
 static inline int early_acpi_boot_init(void)
@@ -331,5 +330,11 @@ static inline int acpi_check_mem_region(resource_size_t start,
        return 0;
 }
 
+struct acpi_table_header;
+static inline int acpi_table_parse(char *id,
+                               int (*handler)(struct acpi_table_header *))
+{
+       return -1;
+}
 #endif /* !CONFIG_ACPI */
 #endif /*_LINUX_ACPI_H*/
index e0a0cdc2da43c6e21fdb6656dd33cd1ed12d4dec..69a21e0ebd33c5e559aae05b0fc98471fd5cb0a6 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 bc3ab70736955675afef688d4209c5bf8392b4b3..dd97fb8408a87afe15c4c671e908a255562286d4 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 c3021105edc076ab2114e60bd7335c7e7144e2f8..c8f2a5f70ed5b45817243ab5d1bb0413094a2bf7 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 b8125b2eb665744feb23862ade25b7095903e80f..47dac5ea8d3ab875b39b99aef212aa4eded1fdb8 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 796df12091b7687a450d26e57c4acf6ecc15b34d..9b1d458aac6e9be98252be3b1945012b122ff41f 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 3b85ba6479f48e31f3173de8c2ff86959a190bb3..94dd10366a78ead79b7cb42dc15d7fb89bdc787a 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 192d1e43c43c394ce14a967ee32ecbd3de261606..7e1d4dec83e70180a231e80863d9d05ea816539b 100644 (file)
@@ -134,20 +134,6 @@ struct fw_card {
        u32 topology_map[(CSR_TOPOLOGY_MAP_END - CSR_TOPOLOGY_MAP) / 4];
 };
 
-static inline struct fw_card *fw_card_get(struct fw_card *card)
-{
-       kref_get(&card->kref);
-
-       return card;
-}
-
-void fw_card_release(struct kref *kref);
-
-static inline void fw_card_put(struct fw_card *card)
-{
-       kref_put(&card->kref, fw_card_release);
-}
-
 struct fw_attribute_group {
        struct attribute_group *groups[2];
        struct attribute_group group;
index 45ff184915149aa150f2d9157ac3cc997a446a5d..1d747f72298bd1dc6f6f1f6d848883ba8efee7c1 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 90162fb3bf044cfaba959679ca048ea3e66e397a..51803528b095fa70380dc6ef201f11704e229f75 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 109d179adb93c5eaeed6a2b2555361987ec17ea0..297df45ffd0ad27e8219aaf3715a00d030f5bf54 100644 (file)
@@ -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 7c777a0da17ab5d245b175a9eaa342a1556fb0a7..557bdad320b624369441119e5f352ccbd41b04a6 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 e10c49a5b96e9ed300d670871af2edbaaf23add1..059bd189d35ddd1d1e6931b0aa4ddc2c95a9c9a3 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 a0ebdace7baa2fa496d2d8fc09cf1a2c0b6f1b60..10f6284167400432a5bebebf2d28ea969e0d1840 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 5cbc620bdfe060dba93399143b5d76e354093dc7..176e7ee73eff5f8c9a97a77b69def8e50cadc5d3 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 c9087de5c6c630891ab9f61ef14499114a99e5b9..e844a0b186957c3fd49a7b0b2ff3578bea75e3e6 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 f4784c0fe9750446fd1a68ac291585ef6f6a7dbd..57d41b0abce2a9988c123c6b177e54d811be1ebe 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 482dc91fd53a3ab0a0a072dd55537ca0012c3c67..4f0a72a9740cfa86220e3a22816445e36a986705 100644 (file)
@@ -360,4 +360,6 @@ extern void qi_flush_dev_iotlb(struct intel_iommu *iommu, u16 sid, u16 qdep,
 
 extern int qi_submit_sync(struct qi_desc *desc, struct intel_iommu *iommu);
 
+extern int dmar_ir_support(void);
+
 #endif
index 786e7b8cece906bb9d94355a5491bf8ecc17e31e..83aa81297ea35c693e15b14b54bf2690d9af9648 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 228f6c94b69c327543d118c5868ddce07a2f9a43..76a0759e88ec4650fe554ddb1988bbeff99dfc26 100644 (file)
@@ -28,7 +28,6 @@ struct iova {
 
 /* holds all the iova translations for a domain */
 struct iova_domain {
-       spinlock_t      iova_alloc_lock;/* Lock to protect iova  allocation */
        spinlock_t      iova_rbtree_lock; /* Lock to protect update of rbtree */
        struct rb_root  rbroot;         /* iova domain rbtree root */
        struct rb_node  *cached32_node; /* Save last alloced node */
index a1187a0c99b42bf79533e164f6fea8d2f574eed1..331530cd3cc6563f8e2f12b35ef544d2763788e1 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 2b5b1e0899a81e93a4970e8f01924958423c968c..d3cd23f3003962de7d50219b1967a87e37f9d364 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 dc2fd545db002459a0add2169ed861bec7ecf425..e880d4cf9e223d1e4ca4b8e4ebe655f599a52b16 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 ad651f4e45acb8ce36dedff46e9b55784fa4d963..3cc2f2c53e4c699abeefed5869c3ca8da1ef6481 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 c325b187966bfc1bd0728a510714affe5117fd40..a34dea46b62953cb2675f6b17c7539431f54114b 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 536ca12442ca5b0227b7e4c5b03f4038df67d268..78c3bed1c3f54f44557ad6c1285a85e28f4895c5 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 1923327b986956f1dbfd95301ea0dcb9860063a6..76285e01b39ee1641336989ea99d727272645d0b 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__ */
index d95f72e79b829bfe85a873f9494b532deef99bac..fed969281a418bde82db04885c2e3499f4e4c485 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 9be484d11283f98b79a0bfed79e79c94481588fa..7c08052e332111a7aa14d3f4bd7f0390b2a390c9 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 115dbe965082f5e445f473f066bf23f4950b82a0..c63b65c9442969504e2953ca5c54af81f4ef4557 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __LINUX_PMIC_DA903X_H
 #define __LINUX_PMIC_DA903X_H
 
-/* Unified sub device IDs for DA9030/DA9034 */
+/* Unified sub device IDs for DA9030/DA9034/DA9035 */
 enum {
        DA9030_ID_LED_1,
        DA9030_ID_LED_2,
@@ -57,6 +57,8 @@ enum {
        DA9034_ID_LDO13,
        DA9034_ID_LDO14,
        DA9034_ID_LDO15,
+
+       DA9035_ID_BUCK3,
 };
 
 /*
diff --git a/include/linux/mfd/wm831x/pmu.h b/include/linux/mfd/wm831x/pmu.h
new file mode 100644 (file)
index 0000000..b18cbb0
--- /dev/null
@@ -0,0 +1,189 @@
+/*
+ * include/linux/mfd/wm831x/pmu.h -- PMU for WM831x
+ *
+ * Copyright 2009 Wolfson Microelectronics PLC.
+ *
+ * Author: Mark Brown <broonie@opensource.wolfsonmicro.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.
+ *
+ */
+
+#ifndef __MFD_WM831X_PMU_H__
+#define __MFD_WM831X_PMU_H__
+
+/*
+ * R16387 (0x4003) - Power State
+ */
+#define WM831X_CHIP_ON                          0x8000  /* CHIP_ON */
+#define WM831X_CHIP_ON_MASK                     0x8000  /* CHIP_ON */
+#define WM831X_CHIP_ON_SHIFT                        15  /* CHIP_ON */
+#define WM831X_CHIP_ON_WIDTH                         1  /* CHIP_ON */
+#define WM831X_CHIP_SLP                         0x4000  /* CHIP_SLP */
+#define WM831X_CHIP_SLP_MASK                    0x4000  /* CHIP_SLP */
+#define WM831X_CHIP_SLP_SHIFT                       14  /* CHIP_SLP */
+#define WM831X_CHIP_SLP_WIDTH                        1  /* CHIP_SLP */
+#define WM831X_REF_LP                           0x1000  /* REF_LP */
+#define WM831X_REF_LP_MASK                      0x1000  /* REF_LP */
+#define WM831X_REF_LP_SHIFT                         12  /* REF_LP */
+#define WM831X_REF_LP_WIDTH                          1  /* REF_LP */
+#define WM831X_PWRSTATE_DLY_MASK                0x0C00  /* PWRSTATE_DLY - [11:10] */
+#define WM831X_PWRSTATE_DLY_SHIFT                   10  /* PWRSTATE_DLY - [11:10] */
+#define WM831X_PWRSTATE_DLY_WIDTH                    2  /* PWRSTATE_DLY - [11:10] */
+#define WM831X_SWRST_DLY                        0x0200  /* SWRST_DLY */
+#define WM831X_SWRST_DLY_MASK                   0x0200  /* SWRST_DLY */
+#define WM831X_SWRST_DLY_SHIFT                       9  /* SWRST_DLY */
+#define WM831X_SWRST_DLY_WIDTH                       1  /* SWRST_DLY */
+#define WM831X_USB100MA_STARTUP_MASK            0x0030  /* USB100MA_STARTUP - [5:4] */
+#define WM831X_USB100MA_STARTUP_SHIFT                4  /* USB100MA_STARTUP - [5:4] */
+#define WM831X_USB100MA_STARTUP_WIDTH                2  /* USB100MA_STARTUP - [5:4] */
+#define WM831X_USB_CURR_STS                     0x0008  /* USB_CURR_STS */
+#define WM831X_USB_CURR_STS_MASK                0x0008  /* USB_CURR_STS */
+#define WM831X_USB_CURR_STS_SHIFT                    3  /* USB_CURR_STS */
+#define WM831X_USB_CURR_STS_WIDTH                    1  /* USB_CURR_STS */
+#define WM831X_USB_ILIM_MASK                    0x0007  /* USB_ILIM - [2:0] */
+#define WM831X_USB_ILIM_SHIFT                        0  /* USB_ILIM - [2:0] */
+#define WM831X_USB_ILIM_WIDTH                        3  /* USB_ILIM - [2:0] */
+
+/*
+ * R16397 (0x400D) - System Status
+ */
+#define WM831X_THW_STS                          0x8000  /* THW_STS */
+#define WM831X_THW_STS_MASK                     0x8000  /* THW_STS */
+#define WM831X_THW_STS_SHIFT                        15  /* THW_STS */
+#define WM831X_THW_STS_WIDTH                         1  /* THW_STS */
+#define WM831X_PWR_SRC_BATT                     0x0400  /* PWR_SRC_BATT */
+#define WM831X_PWR_SRC_BATT_MASK                0x0400  /* PWR_SRC_BATT */
+#define WM831X_PWR_SRC_BATT_SHIFT                   10  /* PWR_SRC_BATT */
+#define WM831X_PWR_SRC_BATT_WIDTH                    1  /* PWR_SRC_BATT */
+#define WM831X_PWR_WALL                         0x0200  /* PWR_WALL */
+#define WM831X_PWR_WALL_MASK                    0x0200  /* PWR_WALL */
+#define WM831X_PWR_WALL_SHIFT                        9  /* PWR_WALL */
+#define WM831X_PWR_WALL_WIDTH                        1  /* PWR_WALL */
+#define WM831X_PWR_USB                          0x0100  /* PWR_USB */
+#define WM831X_PWR_USB_MASK                     0x0100  /* PWR_USB */
+#define WM831X_PWR_USB_SHIFT                         8  /* PWR_USB */
+#define WM831X_PWR_USB_WIDTH                         1  /* PWR_USB */
+#define WM831X_MAIN_STATE_MASK                  0x001F  /* MAIN_STATE - [4:0] */
+#define WM831X_MAIN_STATE_SHIFT                      0  /* MAIN_STATE - [4:0] */
+#define WM831X_MAIN_STATE_WIDTH                      5  /* MAIN_STATE - [4:0] */
+
+/*
+ * R16456 (0x4048) - Charger Control 1
+ */
+#define WM831X_CHG_ENA                          0x8000  /* CHG_ENA */
+#define WM831X_CHG_ENA_MASK                     0x8000  /* CHG_ENA */
+#define WM831X_CHG_ENA_SHIFT                        15  /* CHG_ENA */
+#define WM831X_CHG_ENA_WIDTH                         1  /* CHG_ENA */
+#define WM831X_CHG_FRC                          0x4000  /* CHG_FRC */
+#define WM831X_CHG_FRC_MASK                     0x4000  /* CHG_FRC */
+#define WM831X_CHG_FRC_SHIFT                        14  /* CHG_FRC */
+#define WM831X_CHG_FRC_WIDTH                         1  /* CHG_FRC */
+#define WM831X_CHG_ITERM_MASK                   0x1C00  /* CHG_ITERM - [12:10] */
+#define WM831X_CHG_ITERM_SHIFT                      10  /* CHG_ITERM - [12:10] */
+#define WM831X_CHG_ITERM_WIDTH                       3  /* CHG_ITERM - [12:10] */
+#define WM831X_CHG_FAST                         0x0020  /* CHG_FAST */
+#define WM831X_CHG_FAST_MASK                    0x0020  /* CHG_FAST */
+#define WM831X_CHG_FAST_SHIFT                        5  /* CHG_FAST */
+#define WM831X_CHG_FAST_WIDTH                        1  /* CHG_FAST */
+#define WM831X_CHG_IMON_ENA                     0x0002  /* CHG_IMON_ENA */
+#define WM831X_CHG_IMON_ENA_MASK                0x0002  /* CHG_IMON_ENA */
+#define WM831X_CHG_IMON_ENA_SHIFT                    1  /* CHG_IMON_ENA */
+#define WM831X_CHG_IMON_ENA_WIDTH                    1  /* CHG_IMON_ENA */
+#define WM831X_CHG_CHIP_TEMP_MON                0x0001  /* CHG_CHIP_TEMP_MON */
+#define WM831X_CHG_CHIP_TEMP_MON_MASK           0x0001  /* CHG_CHIP_TEMP_MON */
+#define WM831X_CHG_CHIP_TEMP_MON_SHIFT               0  /* CHG_CHIP_TEMP_MON */
+#define WM831X_CHG_CHIP_TEMP_MON_WIDTH               1  /* CHG_CHIP_TEMP_MON */
+
+/*
+ * R16457 (0x4049) - Charger Control 2
+ */
+#define WM831X_CHG_OFF_MSK                      0x4000  /* CHG_OFF_MSK */
+#define WM831X_CHG_OFF_MSK_MASK                 0x4000  /* CHG_OFF_MSK */
+#define WM831X_CHG_OFF_MSK_SHIFT                    14  /* CHG_OFF_MSK */
+#define WM831X_CHG_OFF_MSK_WIDTH                     1  /* CHG_OFF_MSK */
+#define WM831X_CHG_TIME_MASK                    0x0F00  /* CHG_TIME - [11:8] */
+#define WM831X_CHG_TIME_SHIFT                        8  /* CHG_TIME - [11:8] */
+#define WM831X_CHG_TIME_WIDTH                        4  /* CHG_TIME - [11:8] */
+#define WM831X_CHG_TRKL_ILIM_MASK               0x00C0  /* CHG_TRKL_ILIM - [7:6] */
+#define WM831X_CHG_TRKL_ILIM_SHIFT                   6  /* CHG_TRKL_ILIM - [7:6] */
+#define WM831X_CHG_TRKL_ILIM_WIDTH                   2  /* CHG_TRKL_ILIM - [7:6] */
+#define WM831X_CHG_VSEL_MASK                    0x0030  /* CHG_VSEL - [5:4] */
+#define WM831X_CHG_VSEL_SHIFT                        4  /* CHG_VSEL - [5:4] */
+#define WM831X_CHG_VSEL_WIDTH                        2  /* CHG_VSEL - [5:4] */
+#define WM831X_CHG_FAST_ILIM_MASK               0x000F  /* CHG_FAST_ILIM - [3:0] */
+#define WM831X_CHG_FAST_ILIM_SHIFT                   0  /* CHG_FAST_ILIM - [3:0] */
+#define WM831X_CHG_FAST_ILIM_WIDTH                   4  /* CHG_FAST_ILIM - [3:0] */
+
+/*
+ * R16458 (0x404A) - Charger Status
+ */
+#define WM831X_BATT_OV_STS                      0x8000  /* BATT_OV_STS */
+#define WM831X_BATT_OV_STS_MASK                 0x8000  /* BATT_OV_STS */
+#define WM831X_BATT_OV_STS_SHIFT                    15  /* BATT_OV_STS */
+#define WM831X_BATT_OV_STS_WIDTH                     1  /* BATT_OV_STS */
+#define WM831X_CHG_STATE_MASK                   0x7000  /* CHG_STATE - [14:12] */
+#define WM831X_CHG_STATE_SHIFT                      12  /* CHG_STATE - [14:12] */
+#define WM831X_CHG_STATE_WIDTH                       3  /* CHG_STATE - [14:12] */
+#define WM831X_BATT_HOT_STS                     0x0800  /* BATT_HOT_STS */
+#define WM831X_BATT_HOT_STS_MASK                0x0800  /* BATT_HOT_STS */
+#define WM831X_BATT_HOT_STS_SHIFT                   11  /* BATT_HOT_STS */
+#define WM831X_BATT_HOT_STS_WIDTH                    1  /* BATT_HOT_STS */
+#define WM831X_BATT_COLD_STS                    0x0400  /* BATT_COLD_STS */
+#define WM831X_BATT_COLD_STS_MASK               0x0400  /* BATT_COLD_STS */
+#define WM831X_BATT_COLD_STS_SHIFT                  10  /* BATT_COLD_STS */
+#define WM831X_BATT_COLD_STS_WIDTH                   1  /* BATT_COLD_STS */
+#define WM831X_CHG_TOPOFF                       0x0200  /* CHG_TOPOFF */
+#define WM831X_CHG_TOPOFF_MASK                  0x0200  /* CHG_TOPOFF */
+#define WM831X_CHG_TOPOFF_SHIFT                      9  /* CHG_TOPOFF */
+#define WM831X_CHG_TOPOFF_WIDTH                      1  /* CHG_TOPOFF */
+#define WM831X_CHG_ACTIVE                       0x0100  /* CHG_ACTIVE */
+#define WM831X_CHG_ACTIVE_MASK                  0x0100  /* CHG_ACTIVE */
+#define WM831X_CHG_ACTIVE_SHIFT                      8  /* CHG_ACTIVE */
+#define WM831X_CHG_ACTIVE_WIDTH                      1  /* CHG_ACTIVE */
+#define WM831X_CHG_TIME_ELAPSED_MASK            0x00FF  /* CHG_TIME_ELAPSED - [7:0] */
+#define WM831X_CHG_TIME_ELAPSED_SHIFT                0  /* CHG_TIME_ELAPSED - [7:0] */
+#define WM831X_CHG_TIME_ELAPSED_WIDTH                8  /* CHG_TIME_ELAPSED - [7:0] */
+
+#define WM831X_CHG_STATE_OFF         (0 << WM831X_CHG_STATE_SHIFT)
+#define WM831X_CHG_STATE_TRICKLE     (1 << WM831X_CHG_STATE_SHIFT)
+#define WM831X_CHG_STATE_FAST        (2 << WM831X_CHG_STATE_SHIFT)
+#define WM831X_CHG_STATE_TRICKLE_OT  (3 << WM831X_CHG_STATE_SHIFT)
+#define WM831X_CHG_STATE_FAST_OT     (4 << WM831X_CHG_STATE_SHIFT)
+#define WM831X_CHG_STATE_DEFECTIVE   (5 << WM831X_CHG_STATE_SHIFT)
+
+/*
+ * R16459 (0x404B) - Backup Charger Control
+ */
+#define WM831X_BKUP_CHG_ENA                     0x8000  /* BKUP_CHG_ENA */
+#define WM831X_BKUP_CHG_ENA_MASK                0x8000  /* BKUP_CHG_ENA */
+#define WM831X_BKUP_CHG_ENA_SHIFT                   15  /* BKUP_CHG_ENA */
+#define WM831X_BKUP_CHG_ENA_WIDTH                    1  /* BKUP_CHG_ENA */
+#define WM831X_BKUP_CHG_STS                     0x4000  /* BKUP_CHG_STS */
+#define WM831X_BKUP_CHG_STS_MASK                0x4000  /* BKUP_CHG_STS */
+#define WM831X_BKUP_CHG_STS_SHIFT                   14  /* BKUP_CHG_STS */
+#define WM831X_BKUP_CHG_STS_WIDTH                    1  /* BKUP_CHG_STS */
+#define WM831X_BKUP_CHG_MODE                    0x1000  /* BKUP_CHG_MODE */
+#define WM831X_BKUP_CHG_MODE_MASK               0x1000  /* BKUP_CHG_MODE */
+#define WM831X_BKUP_CHG_MODE_SHIFT                  12  /* BKUP_CHG_MODE */
+#define WM831X_BKUP_CHG_MODE_WIDTH                   1  /* BKUP_CHG_MODE */
+#define WM831X_BKUP_BATT_DET_ENA                0x0800  /* BKUP_BATT_DET_ENA */
+#define WM831X_BKUP_BATT_DET_ENA_MASK           0x0800  /* BKUP_BATT_DET_ENA */
+#define WM831X_BKUP_BATT_DET_ENA_SHIFT              11  /* BKUP_BATT_DET_ENA */
+#define WM831X_BKUP_BATT_DET_ENA_WIDTH               1  /* BKUP_BATT_DET_ENA */
+#define WM831X_BKUP_BATT_STS                    0x0400  /* BKUP_BATT_STS */
+#define WM831X_BKUP_BATT_STS_MASK               0x0400  /* BKUP_BATT_STS */
+#define WM831X_BKUP_BATT_STS_SHIFT                  10  /* BKUP_BATT_STS */
+#define WM831X_BKUP_BATT_STS_WIDTH                   1  /* BKUP_BATT_STS */
+#define WM831X_BKUP_CHG_VLIM                    0x0010  /* BKUP_CHG_VLIM */
+#define WM831X_BKUP_CHG_VLIM_MASK               0x0010  /* BKUP_CHG_VLIM */
+#define WM831X_BKUP_CHG_VLIM_SHIFT                   4  /* BKUP_CHG_VLIM */
+#define WM831X_BKUP_CHG_VLIM_WIDTH                   1  /* BKUP_CHG_VLIM */
+#define WM831X_BKUP_CHG_ILIM_MASK               0x0003  /* BKUP_CHG_ILIM - [1:0] */
+#define WM831X_BKUP_CHG_ILIM_SHIFT                   0  /* BKUP_CHG_ILIM - [1:0] */
+#define WM831X_BKUP_CHG_ILIM_WIDTH                   2  /* BKUP_CHG_ILIM - [1:0] */
+
+#endif
index 9a72cc78e6b817d2b7c24b076eef7bd0061235f2..b6eae5e3144b9dff9ce70e0186c4e7fbbda55475 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 7fbb97267556531b0f13a112a5afc7e134234189..8835b877b8dbefdd57bf8ba4b52fcc25b47662ff 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 403aa505f27eed06942c9bd7d30c3f93ca4f69d0..2ee22e8af11042d9ab266b30300b9a63f9e7d61a 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 7ac8b500d55c3bf8d2202878348b8b0115579f43..e4898e9eeb5971753b0447b4399177748460eade 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 3e7615e9087e400c767332dfa3c64e5ec8483356..81bb42358595728f2c10b02077c4edb7cdf3a219 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 14b81f3e523292395ad2e1d8e00bf007a132920f..c02c8db737011c848499c43580b64632980ff404 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 451bdfc858306089f65b4f10b5f9e3b1a159da25..ac3ab683fec6707fec51881eb300fbe697239a3f 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 b77486d152cd307228dae87523b884b80f300111..4e02ee2b071e1712fa6d7eb65bb1a9f5b4e6a4b1 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 889598537370b6f1de72e672efd55b6f3db1b377..652ef01be5823230e8cf89ea96e14b12acd2076a 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 1bf5900ffe434232c61ba9d71a9ee7e061e37a41..f58e9d836f329f8244b1dbab34f55b51665ad99e 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 4030ebada49e922cbdc8fb8e486a7a2b149d177d..7a232a9bdd6230e0db32e93b582af621c88a02ba 100644 (file)
@@ -121,6 +121,7 @@ typedef enum {
        NAND_ECC_SOFT,
        NAND_ECC_HW,
        NAND_ECC_HW_SYNDROME,
+       NAND_ECC_HW_OOB_FIRST,
 } nand_ecc_modes_t;
 
 /*
@@ -271,13 +272,13 @@ struct nand_ecc_ctrl {
                                           uint8_t *calc_ecc);
        int                     (*read_page_raw)(struct mtd_info *mtd,
                                                 struct nand_chip *chip,
-                                                uint8_t *buf);
+                                                uint8_t *buf, int page);
        void                    (*write_page_raw)(struct mtd_info *mtd,
                                                  struct nand_chip *chip,
                                                  const uint8_t *buf);
        int                     (*read_page)(struct mtd_info *mtd,
                                             struct nand_chip *chip,
-                                            uint8_t *buf);
+                                            uint8_t *buf, int page);
        int                     (*read_subpage)(struct mtd_info *mtd,
                                             struct nand_chip *chip,
                                             uint32_t offs, uint32_t len,
index 090da505425d77d105acb6133d63dfaaa7c95b7b..052ea8ca24347c83a7bfb4df0032ebec54fd9c83 100644 (file)
@@ -20,6 +20,12 @@ struct mtd_info;
  */
 int nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat, u_char *ecc_code);
 
+/*
+ * Detect and correct a 1 bit error for eccsize byte block
+ */
+int __nand_correct_data(u_char *dat, u_char *read_ecc, u_char *calc_ecc,
+                       unsigned int eccsize);
+
 /*
  * Detect and correct a 1 bit error for 256 byte block
  */
index 8ed8733743818f17411b98aade04b9e4c63acef6..4e49f3350678c63ee2b1c48908498bee0cdb6ffc 100644 (file)
@@ -214,4 +214,12 @@ unsigned onenand_block(struct onenand_chip *this, loff_t addr);
 loff_t onenand_addr(struct onenand_chip *this, int block);
 int flexonenand_region(struct mtd_info *mtd, loff_t addr);
 
+struct mtd_partition;
+
+struct onenand_platform_data {
+       void            (*mmcontrol)(struct mtd_info *mtd, int sync_read);
+       struct mtd_partition *parts;
+       unsigned int    nr_parts;
+};
+
 #endif /* __LINUX_MTD_ONENAND_H */
index 86a6bbef646596c1735e509fece60d863b26d2e8..acadbf53a69f519f021e4943e07c5ac2163f4db2 100644 (file)
 #define ONENAND_ECC_2BIT               (1 << 1)
 #define ONENAND_ECC_2BIT_ALL           (0xAAAA)
 #define FLEXONENAND_UNCORRECTABLE_ERROR        (0x1010)
+#define ONENAND_ECC_3BIT               (1 << 2)
+#define ONENAND_ECC_4BIT               (1 << 3)
+#define ONENAND_ECC_4BIT_UNCORRECTABLE (0x1010)
 
 /*
  * One-Time Programmable (OTP)
index d870ae2faedc7d8b7de668adb1e3e2464fdda685..ec0f607b364a492237fed9dddc3c2401a340ef5d 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 33b283601f625327d981165c6139c68b244e0c4a..c4c060208109b35ca6ebde436c0d6302ba93cd6a 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 2b49d676d0c9a9e7ef39fd4de53cfbb4d5f32bb2..510ffdd5020ea21f75b14fc7ad33d8e26e6d4c1e 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 57ab2ed08459cc31576f3b486eb864cbfd6df202..b38d113241899df6da6464369e6c6a8f87e5bb5a 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 2bacf75350696a18871ae94c4453f828f3a70116..73164c2b3d295eeb339b71018ffdee4bb7126474 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 a7979baf1e39b102948698ebf46551db5f2034ca..6aac5fe4f6f120db2b2c9b5199d69e7d820d5856 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 2b87acfc5f87496f323d69b1c2a487f634331878..13de789f0a5c1b8b47660dd37ca0c7da73dd26fd 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 3b6b788fe2b532546f1ae77deae5dd49f8410cf6..7803565aa877a2f3e39d4be29d794989f971ce87 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 b063c7328ba5b103b444fea061d07b7f55d24d03..fddfafaed0247318ca33482513c89fc7d6ef42ed 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 6729f7dcd60e66cc0116878ad640256a7061bbfe..7fc194aef8c23cc8bfe1ac4a98be55486a8b9d64 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 594c494ac3f0926dcbe3e2739d5de336c7382d1a..b5d096d3a9be22ffccf69782a49dc75c01b7a4a8 100644 (file)
@@ -38,6 +38,13 @@ enum {
        POWER_SUPPLY_STATUS_FULL,
 };
 
+enum {
+       POWER_SUPPLY_CHARGE_TYPE_UNKNOWN = 0,
+       POWER_SUPPLY_CHARGE_TYPE_NONE,
+       POWER_SUPPLY_CHARGE_TYPE_TRICKLE,
+       POWER_SUPPLY_CHARGE_TYPE_FAST,
+};
+
 enum {
        POWER_SUPPLY_HEALTH_UNKNOWN = 0,
        POWER_SUPPLY_HEALTH_GOOD,
@@ -58,9 +65,19 @@ enum {
        POWER_SUPPLY_TECHNOLOGY_LiMn,
 };
 
+enum {
+       POWER_SUPPLY_CAPACITY_LEVEL_UNKNOWN = 0,
+       POWER_SUPPLY_CAPACITY_LEVEL_CRITICAL,
+       POWER_SUPPLY_CAPACITY_LEVEL_LOW,
+       POWER_SUPPLY_CAPACITY_LEVEL_NORMAL,
+       POWER_SUPPLY_CAPACITY_LEVEL_HIGH,
+       POWER_SUPPLY_CAPACITY_LEVEL_FULL,
+};
+
 enum power_supply_property {
        /* Properties of type `int' */
        POWER_SUPPLY_PROP_STATUS = 0,
+       POWER_SUPPLY_PROP_CHARGE_TYPE,
        POWER_SUPPLY_PROP_HEALTH,
        POWER_SUPPLY_PROP_PRESENT,
        POWER_SUPPLY_PROP_ONLINE,
@@ -89,6 +106,7 @@ enum power_supply_property {
        POWER_SUPPLY_PROP_ENERGY_NOW,
        POWER_SUPPLY_PROP_ENERGY_AVG,
        POWER_SUPPLY_PROP_CAPACITY, /* in percents! */
+       POWER_SUPPLY_PROP_CAPACITY_LEVEL,
        POWER_SUPPLY_PROP_TEMP,
        POWER_SUPPLY_PROP_TEMP_AMBIENT,
        POWER_SUPPLY_PROP_TIME_TO_EMPTY_NOW,
@@ -126,6 +144,7 @@ struct power_supply {
                            enum power_supply_property psp,
                            union power_supply_propval *val);
        void (*external_power_changed)(struct power_supply *psy);
+       void (*set_charged)(struct power_supply *psy);
 
        /* For APM emulation, think legacy userspace. */
        int use_for_apm;
@@ -165,8 +184,10 @@ struct power_supply_info {
        int use_for_apm;
 };
 
+extern struct power_supply *power_supply_get_by_name(char *name);
 extern void power_supply_changed(struct power_supply *psy);
 extern int power_supply_am_i_supplied(struct power_supply *psy);
+extern int power_supply_set_battery_charged(struct power_supply *psy);
 
 #if defined(CONFIG_POWER_SUPPLY) || defined(CONFIG_POWER_SUPPLY_MODULE)
 extern int power_supply_is_system_supplied(void);
index e6e77d31c41882c25111204f90114a127f57e4f6..379eaed72d4b447d7e3b5098ab48e65d7bd959f9 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 26361c4c037a15f24feb2952070de8d1a9b2eab5..3ebb231536405d5c6e557f337692de98969d8c63 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 277f4b964df531a9f4cde24cbb8b60c3c1a0c8f7..490c5b37b6d7f02f2f25003b4e7f4d4356a4bed9 100644 (file)
@@ -125,6 +125,8 @@ struct regulator_bulk_data {
 /* regulator get and put */
 struct regulator *__must_check regulator_get(struct device *dev,
                                             const char *id);
+struct regulator *__must_check regulator_get_exclusive(struct device *dev,
+                                                      const char *id);
 void regulator_put(struct regulator *regulator);
 
 /* regulator output control and status */
@@ -144,6 +146,8 @@ void regulator_bulk_free(int num_consumers,
 
 int regulator_count_voltages(struct regulator *regulator);
 int regulator_list_voltage(struct regulator *regulator, unsigned selector);
+int regulator_is_supported_voltage(struct regulator *regulator,
+                                  int min_uV, int max_uV);
 int regulator_set_voltage(struct regulator *regulator, int min_uV, int max_uV);
 int regulator_get_voltage(struct regulator *regulator);
 int regulator_set_current_limit(struct regulator *regulator,
index ce1be708ca1629579a6a5c9aa9086f3a88cf7b1b..31f2055eae282ff3b585cc2215c94cf10765b326 100644 (file)
@@ -37,7 +37,8 @@ enum regulator_status {
  *
  * @enable: Configure the regulator as enabled.
  * @disable: Configure the regulator as disabled.
- * @is_enabled: Return 1 if the regulator is enabled, 0 otherwise.
+ * @is_enabled: Return 1 if the regulator is enabled, 0 if not.
+ *             May also return negative errno.
  *
  * @set_voltage: Set the voltage for the regulator within the range specified.
  *               The driver should select the voltage closest to min_uV.
@@ -162,6 +163,8 @@ struct regulator_desc {
 struct regulator_dev {
        struct regulator_desc *desc;
        int use_count;
+       int open_count;
+       int exclusive;
 
        /* lists we belong to */
        struct list_head list; /* list of all regulators */
index 91b4da31f1b510a0c21bc5d579b0143e753152ec..e94a4a1c7c8a705d6f0887f9d82cd7cef57f723f 100644 (file)
@@ -5,6 +5,9 @@
  *
  * Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
  *
+ * Copyright (c) 2009 Nokia Corporation
+ * Roger Quadros <ext-roger.quadros@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
 
 struct regulator_init_data;
 
+/**
+ * struct fixed_voltage_config - fixed_voltage_config structure
+ * @supply_name:       Name of the regulator supply
+ * @microvolts:                Output voltage of regulator
+ * @gpio:              GPIO to use for enable control
+ *                     set to -EINVAL if not used
+ * @enable_high:       Polarity of enable GPIO
+ *                     1 = Active high, 0 = Active low
+ * @enabled_at_boot:   Whether regulator has been enabled at
+ *                     boot or not. 1 = Yes, 0 = No
+ *                     This is used to keep the regulator at
+ *                     the default state
+ * @init_data:         regulator_init_data
+ *
+ * This structure contains fixed voltage regulator configuration
+ * information that must be passed by platform code to the fixed
+ * voltage regulator driver.
+ */
 struct fixed_voltage_config {
        const char *supply_name;
        int microvolts;
+       int gpio;
+       unsigned enable_high:1;
+       unsigned enabled_at_boot:1;
        struct regulator_init_data *init_data;
 };
 
index bac64fa390f20981c1dd8a1fc8b49657bc2ef30b..87f5f176d4ef31c521e133a9b24c92471d5d5eeb 100644 (file)
@@ -41,7 +41,7 @@ struct regulator;
 #define REGULATOR_CHANGE_DRMS          0x10
 
 /**
- * struct regulator_state - regulator state during low power syatem states
+ * struct regulator_state - regulator state during low power system states
  *
  * This describes a regulators state during a system wide low power state.
  *
@@ -117,25 +117,37 @@ struct regulation_constraints {
        /* mode to set on startup */
        unsigned int initial_mode;
 
-       /* constriant flags */
+       /* constraint flags */
        unsigned always_on:1;   /* regulator never off when system is on */
        unsigned boot_on:1;     /* bootloader/firmware enabled regulator */
-       unsigned apply_uV:1;    /* apply uV constraint iff min == max */
+       unsigned apply_uV:1;    /* apply uV constraint if min == max */
 };
 
 /**
  * struct regulator_consumer_supply - supply -> device mapping
  *
- * This maps a supply name to a device.
+ * This maps a supply name to a device.  Only one of dev or dev_name
+ * can be specified.  Use of dev_name allows support for buses which
+ * make struct device available late such as I2C and is the preferred
+ * form.
  *
  * @dev: Device structure for the consumer.
+ * @dev_name: Result of dev_name() for the consumer.
  * @supply: Name for the supply.
  */
 struct regulator_consumer_supply {
        struct device *dev;     /* consumer */
+       const char *dev_name;   /* dev_name() for consumer */
        const char *supply;     /* consumer supply - e.g. "vcc" */
 };
 
+/* Initialize struct regulator_consumer_supply */
+#define REGULATOR_SUPPLY(_name, _dev_name)                     \
+{                                                              \
+       .supply         = _name,                                \
+       .dev_name       = _dev_name,                            \
+}
+
 /**
  * struct regulator_init_data - regulator platform initialisation data.
  *
@@ -166,6 +178,12 @@ struct regulator_init_data {
 
 int regulator_suspend_prepare(suspend_state_t state);
 
+#ifdef CONFIG_REGULATOR
 void regulator_has_full_constraints(void);
+#else
+static inline void regulator_has_full_constraints(void)
+{
+}
+#endif
 
 #endif
index 44563192bf16d80d55add289e657a8b07e123c2c..de9a7fae20bec0d406060031edcefbe976245d11 100644 (file)
@@ -36,7 +36,7 @@
  * max1586_subdev_data - regulator data
  * @id: regulator Id (either MAX1586_V3 or MAX1586_V6)
  * @name: regulator cute name (example for V3: "vcc_core")
- * @platform_data: regulator init data (contraints, supplies, ...)
+ * @platform_data: regulator init data (constraints, supplies, ...)
  */
 struct max1586_subdev_data {
        int                             id;
@@ -46,7 +46,7 @@ struct max1586_subdev_data {
 
 /**
  * max1586_platform_data - platform data for max1586
- * @num_subdevs: number of regultors used (may be 1 or 2)
+ * @num_subdevs: number of regulators used (may be 1 or 2)
  * @subdevs: regulator used
  *           At most, there will be a regulator for V3 and one for V6 voltages.
  * @v3_gain: gain on the V3 voltage output multiplied by 1e6.
index bf116d0dbf23f8d3552e748719d76581f10aedb8..477841d29fce238a2888a7c0af0c7d05bc795524 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 8fe351c3914a14b8829d0c749d60962609f5bbbb..cbf2a3b46280a78f8d8cdfc408492fb1ac26fad3 100644 (file)
@@ -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);
 
@@ -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;
@@ -473,6 +493,13 @@ struct pacct_struct {
        unsigned long           ac_minflt, ac_majflt;
 };
 
+struct cpu_itimer {
+       cputime_t expires;
+       cputime_t incr;
+       u32 error;
+       u32 incr_error;
+};
+
 /**
  * struct task_cputime - collected CPU time counts
  * @utime:             time spent in user mode, in &cputime_t units
@@ -567,9 +594,12 @@ struct signal_struct {
        struct pid *leader_pid;
        ktime_t it_real_incr;
 
-       /* ITIMER_PROF and ITIMER_VIRTUAL timers for the process */
-       cputime_t it_prof_expires, it_virt_expires;
-       cputime_t it_prof_incr, it_virt_incr;
+       /*
+        * ITIMER_PROF and ITIMER_VIRTUAL timers for the process, we use
+        * CPUCLOCK_PROF and CPUCLOCK_VIRT for indexing array as these
+        * values are defined to 0 and 1 respectively
+        */
+       struct cpu_itimer it[2];
 
        /*
         * Thread group totals for process CPU timers.
@@ -601,6 +631,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 +663,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 */
@@ -1214,7 +1247,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
@@ -1507,6 +1539,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. */
@@ -1713,7 +1746,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 */
index d58e460844ddd61b25784d480e34f224acdc2a7b..fe661afe071325f635e7d7211035ff77bddbf8e0 100644 (file)
@@ -477,7 +477,7 @@ static inline int uart_handle_break(struct uart_port *port)
 
 /**
  *     uart_handle_dcd_change - handle a change of carrier detect state
- *     @port: uart_port structure for the open port
+ *     @uport: uart_port structure for the open port
  *     @status: new carrier detect status, nonzero if active
  */
 static inline void
@@ -503,7 +503,7 @@ uart_handle_dcd_change(struct uart_port *uport, unsigned int status)
 
 /**
  *     uart_handle_cts_change - handle a change of clear-to-send state
- *     @port: uart_port structure for the open port
+ *     @uport: uart_port structure for the open port
  *     @status: new clear to send status, nonzero if active
  */
 static inline void
diff --git a/include/linux/sfi.h b/include/linux/sfi.h
new file mode 100644 (file)
index 0000000..9a6f760
--- /dev/null
@@ -0,0 +1,206 @@
+/* sfi.h Simple Firmware Interface */
+
+/*
+
+  This file is provided under a dual BSD/GPLv2 license.  When using or
+  redistributing this file, you may do so under either license.
+
+  GPL LICENSE SUMMARY
+
+  Copyright(c) 2009 Intel Corporation. All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of version 2 of the GNU General Public License 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., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+  The full GNU General Public License is included in this distribution
+  in the file called LICENSE.GPL.
+
+  BSD LICENSE
+
+  Copyright(c) 2009 Intel Corporation. All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * 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.
+    * Neither the name of Intel Corporation nor the names of its
+      contributors may 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.
+
+*/
+
+#ifndef _LINUX_SFI_H
+#define _LINUX_SFI_H
+
+/* Table signatures reserved by the SFI specification */
+#define SFI_SIG_SYST           "SYST"
+#define SFI_SIG_FREQ           "FREQ"
+#define SFI_SIG_IDLE           "IDLE"
+#define SFI_SIG_CPUS           "CPUS"
+#define SFI_SIG_MTMR           "MTMR"
+#define SFI_SIG_MRTC           "MRTC"
+#define SFI_SIG_MMAP           "MMAP"
+#define SFI_SIG_APIC           "APIC"
+#define SFI_SIG_XSDT           "XSDT"
+#define SFI_SIG_WAKE           "WAKE"
+#define SFI_SIG_SPIB           "SPIB"
+#define SFI_SIG_I2CB           "I2CB"
+#define SFI_SIG_GPEM           "GPEM"
+
+#define SFI_SIGNATURE_SIZE     4
+#define SFI_OEM_ID_SIZE                6
+#define SFI_OEM_TABLE_ID_SIZE  8
+
+#define SFI_SYST_SEARCH_BEGIN          0x000E0000
+#define SFI_SYST_SEARCH_END            0x000FFFFF
+
+#define SFI_GET_NUM_ENTRIES(ptable, entry_type) \
+       ((ptable->header.len - sizeof(struct sfi_table_header)) / \
+       (sizeof(entry_type)))
+/*
+ * Table structures must be byte-packed to match the SFI specification,
+ * as they are provided by the BIOS.
+ */
+struct sfi_table_header {
+       char    sig[SFI_SIGNATURE_SIZE];
+       u32     len;
+       u8      rev;
+       u8      csum;
+       char    oem_id[SFI_OEM_ID_SIZE];
+       char    oem_table_id[SFI_OEM_TABLE_ID_SIZE];
+} __packed;
+
+struct sfi_table_simple {
+       struct sfi_table_header         header;
+       u64                             pentry[1];
+} __packed;
+
+/* Comply with UEFI spec 2.1 */
+struct sfi_mem_entry {
+       u32     type;
+       u64     phys_start;
+       u64     virt_start;
+       u64     pages;
+       u64     attrib;
+} __packed;
+
+struct sfi_cpu_table_entry {
+       u32     apic_id;
+} __packed;
+
+struct sfi_cstate_table_entry {
+       u32     hint;           /* MWAIT hint */
+       u32     latency;        /* latency in ms */
+} __packed;
+
+struct sfi_apic_table_entry {
+       u64     phys_addr;      /* phy base addr for APIC reg */
+} __packed;
+
+struct sfi_freq_table_entry {
+       u32     freq_mhz;       /* in MHZ */
+       u32     latency;        /* transition latency in ms */
+       u32     ctrl_val;       /* value to write to PERF_CTL */
+} __packed;
+
+struct sfi_wake_table_entry {
+       u64     phys_addr;      /* pointer to where the wake vector locates */
+} __packed;
+
+struct sfi_timer_table_entry {
+       u64     phys_addr;      /* phy base addr for the timer */
+       u32     freq_hz;        /* in HZ */
+       u32     irq;
+} __packed;
+
+struct sfi_rtc_table_entry {
+       u64     phys_addr;      /* phy base addr for the RTC */
+       u32     irq;
+} __packed;
+
+struct sfi_spi_table_entry {
+       u16     host_num;       /* attached to host 0, 1...*/
+       u16     cs;             /* chip select */
+       u16     irq_info;
+       char    name[16];
+       u8      dev_info[10];
+} __packed;
+
+struct sfi_i2c_table_entry {
+       u16     host_num;
+       u16     addr;           /* slave addr */
+       u16     irq_info;
+       char    name[16];
+       u8      dev_info[10];
+} __packed;
+
+struct sfi_gpe_table_entry {
+       u16     logical_id;     /* logical id */
+       u16     phys_id;        /* physical GPE id */
+} __packed;
+
+
+typedef int (*sfi_table_handler) (struct sfi_table_header *table);
+
+#ifdef CONFIG_SFI
+extern void __init sfi_init(void);
+extern int __init sfi_platform_init(void);
+extern void __init sfi_init_late(void);
+extern int sfi_table_parse(char *signature, char *oem_id, char *oem_table_id,
+                               sfi_table_handler handler);
+
+extern int sfi_disabled;
+static inline void disable_sfi(void)
+{
+       sfi_disabled = 1;
+}
+
+#else /* !CONFIG_SFI */
+
+static inline void sfi_init(void)
+{
+}
+
+static inline void sfi_init_late(void)
+{
+}
+
+#define sfi_disabled   0
+
+static inline int sfi_table_parse(char *signature, char *oem_id,
+                                       char *oem_table_id,
+                                       sfi_table_handler handler)
+{
+       return -1;
+}
+
+#endif /* !CONFIG_SFI */
+
+#endif /*_LINUX_SFI_H*/
diff --git a/include/linux/sfi_acpi.h b/include/linux/sfi_acpi.h
new file mode 100644 (file)
index 0000000..c4a5a8c
--- /dev/null
@@ -0,0 +1,93 @@
+/* sfi.h Simple Firmware Interface */
+
+/*
+
+  This file is provided under a dual BSD/GPLv2 license.  When using or
+  redistributing this file, you may do so under either license.
+
+  GPL LICENSE SUMMARY
+
+  Copyright(c) 2009 Intel Corporation. All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of version 2 of the GNU General Public License 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., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+  The full GNU General Public License is included in this distribution
+  in the file called LICENSE.GPL.
+
+  BSD LICENSE
+
+  Copyright(c) 2009 Intel Corporation. All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * 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.
+    * Neither the name of Intel Corporation nor the names of its
+      contributors may 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.
+
+*/
+
+#ifndef _LINUX_SFI_ACPI_H
+#define _LINUX_SFI_ACPI_H
+
+#ifdef CONFIG_SFI
+#include <acpi/acpi.h>         /* struct acpi_table_header */
+
+extern int sfi_acpi_table_parse(char *signature, char *oem_id,
+                               char *oem_table_id,
+                               int (*handler)(struct acpi_table_header *));
+
+static inline int acpi_sfi_table_parse(char *signature,
+                               int (*handler)(struct acpi_table_header *))
+{
+       if (!acpi_table_parse(signature, handler))
+               return 0;
+
+       return sfi_acpi_table_parse(signature, NULL, NULL, handler);
+}
+#else /* !CONFIG_SFI */
+
+static inline int sfi_acpi_table_parse(char *signature, char *oem_id,
+                               char *oem_table_id,
+                               int (*handler)(struct acpi_table_header *))
+{
+       return -1;
+}
+
+static inline int acpi_sfi_table_parse(char *signature,
+                               int (*handler)(struct acpi_table_header *))
+{
+       return acpi_table_parse(signature, handler);
+}
+#endif /* !CONFIG_SFI */
+
+#endif /*_LINUX_SFI_ACPI_H*/
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 c47c4b4da97e5a606ab2823d3126a32f42e446f0..97b60b37f445dca6cad09959e5838b2206280149 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 3f632182d8eb03e966530c04fdb7a675e2cc08c7..996df4dac7d47860731ec76537720289593e1f65 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 ab3f6e90caa5f6b40c2ff2451d6872617eaecb98..8ed9642a5a766bbec8d6ade82a29b7741f47265c 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 ea8009695c69b1ea437b255fd0a141ebf21feaa7..52e8cb0a756993e0f095372b9e200d663d9da1ab 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 2223ae0b5ed5777eea65e0d41d77b8719fdb7893..5f4e18b3ce73d3b5000b46d633d2eaa7af38c13d 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 04dba23c59f2c4aead01ab313127368a63b93a05..1b353a76c30492389bad8c12fb41ffcd901a2027 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 c090df442572c1aeb9456130b50b5b8afcfded52..6f9457a75b8f0b4281ddbe58e790e1cc00cf82fd 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 54a379c9e8ebd3709ed684d05f871322c12648a4..c2f04e1ae15973a4e15e55d0fb9f34d086628ef7 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 c2a46c45c8f75a3dab16327b78651501e1bd5740..3f14a02e9cc022dc5b4d276068110e62ff48b52a 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 7c15334f3ff2df3d3c0f4dc5d2a77c64563c2dcf..6c990e658f4ed33dc2244b1b8ef5d1649cc22a31 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 8d8285a10db94cd22474f0861409e84e56fbd974..a990ace1a8380f01901b742a6b0821aff46a5d9d 100644 (file)
@@ -460,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);
index ae779bb8cc0f7fb3d710be1916f1006e43f95c60..adb44066680c7caf468a0c149006833fb5983cae 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 a8fe05f224e5d0c9f5e8e65cb76c939194ef4300..a34fa89f1474891f51f727f8aa927ca999c9f168 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);
 }
 
@@ -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 b5744bc218ab576b7671602a643decc6bf508542..eaf9dffe0a01bea235e5b4be98aa3d49b4120e59 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 93223638f702c90513f4ea308c4ed3f2c873c18c..94012e649d86ce18f0a5dedc2511abeead1f46d6 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 5b88e36c91033e376a88be4ccf570622247d81a9..af4b86f3aca374febf7b97542feb8ac8868e4f7a 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 7b85e327af91bfa8a8d15cbc43a2a152f5085a62..c17eb64d721387a44df43c611ddfbc9e8f510daa 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;
 
index 0044d9b4cb85cb711e6256858ca06221cc774cbe..b2a7d8ba6ee3d6c7ee7435bd43eedd6640243a26 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 e81c64af80c12095b6ba076a2340ff448f4eed62..923f9040ea203568649e18faa245c1adf83f2dd8 100644 (file)
@@ -41,7 +41,7 @@
  *     interrupts at any time.
  */
 extern void vga_set_legacy_decoding(struct pci_dev *pdev,
-                                                                       unsigned int decodes);
+                                   unsigned int decodes);
 
 /**
  *     vga_get         - acquire & locks VGA resources
@@ -193,8 +193,17 @@ static inline int vga_conflicts(struct pci_dev *p1, struct pci_dev *p2)
  * They driver will get a callback when VGA arbitration is first used
  * by userspace since we some older X servers have issues.
  */
+#if defined(CONFIG_VGA_ARB)
 int vga_client_register(struct pci_dev *pdev, void *cookie,
                        void (*irq_set_state)(void *cookie, bool state),
                        unsigned int (*set_vga_decode)(void *cookie, bool state));
+#else
+static inline int vga_client_register(struct pci_dev *pdev, void *cookie,
+                                     void (*irq_set_state)(void *cookie, bool state),
+                                     unsigned int (*set_vga_decode)(void *cookie, bool state))
+{
+       return 0;
+}
+#endif
 
 #endif /* LINUX_VGA_H */
index 4fca4f5440ba47c93d7f903b8395a7b98791a021..057a2e0107589763411cfeea1bd6e7e4b189a24c 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 b3c4a60ceeb305ffc9a670e57c08a580ab36798c..ea7226a45acbbf46a36684a8596e1734e5f52331 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 8726ff77763e47389e0cb61eec678c85228b06c6..09d730085060afc91d3a01d60c9698a274e57555 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 8dab9f2b8832db74569f668a70edfd853274414c..15cb666581d7cbdb42cd7d39f4d309ac59399fb0 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 e547e3c8ee9a55412e52dabaa9ddc67a423b01ab..0093dd7c1d6f0eaf810001851902444269e82f44 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 dc161115ae35acdcfd3d54732f7f887194d9cbc1..b5f51980601445b79a13493cb8521a1c97692bb3 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 d8dd539c9f48e602019c0b184087635c042e3b3d..1f41734bbb777b0147926ed0964a79d84fa6d026 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 1a85dab8a940c31b66cb1a5a36de381418b20739..48121c3c434b6781661167debbf7b4a7540945fd 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 81a97cf8f0a0845a102a1200dc316aa32a47920f..2d0f222388a8e9f2dfb3f8bec716eff2999d78f2 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 0c9878123d5fa7096efd679c81058ed53662ad46..38e8c4d9289e6a3aff5eb5fb975e1b4cd29597db 100644 (file)
@@ -293,6 +293,24 @@ struct wm97xx {
        u16 suspend_mode;               /* PRP in suspend mode */
 };
 
+struct wm97xx_batt_pdata {
+       int     batt_aux;
+       int     temp_aux;
+       int     charge_gpio;
+       int     min_voltage;
+       int     max_voltage;
+       int     batt_div;
+       int     batt_mult;
+       int     temp_div;
+       int     temp_mult;
+       int     batt_tech;
+       char    *batt_name;
+};
+
+struct wm97xx_pdata {
+       struct wm97xx_batt_pdata        *batt_pdata;    /* battery data */
+};
+
 /*
  * Codec GPIO access (not supported on WM9705)
  * This can be used to set/get codec GPIO and Virtual GPIO status.
index 9681d1ab0e4f4279f9003c6ee9ad5887adefd824..a1d6419c2ff8080d11b3c1d7d89c38a0b5c220bc 100644 (file)
@@ -3,22 +3,12 @@
 
 #include <linux/wm97xx.h>
 
-struct wm97xx_batt_info {
-       int     batt_aux;
-       int     temp_aux;
-       int     charge_gpio;
-       int     min_voltage;
-       int     max_voltage;
-       int     batt_div;
-       int     batt_mult;
-       int     temp_div;
-       int     temp_mult;
-       int     batt_tech;
-       char    *batt_name;
-};
+#warning This file will be removed soon, use wm97xx.h instead!
+
+#define wm97xx_batt_info wm97xx_batt_pdata
 
 #ifdef CONFIG_BATTERY_WM97XX
-void __init wm97xx_bat_set_pdata(struct wm97xx_batt_info *data);
+void wm97xx_bat_set_pdata(struct wm97xx_batt_info *data);
 #else
 static inline void wm97xx_bat_set_pdata(struct wm97xx_batt_info *data) {}
 #endif
index 6273fa97b527e4d8c415ebbda74c0ac68303532e..7ef0c7b94f31f02781c873733161b36066b18ff7 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.
  */
index 938858304300a5ded975ef131ecabed46ae9b49a..c8f94e8db69c9fa1d6983a8bcefe148ff34e5fb8 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 cff8a8c22f506bd1cf9613ea5da370d74e68cfd2..f87777d0d5bd3a8cef46b07d6330a4b659a3bbf3 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 1493c541f9c44566a21553c5947aa1fa93fc702e..eaf46bdd18a5f81719b21de90fba91d5e64e78ea 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/timer.h b/include/trace/events/timer.h
new file mode 100644 (file)
index 0000000..1844c48
--- /dev/null
@@ -0,0 +1,342 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM timer
+
+#if !defined(_TRACE_TIMER_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_TIMER_H
+
+#include <linux/tracepoint.h>
+#include <linux/hrtimer.h>
+#include <linux/timer.h>
+
+/**
+ * timer_init - called when the timer is initialized
+ * @timer:     pointer to struct timer_list
+ */
+TRACE_EVENT(timer_init,
+
+       TP_PROTO(struct timer_list *timer),
+
+       TP_ARGS(timer),
+
+       TP_STRUCT__entry(
+               __field( void *,        timer   )
+       ),
+
+       TP_fast_assign(
+               __entry->timer  = timer;
+       ),
+
+       TP_printk("timer %p", __entry->timer)
+);
+
+/**
+ * timer_start - called when the timer is started
+ * @timer:     pointer to struct timer_list
+ * @expires:   the timers expiry time
+ */
+TRACE_EVENT(timer_start,
+
+       TP_PROTO(struct timer_list *timer, unsigned long expires),
+
+       TP_ARGS(timer, expires),
+
+       TP_STRUCT__entry(
+               __field( void *,        timer           )
+               __field( void *,        function        )
+               __field( unsigned long, expires         )
+               __field( unsigned long, now             )
+       ),
+
+       TP_fast_assign(
+               __entry->timer          = timer;
+               __entry->function       = timer->function;
+               __entry->expires        = expires;
+               __entry->now            = jiffies;
+       ),
+
+       TP_printk("timer %p: func %pf, expires %lu, timeout %ld",
+                 __entry->timer, __entry->function, __entry->expires,
+                 (long)__entry->expires - __entry->now)
+);
+
+/**
+ * timer_expire_entry - called immediately before the timer callback
+ * @timer:     pointer to struct timer_list
+ *
+ * Allows to determine the timer latency.
+ */
+TRACE_EVENT(timer_expire_entry,
+
+       TP_PROTO(struct timer_list *timer),
+
+       TP_ARGS(timer),
+
+       TP_STRUCT__entry(
+               __field( void *,        timer   )
+               __field( unsigned long, now     )
+       ),
+
+       TP_fast_assign(
+               __entry->timer          = timer;
+               __entry->now            = jiffies;
+       ),
+
+       TP_printk("timer %p: now %lu", __entry->timer, __entry->now)
+);
+
+/**
+ * timer_expire_exit - called immediately after the timer callback returns
+ * @timer:     pointer to struct timer_list
+ *
+ * When used in combination with the timer_expire_entry tracepoint we can
+ * determine the runtime of the timer callback function.
+ *
+ * NOTE: Do NOT derefernce timer in TP_fast_assign. The pointer might
+ * be invalid. We solely track the pointer.
+ */
+TRACE_EVENT(timer_expire_exit,
+
+       TP_PROTO(struct timer_list *timer),
+
+       TP_ARGS(timer),
+
+       TP_STRUCT__entry(
+               __field(void *, timer   )
+       ),
+
+       TP_fast_assign(
+               __entry->timer  = timer;
+       ),
+
+       TP_printk("timer %p", __entry->timer)
+);
+
+/**
+ * timer_cancel - called when the timer is canceled
+ * @timer:     pointer to struct timer_list
+ */
+TRACE_EVENT(timer_cancel,
+
+       TP_PROTO(struct timer_list *timer),
+
+       TP_ARGS(timer),
+
+       TP_STRUCT__entry(
+               __field( void *,        timer   )
+       ),
+
+       TP_fast_assign(
+               __entry->timer  = timer;
+       ),
+
+       TP_printk("timer %p", __entry->timer)
+);
+
+/**
+ * hrtimer_init - called when the hrtimer is initialized
+ * @timer:     pointer to struct hrtimer
+ * @clockid:   the hrtimers clock
+ * @mode:      the hrtimers mode
+ */
+TRACE_EVENT(hrtimer_init,
+
+       TP_PROTO(struct hrtimer *timer, clockid_t clockid,
+                enum hrtimer_mode mode),
+
+       TP_ARGS(timer, clockid, mode),
+
+       TP_STRUCT__entry(
+               __field( void *,                timer           )
+               __field( clockid_t,             clockid         )
+               __field( enum hrtimer_mode,     mode            )
+       ),
+
+       TP_fast_assign(
+               __entry->timer          = timer;
+               __entry->clockid        = clockid;
+               __entry->mode           = mode;
+       ),
+
+       TP_printk("hrtimer %p, clockid %s, mode %s", __entry->timer,
+                 __entry->clockid == CLOCK_REALTIME ?
+                       "CLOCK_REALTIME" : "CLOCK_MONOTONIC",
+                 __entry->mode == HRTIMER_MODE_ABS ?
+                       "HRTIMER_MODE_ABS" : "HRTIMER_MODE_REL")
+);
+
+/**
+ * hrtimer_start - called when the hrtimer is started
+ * @timer: pointer to struct hrtimer
+ */
+TRACE_EVENT(hrtimer_start,
+
+       TP_PROTO(struct hrtimer *timer),
+
+       TP_ARGS(timer),
+
+       TP_STRUCT__entry(
+               __field( void *,        timer           )
+               __field( void *,        function        )
+               __field( s64,           expires         )
+               __field( s64,           softexpires     )
+       ),
+
+       TP_fast_assign(
+               __entry->timer          = timer;
+               __entry->function       = timer->function;
+               __entry->expires        = hrtimer_get_expires(timer).tv64;
+               __entry->softexpires    = hrtimer_get_softexpires(timer).tv64;
+       ),
+
+       TP_printk("hrtimer %p, func %pf, expires %llu, softexpires %llu",
+                 __entry->timer, __entry->function,
+                 (unsigned long long)ktime_to_ns((ktime_t) {
+                                 .tv64 = __entry->expires }),
+                 (unsigned long long)ktime_to_ns((ktime_t) {
+                                 .tv64 = __entry->softexpires }))
+);
+
+/**
+ * htimmer_expire_entry - called immediately before the hrtimer callback
+ * @timer:     pointer to struct hrtimer
+ * @now:       pointer to variable which contains current time of the
+ *             timers base.
+ *
+ * Allows to determine the timer latency.
+ */
+TRACE_EVENT(hrtimer_expire_entry,
+
+       TP_PROTO(struct hrtimer *timer, ktime_t *now),
+
+       TP_ARGS(timer, now),
+
+       TP_STRUCT__entry(
+               __field( void *,        timer   )
+               __field( s64,           now     )
+       ),
+
+       TP_fast_assign(
+               __entry->timer  = timer;
+               __entry->now    = now->tv64;
+       ),
+
+       TP_printk("hrtimer %p, now %llu", __entry->timer,
+                 (unsigned long long)ktime_to_ns((ktime_t) {
+                                 .tv64 = __entry->now }))
+ );
+
+/**
+ * hrtimer_expire_exit - called immediately after the hrtimer callback returns
+ * @timer:     pointer to struct hrtimer
+ *
+ * When used in combination with the hrtimer_expire_entry tracepoint we can
+ * determine the runtime of the callback function.
+ */
+TRACE_EVENT(hrtimer_expire_exit,
+
+       TP_PROTO(struct hrtimer *timer),
+
+       TP_ARGS(timer),
+
+       TP_STRUCT__entry(
+               __field( void *,        timer   )
+       ),
+
+       TP_fast_assign(
+               __entry->timer  = timer;
+       ),
+
+       TP_printk("hrtimer %p", __entry->timer)
+);
+
+/**
+ * hrtimer_cancel - called when the hrtimer is canceled
+ * @timer:     pointer to struct hrtimer
+ */
+TRACE_EVENT(hrtimer_cancel,
+
+       TP_PROTO(struct hrtimer *timer),
+
+       TP_ARGS(timer),
+
+       TP_STRUCT__entry(
+               __field( void *,        timer   )
+       ),
+
+       TP_fast_assign(
+               __entry->timer  = timer;
+       ),
+
+       TP_printk("hrtimer %p", __entry->timer)
+);
+
+/**
+ * itimer_state - called when itimer is started or canceled
+ * @which:     name of the interval timer
+ * @value:     the itimers value, itimer is canceled if value->it_value is
+ *             zero, otherwise it is started
+ * @expires:   the itimers expiry time
+ */
+TRACE_EVENT(itimer_state,
+
+       TP_PROTO(int which, const struct itimerval *const value,
+                cputime_t expires),
+
+       TP_ARGS(which, value, expires),
+
+       TP_STRUCT__entry(
+               __field(        int,            which           )
+               __field(        cputime_t,      expires         )
+               __field(        long,           value_sec       )
+               __field(        long,           value_usec      )
+               __field(        long,           interval_sec    )
+               __field(        long,           interval_usec   )
+       ),
+
+       TP_fast_assign(
+               __entry->which          = which;
+               __entry->expires        = expires;
+               __entry->value_sec      = value->it_value.tv_sec;
+               __entry->value_usec     = value->it_value.tv_usec;
+               __entry->interval_sec   = value->it_interval.tv_sec;
+               __entry->interval_usec  = value->it_interval.tv_usec;
+       ),
+
+       TP_printk("which %d, expires %lu, it_value %lu.%lu, it_interval %lu.%lu",
+                 __entry->which, __entry->expires,
+                 __entry->value_sec, __entry->value_usec,
+                 __entry->interval_sec, __entry->interval_usec)
+);
+
+/**
+ * itimer_expire - called when itimer expires
+ * @which:     type of the interval timer
+ * @pid:       pid of the process which owns the timer
+ * @now:       current time, used to calculate the latency of itimer
+ */
+TRACE_EVENT(itimer_expire,
+
+       TP_PROTO(int which, struct pid *pid, cputime_t now),
+
+       TP_ARGS(which, pid, now),
+
+       TP_STRUCT__entry(
+               __field( int ,          which   )
+               __field( pid_t,         pid     )
+               __field( cputime_t,     now     )
+       ),
+
+       TP_fast_assign(
+               __entry->which  = which;
+               __entry->now    = now;
+               __entry->pid    = pid_nr(pid);
+       ),
+
+           TP_printk("which %d, pid %d, now %lu", __entry->which,
+                     (int) __entry->pid, __entry->now)
+);
+
+#endif /*  _TRACE_TIMER_H */
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>
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 34971becbd3c6f2db9e011c9c09f070e7eaf3c71..6107223124e4579a663dde4cb26e91aab68191c1 100644 (file)
@@ -68,6 +68,7 @@
 #include <linux/async.h>
 #include <linux/kmemcheck.h>
 #include <linux/kmemtrace.h>
+#include <linux/sfi.h>
 #include <linux/shmem_fs.h>
 #include <trace/boot.h>
 
@@ -668,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 */
@@ -689,6 +690,7 @@ asmlinkage void __init start_kernel(void)
        check_bugs();
 
        acpi_early_init(); /* before LAPIC and SMP init */
+       sfi_init_late();
 
        ftrace_init();
 
index c5e68adc673248b03758bb59d81a5b88f71ef561..ee9d69707c0afafc9d5a6d0d9b46146e4fafe3e4 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 30162a59621a03e0dab4c58d1102196928b56912..9eb1488b543bc9e8ae419035a86e489e9bf4c8c6 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 b8e4ba92f6d12a6384c4a2fce9859ba064d21810..79ce84e890f72b153ca4f77ee7abeec3a6aed496 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 c7ece8f027f2bca3200199fc323c65939cee0453..cd83d9933b6b85cd05bf6db17f424056d2d504fc 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 e47ee8a061355a0843f950cdb00c5232e76e745a..60d6fdcc926509da90ebe38b4e59c275290e8d9f 100644 (file)
@@ -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)
@@ -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 2cebfb23b0b886afc46f5ad255d77735ca674383..51ad0b0b72664ad327c042c33272e90630ec932b 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>
@@ -62,6 +63,7 @@
 #include <linux/fs_struct.h>
 #include <linux/magic.h>
 #include <linux/perf_event.h>
+#include <linux/posix-timers.h>
 
 #include <asm/pgtable.h>
 #include <asm/pgalloc.h>
@@ -136,9 +138,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 +263,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 +301,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 +440,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 +502,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)) {
@@ -788,10 +806,10 @@ static void posix_cpu_timers_init_group(struct signal_struct *sig)
        thread_group_cputime_init(sig);
 
        /* Expiration times and increments. */
-       sig->it_virt_expires = cputime_zero;
-       sig->it_virt_incr = cputime_zero;
-       sig->it_prof_expires = cputime_zero;
-       sig->it_prof_incr = cputime_zero;
+       sig->it[CPUCLOCK_PROF].expires = cputime_zero;
+       sig->it[CPUCLOCK_PROF].incr = cputime_zero;
+       sig->it[CPUCLOCK_VIRT].expires = cputime_zero;
+       sig->it[CPUCLOCK_VIRT].incr = cputime_zero;
 
        /* Cached expiration times. */
        sig->cputime_expires.prof_exp = cputime_zero;
@@ -849,6 +867,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 +882,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,6 +1096,8 @@ 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);
 
index c03f221fee44c1d8271066a4bcae76c4a211b242..e5d98ce50f89ffc279cbc9a659abd38d2abb3008 100644 (file)
@@ -48,6 +48,8 @@
 
 #include <asm/uaccess.h>
 
+#include <trace/events/timer.h>
+
 /*
  * The timer bases:
  *
@@ -442,6 +444,26 @@ static inline void debug_hrtimer_activate(struct hrtimer *timer) { }
 static inline void debug_hrtimer_deactivate(struct hrtimer *timer) { }
 #endif
 
+static inline void
+debug_init(struct hrtimer *timer, clockid_t clockid,
+          enum hrtimer_mode mode)
+{
+       debug_hrtimer_init(timer);
+       trace_hrtimer_init(timer, clockid, mode);
+}
+
+static inline void debug_activate(struct hrtimer *timer)
+{
+       debug_hrtimer_activate(timer);
+       trace_hrtimer_start(timer);
+}
+
+static inline void debug_deactivate(struct hrtimer *timer)
+{
+       debug_hrtimer_deactivate(timer);
+       trace_hrtimer_cancel(timer);
+}
+
 /* High resolution timer related functions */
 #ifdef CONFIG_HIGH_RES_TIMERS
 
@@ -798,7 +820,7 @@ static int enqueue_hrtimer(struct hrtimer *timer,
        struct hrtimer *entry;
        int leftmost = 1;
 
-       debug_hrtimer_activate(timer);
+       debug_activate(timer);
 
        /*
         * Find the right place in the rbtree:
@@ -884,7 +906,7 @@ remove_hrtimer(struct hrtimer *timer, struct hrtimer_clock_base *base)
                 * reprogramming happens in the interrupt handler. This is a
                 * rare case and less expensive than a smp call.
                 */
-               debug_hrtimer_deactivate(timer);
+               debug_deactivate(timer);
                timer_stats_hrtimer_clear_start_info(timer);
                reprogram = base->cpu_base == &__get_cpu_var(hrtimer_bases);
                __remove_hrtimer(timer, base, HRTIMER_STATE_INACTIVE,
@@ -1117,7 +1139,7 @@ static void __hrtimer_init(struct hrtimer *timer, clockid_t clock_id,
 void hrtimer_init(struct hrtimer *timer, clockid_t clock_id,
                  enum hrtimer_mode mode)
 {
-       debug_hrtimer_init(timer);
+       debug_init(timer, clock_id, mode);
        __hrtimer_init(timer, clock_id, mode);
 }
 EXPORT_SYMBOL_GPL(hrtimer_init);
@@ -1141,7 +1163,7 @@ int hrtimer_get_res(const clockid_t which_clock, struct timespec *tp)
 }
 EXPORT_SYMBOL_GPL(hrtimer_get_res);
 
-static void __run_hrtimer(struct hrtimer *timer)
+static void __run_hrtimer(struct hrtimer *timer, ktime_t *now)
 {
        struct hrtimer_clock_base *base = timer->base;
        struct hrtimer_cpu_base *cpu_base = base->cpu_base;
@@ -1150,7 +1172,7 @@ static void __run_hrtimer(struct hrtimer *timer)
 
        WARN_ON(!irqs_disabled());
 
-       debug_hrtimer_deactivate(timer);
+       debug_deactivate(timer);
        __remove_hrtimer(timer, base, HRTIMER_STATE_CALLBACK, 0);
        timer_stats_account_hrtimer(timer);
        fn = timer->function;
@@ -1161,7 +1183,9 @@ static void __run_hrtimer(struct hrtimer *timer)
         * the timer base.
         */
        spin_unlock(&cpu_base->lock);
+       trace_hrtimer_expire_entry(timer, now);
        restart = fn(timer);
+       trace_hrtimer_expire_exit(timer);
        spin_lock(&cpu_base->lock);
 
        /*
@@ -1272,7 +1296,7 @@ void hrtimer_interrupt(struct clock_event_device *dev)
                                break;
                        }
 
-                       __run_hrtimer(timer);
+                       __run_hrtimer(timer, &basenow);
                }
                base++;
        }
@@ -1394,7 +1418,7 @@ void hrtimer_run_queues(void)
                                        hrtimer_get_expires_tv64(timer))
                                break;
 
-                       __run_hrtimer(timer);
+                       __run_hrtimer(timer, &base->softirq_time);
                }
                spin_unlock(&cpu_base->lock);
        }
@@ -1571,7 +1595,7 @@ static void migrate_hrtimer_list(struct hrtimer_clock_base *old_base,
        while ((node = rb_first(&old_base->active))) {
                timer = rb_entry(node, struct hrtimer, node);
                BUG_ON(hrtimer_callback_running(timer));
-               debug_hrtimer_deactivate(timer);
+               debug_deactivate(timer);
 
                /*
                 * Mark it as STATE_MIGRATE not INACTIVE otherwise the
index 58762f7077ec003cc1a26e793b423006ecce73a7..b03451ede5285822aa92f8be19f3247c80a93a92 100644 (file)
@@ -12,6 +12,7 @@
 #include <linux/time.h>
 #include <linux/posix-timers.h>
 #include <linux/hrtimer.h>
+#include <trace/events/timer.h>
 
 #include <asm/uaccess.h>
 
@@ -41,10 +42,43 @@ static struct timeval itimer_get_remtime(struct hrtimer *timer)
        return ktime_to_timeval(rem);
 }
 
+static void get_cpu_itimer(struct task_struct *tsk, unsigned int clock_id,
+                          struct itimerval *const value)
+{
+       cputime_t cval, cinterval;
+       struct cpu_itimer *it = &tsk->signal->it[clock_id];
+
+       spin_lock_irq(&tsk->sighand->siglock);
+
+       cval = it->expires;
+       cinterval = it->incr;
+       if (!cputime_eq(cval, cputime_zero)) {
+               struct task_cputime cputime;
+               cputime_t t;
+
+               thread_group_cputimer(tsk, &cputime);
+               if (clock_id == CPUCLOCK_PROF)
+                       t = cputime_add(cputime.utime, cputime.stime);
+               else
+                       /* CPUCLOCK_VIRT */
+                       t = cputime.utime;
+
+               if (cputime_le(cval, t))
+                       /* about to fire */
+                       cval = cputime_one_jiffy;
+               else
+                       cval = cputime_sub(cval, t);
+       }
+
+       spin_unlock_irq(&tsk->sighand->siglock);
+
+       cputime_to_timeval(cval, &value->it_value);
+       cputime_to_timeval(cinterval, &value->it_interval);
+}
+
 int do_getitimer(int which, struct itimerval *value)
 {
        struct task_struct *tsk = current;
-       cputime_t cinterval, cval;
 
        switch (which) {
        case ITIMER_REAL:
@@ -55,44 +89,10 @@ int do_getitimer(int which, struct itimerval *value)
                spin_unlock_irq(&tsk->sighand->siglock);
                break;
        case ITIMER_VIRTUAL:
-               spin_lock_irq(&tsk->sighand->siglock);
-               cval = tsk->signal->it_virt_expires;
-               cinterval = tsk->signal->it_virt_incr;
-               if (!cputime_eq(cval, cputime_zero)) {
-                       struct task_cputime cputime;
-                       cputime_t utime;
-
-                       thread_group_cputimer(tsk, &cputime);
-                       utime = cputime.utime;
-                       if (cputime_le(cval, utime)) { /* about to fire */
-                               cval = jiffies_to_cputime(1);
-                       } else {
-                               cval = cputime_sub(cval, utime);
-                       }
-               }
-               spin_unlock_irq(&tsk->sighand->siglock);
-               cputime_to_timeval(cval, &value->it_value);
-               cputime_to_timeval(cinterval, &value->it_interval);
+               get_cpu_itimer(tsk, CPUCLOCK_VIRT, value);
                break;
        case ITIMER_PROF:
-               spin_lock_irq(&tsk->sighand->siglock);
-               cval = tsk->signal->it_prof_expires;
-               cinterval = tsk->signal->it_prof_incr;
-               if (!cputime_eq(cval, cputime_zero)) {
-                       struct task_cputime times;
-                       cputime_t ptime;
-
-                       thread_group_cputimer(tsk, &times);
-                       ptime = cputime_add(times.utime, times.stime);
-                       if (cputime_le(cval, ptime)) { /* about to fire */
-                               cval = jiffies_to_cputime(1);
-                       } else {
-                               cval = cputime_sub(cval, ptime);
-                       }
-               }
-               spin_unlock_irq(&tsk->sighand->siglock);
-               cputime_to_timeval(cval, &value->it_value);
-               cputime_to_timeval(cinterval, &value->it_interval);
+               get_cpu_itimer(tsk, CPUCLOCK_PROF, value);
                break;
        default:
                return(-EINVAL);
@@ -123,11 +123,62 @@ enum hrtimer_restart it_real_fn(struct hrtimer *timer)
        struct signal_struct *sig =
                container_of(timer, struct signal_struct, real_timer);
 
+       trace_itimer_expire(ITIMER_REAL, sig->leader_pid, 0);
        kill_pid_info(SIGALRM, SEND_SIG_PRIV, sig->leader_pid);
 
        return HRTIMER_NORESTART;
 }
 
+static inline u32 cputime_sub_ns(cputime_t ct, s64 real_ns)
+{
+       struct timespec ts;
+       s64 cpu_ns;
+
+       cputime_to_timespec(ct, &ts);
+       cpu_ns = timespec_to_ns(&ts);
+
+       return (cpu_ns <= real_ns) ? 0 : cpu_ns - real_ns;
+}
+
+static void set_cpu_itimer(struct task_struct *tsk, unsigned int clock_id,
+                          const struct itimerval *const value,
+                          struct itimerval *const ovalue)
+{
+       cputime_t cval, nval, cinterval, ninterval;
+       s64 ns_ninterval, ns_nval;
+       struct cpu_itimer *it = &tsk->signal->it[clock_id];
+
+       nval = timeval_to_cputime(&value->it_value);
+       ns_nval = timeval_to_ns(&value->it_value);
+       ninterval = timeval_to_cputime(&value->it_interval);
+       ns_ninterval = timeval_to_ns(&value->it_interval);
+
+       it->incr_error = cputime_sub_ns(ninterval, ns_ninterval);
+       it->error = cputime_sub_ns(nval, ns_nval);
+
+       spin_lock_irq(&tsk->sighand->siglock);
+
+       cval = it->expires;
+       cinterval = it->incr;
+       if (!cputime_eq(cval, cputime_zero) ||
+           !cputime_eq(nval, cputime_zero)) {
+               if (cputime_gt(nval, cputime_zero))
+                       nval = cputime_add(nval, cputime_one_jiffy);
+               set_process_cpu_timer(tsk, clock_id, &nval, &cval);
+       }
+       it->expires = nval;
+       it->incr = ninterval;
+       trace_itimer_state(clock_id == CPUCLOCK_VIRT ?
+                          ITIMER_VIRTUAL : ITIMER_PROF, value, nval);
+
+       spin_unlock_irq(&tsk->sighand->siglock);
+
+       if (ovalue) {
+               cputime_to_timeval(cval, &ovalue->it_value);
+               cputime_to_timeval(cinterval, &ovalue->it_interval);
+       }
+}
+
 /*
  * Returns true if the timeval is in canonical form
  */
@@ -139,7 +190,6 @@ int do_setitimer(int which, struct itimerval *value, struct itimerval *ovalue)
        struct task_struct *tsk = current;
        struct hrtimer *timer;
        ktime_t expires;
-       cputime_t cval, cinterval, nval, ninterval;
 
        /*
         * Validate the timevals in value.
@@ -171,51 +221,14 @@ again:
                } else
                        tsk->signal->it_real_incr.tv64 = 0;
 
+               trace_itimer_state(ITIMER_REAL, value, 0);
                spin_unlock_irq(&tsk->sighand->siglock);
                break;
        case ITIMER_VIRTUAL:
-               nval = timeval_to_cputime(&value->it_value);
-               ninterval = timeval_to_cputime(&value->it_interval);
-               spin_lock_irq(&tsk->sighand->siglock);
-               cval = tsk->signal->it_virt_expires;
-               cinterval = tsk->signal->it_virt_incr;
-               if (!cputime_eq(cval, cputime_zero) ||
-                   !cputime_eq(nval, cputime_zero)) {
-                       if (cputime_gt(nval, cputime_zero))
-                               nval = cputime_add(nval,
-                                                  jiffies_to_cputime(1));
-                       set_process_cpu_timer(tsk, CPUCLOCK_VIRT,
-                                             &nval, &cval);
-               }
-               tsk->signal->it_virt_expires = nval;
-               tsk->signal->it_virt_incr = ninterval;
-               spin_unlock_irq(&tsk->sighand->siglock);
-               if (ovalue) {
-                       cputime_to_timeval(cval, &ovalue->it_value);
-                       cputime_to_timeval(cinterval, &ovalue->it_interval);
-               }
+               set_cpu_itimer(tsk, CPUCLOCK_VIRT, value, ovalue);
                break;
        case ITIMER_PROF:
-               nval = timeval_to_cputime(&value->it_value);
-               ninterval = timeval_to_cputime(&value->it_interval);
-               spin_lock_irq(&tsk->sighand->siglock);
-               cval = tsk->signal->it_prof_expires;
-               cinterval = tsk->signal->it_prof_incr;
-               if (!cputime_eq(cval, cputime_zero) ||
-                   !cputime_eq(nval, cputime_zero)) {
-                       if (cputime_gt(nval, cputime_zero))
-                               nval = cputime_add(nval,
-                                                  jiffies_to_cputime(1));
-                       set_process_cpu_timer(tsk, CPUCLOCK_PROF,
-                                             &nval, &cval);
-               }
-               tsk->signal->it_prof_expires = nval;
-               tsk->signal->it_prof_incr = ninterval;
-               spin_unlock_irq(&tsk->sighand->siglock);
-               if (ovalue) {
-                       cputime_to_timeval(cval, &ovalue->it_value);
-                       cputime_to_timeval(cinterval, &ovalue->it_interval);
-               }
+               set_cpu_itimer(tsk, CPUCLOCK_PROF, value, ovalue);
                break;
        default:
                return -EINVAL;
index 3a29dbe7898e329e9ddd61f141dfb44f68a59ca8..8b6b8b697c686a297de3c85421e1e5172ff53a27 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 9fcb53a11f872e958c95bcf37f8558e9bb148d77..689d20f39305be5d72908dbdf85bdb187051bdcb 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 ef177d653b2cb791b11f98723d3afe5ada5ac586..cfadc1291d0badb247275feacb720fa3408b9c44 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 f74d2d7aa605801f70209cc61f434bdfbc3a2663..3815ac1d58b2660c5e7eba0d9f201e6201d1b967 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 d4b3dbc79fdb353cde01ee5eef13b8cf203a34aa..d4aba4f3584c73c3faff6ff5a0b73e27f6a7c5fb 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,
index b6ee424245dd15b00a1b246388733a76b392041a..e6bc4b28aa6250aec9f281aa69509221f06d59b5 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)
index 512ab73b0ca3afed1553b5e01218c92d17630a4c..bcdef26e3332f7e197b7fd8740f697010a257bb4 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)
 {
index 31310b5d3f50325ed75a6e54b94fc715d63698fa..d3f722d20f9c6e8d849693a1754b616d3ba74bea 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 e33a21cb9407987a0aa9b46c32baba590302862b..5c9dc228747b2dec39a639e74d48f65bc12d5e23 100644 (file)
@@ -8,17 +8,18 @@
 #include <linux/math64.h>
 #include <asm/uaccess.h>
 #include <linux/kernel_stat.h>
+#include <trace/events/timer.h>
 
 /*
  * Called after updating RLIMIT_CPU to set timer expiration if necessary.
  */
 void update_rlimit_cpu(unsigned long rlim_new)
 {
-       cputime_t cputime;
+       cputime_t cputime = secs_to_cputime(rlim_new);
+       struct signal_struct *const sig = current->signal;
 
-       cputime = secs_to_cputime(rlim_new);
-       if (cputime_eq(current->signal->it_prof_expires, cputime_zero) ||
-           cputime_gt(current->signal->it_prof_expires, cputime)) {
+       if (cputime_eq(sig->it[CPUCLOCK_PROF].expires, cputime_zero) ||
+           cputime_gt(sig->it[CPUCLOCK_PROF].expires, cputime)) {
                spin_lock_irq(&current->sighand->siglock);
                set_process_cpu_timer(current, CPUCLOCK_PROF, &cputime, NULL);
                spin_unlock_irq(&current->sighand->siglock);
@@ -542,6 +543,17 @@ static void clear_dead_task(struct k_itimer *timer, union cpu_time_count now)
                                             now);
 }
 
+static inline int expires_gt(cputime_t expires, cputime_t new_exp)
+{
+       return cputime_eq(expires, cputime_zero) ||
+              cputime_gt(expires, new_exp);
+}
+
+static inline int expires_le(cputime_t expires, cputime_t new_exp)
+{
+       return !cputime_eq(expires, cputime_zero) &&
+              cputime_le(expires, new_exp);
+}
 /*
  * Insert the timer on the appropriate list before any timers that
  * expire later.  This must be called with the tasklist_lock held
@@ -586,34 +598,32 @@ static void arm_timer(struct k_itimer *timer, union cpu_time_count now)
                 */
 
                if (CPUCLOCK_PERTHREAD(timer->it_clock)) {
+                       union cpu_time_count *exp = &nt->expires;
+
                        switch (CPUCLOCK_WHICH(timer->it_clock)) {
                        default:
                                BUG();
                        case CPUCLOCK_PROF:
-                               if (cputime_eq(p->cputime_expires.prof_exp,
-                                              cputime_zero) ||
-                                   cputime_gt(p->cputime_expires.prof_exp,
-                                              nt->expires.cpu))
-                                       p->cputime_expires.prof_exp =
-                                               nt->expires.cpu;
+                               if (expires_gt(p->cputime_expires.prof_exp,
+                                              exp->cpu))
+                                       p->cputime_expires.prof_exp = exp->cpu;
                                break;
                        case CPUCLOCK_VIRT:
-                               if (cputime_eq(p->cputime_expires.virt_exp,
-                                              cputime_zero) ||
-                                   cputime_gt(p->cputime_expires.virt_exp,
-                                              nt->expires.cpu))
-                                       p->cputime_expires.virt_exp =
-                                               nt->expires.cpu;
+                               if (expires_gt(p->cputime_expires.virt_exp,
+                                              exp->cpu))
+                                       p->cputime_expires.virt_exp = exp->cpu;
                                break;
                        case CPUCLOCK_SCHED:
                                if (p->cputime_expires.sched_exp == 0 ||
-                                   p->cputime_expires.sched_exp >
-                                                       nt->expires.sched)
+                                   p->cputime_expires.sched_exp > exp->sched)
                                        p->cputime_expires.sched_exp =
-                                               nt->expires.sched;
+                                                               exp->sched;
                                break;
                        }
                } else {
+                       struct signal_struct *const sig = p->signal;
+                       union cpu_time_count *exp = &timer->it.cpu.expires;
+
                        /*
                         * For a process timer, set the cached expiration time.
                         */
@@ -621,30 +631,23 @@ static void arm_timer(struct k_itimer *timer, union cpu_time_count now)
                        default:
                                BUG();
                        case CPUCLOCK_VIRT:
-                               if (!cputime_eq(p->signal->it_virt_expires,
-                                               cputime_zero) &&
-                                   cputime_lt(p->signal->it_virt_expires,
-                                              timer->it.cpu.expires.cpu))
+                               if (expires_le(sig->it[CPUCLOCK_VIRT].expires,
+                                              exp->cpu))
                                        break;
-                               p->signal->cputime_expires.virt_exp =
-                                       timer->it.cpu.expires.cpu;
+                               sig->cputime_expires.virt_exp = exp->cpu;
                                break;
                        case CPUCLOCK_PROF:
-                               if (!cputime_eq(p->signal->it_prof_expires,
-                                               cputime_zero) &&
-                                   cputime_lt(p->signal->it_prof_expires,
-                                              timer->it.cpu.expires.cpu))
+                               if (expires_le(sig->it[CPUCLOCK_PROF].expires,
+                                              exp->cpu))
                                        break;
-                               i = p->signal->rlim[RLIMIT_CPU].rlim_cur;
+                               i = sig->rlim[RLIMIT_CPU].rlim_cur;
                                if (i != RLIM_INFINITY &&
-                                   i <= cputime_to_secs(timer->it.cpu.expires.cpu))
+                                   i <= cputime_to_secs(exp->cpu))
                                        break;
-                               p->signal->cputime_expires.prof_exp =
-                                       timer->it.cpu.expires.cpu;
+                               sig->cputime_expires.prof_exp = exp->cpu;
                                break;
                        case CPUCLOCK_SCHED:
-                               p->signal->cputime_expires.sched_exp =
-                                       timer->it.cpu.expires.sched;
+                               sig->cputime_expires.sched_exp = exp->sched;
                                break;
                        }
                }
@@ -1071,6 +1074,40 @@ static void stop_process_timers(struct task_struct *tsk)
        spin_unlock_irqrestore(&cputimer->lock, flags);
 }
 
+static u32 onecputick;
+
+static void check_cpu_itimer(struct task_struct *tsk, struct cpu_itimer *it,
+                            cputime_t *expires, cputime_t cur_time, int signo)
+{
+       if (cputime_eq(it->expires, cputime_zero))
+               return;
+
+       if (cputime_ge(cur_time, it->expires)) {
+               if (!cputime_eq(it->incr, cputime_zero)) {
+                       it->expires = cputime_add(it->expires, it->incr);
+                       it->error += it->incr_error;
+                       if (it->error >= onecputick) {
+                               it->expires = cputime_sub(it->expires,
+                                                         cputime_one_jiffy);
+                               it->error -= onecputick;
+                       }
+               } else {
+                       it->expires = cputime_zero;
+               }
+
+               trace_itimer_expire(signo == SIGPROF ?
+                                   ITIMER_PROF : ITIMER_VIRTUAL,
+                                   tsk->signal->leader_pid, cur_time);
+               __group_send_sig_info(signo, SEND_SIG_PRIV, tsk);
+       }
+
+       if (!cputime_eq(it->expires, cputime_zero) &&
+           (cputime_eq(*expires, cputime_zero) ||
+            cputime_lt(it->expires, *expires))) {
+               *expires = it->expires;
+       }
+}
+
 /*
  * Check for any per-thread CPU timers that have fired and move them
  * off the tsk->*_timers list onto the firing list.  Per-thread timers
@@ -1090,10 +1127,10 @@ static void check_process_timers(struct task_struct *tsk,
         * Don't sample the current process CPU clocks if there are no timers.
         */
        if (list_empty(&timers[CPUCLOCK_PROF]) &&
-           cputime_eq(sig->it_prof_expires, cputime_zero) &&
+           cputime_eq(sig->it[CPUCLOCK_PROF].expires, cputime_zero) &&
            sig->rlim[RLIMIT_CPU].rlim_cur == RLIM_INFINITY &&
            list_empty(&timers[CPUCLOCK_VIRT]) &&
-           cputime_eq(sig->it_virt_expires, cputime_zero) &&
+           cputime_eq(sig->it[CPUCLOCK_VIRT].expires, cputime_zero) &&
            list_empty(&timers[CPUCLOCK_SCHED])) {
                stop_process_timers(tsk);
                return;
@@ -1153,38 +1190,11 @@ static void check_process_timers(struct task_struct *tsk,
        /*
         * Check for the special case process timers.
         */
-       if (!cputime_eq(sig->it_prof_expires, cputime_zero)) {
-               if (cputime_ge(ptime, sig->it_prof_expires)) {
-                       /* ITIMER_PROF fires and reloads.  */
-                       sig->it_prof_expires = sig->it_prof_incr;
-                       if (!cputime_eq(sig->it_prof_expires, cputime_zero)) {
-                               sig->it_prof_expires = cputime_add(
-                                       sig->it_prof_expires, ptime);
-                       }
-                       __group_send_sig_info(SIGPROF, SEND_SIG_PRIV, tsk);
-               }
-               if (!cputime_eq(sig->it_prof_expires, cputime_zero) &&
-                   (cputime_eq(prof_expires, cputime_zero) ||
-                    cputime_lt(sig->it_prof_expires, prof_expires))) {
-                       prof_expires = sig->it_prof_expires;
-               }
-       }
-       if (!cputime_eq(sig->it_virt_expires, cputime_zero)) {
-               if (cputime_ge(utime, sig->it_virt_expires)) {
-                       /* ITIMER_VIRTUAL fires and reloads.  */
-                       sig->it_virt_expires = sig->it_virt_incr;
-                       if (!cputime_eq(sig->it_virt_expires, cputime_zero)) {
-                               sig->it_virt_expires = cputime_add(
-                                       sig->it_virt_expires, utime);
-                       }
-                       __group_send_sig_info(SIGVTALRM, SEND_SIG_PRIV, tsk);
-               }
-               if (!cputime_eq(sig->it_virt_expires, cputime_zero) &&
-                   (cputime_eq(virt_expires, cputime_zero) ||
-                    cputime_lt(sig->it_virt_expires, virt_expires))) {
-                       virt_expires = sig->it_virt_expires;
-               }
-       }
+       check_cpu_itimer(tsk, &sig->it[CPUCLOCK_PROF], &prof_expires, ptime,
+                        SIGPROF);
+       check_cpu_itimer(tsk, &sig->it[CPUCLOCK_VIRT], &virt_expires, utime,
+                        SIGVTALRM);
+
        if (sig->rlim[RLIMIT_CPU].rlim_cur != RLIM_INFINITY) {
                unsigned long psecs = cputime_to_secs(ptime);
                cputime_t x;
@@ -1457,7 +1467,7 @@ void set_process_cpu_timer(struct task_struct *tsk, unsigned int clock_idx,
                if (!cputime_eq(*oldval, cputime_zero)) {
                        if (cputime_le(*oldval, now.cpu)) {
                                /* Just about to fire. */
-                               *oldval = jiffies_to_cputime(1);
+                               *oldval = cputime_one_jiffy;
                        } else {
                                *oldval = cputime_sub(*oldval, now.cpu);
                        }
@@ -1703,10 +1713,15 @@ static __init int init_posix_cpu_timers(void)
                .nsleep = thread_cpu_nsleep,
                .nsleep_restart = thread_cpu_nsleep_restart,
        };
+       struct timespec ts;
 
        register_posix_clock(CLOCK_PROCESS_CPUTIME_ID, &process);
        register_posix_clock(CLOCK_THREAD_CPUTIME_ID, &thread);
 
+       cputime_to_timespec(cputime_one_jiffy, &ts);
+       onecputick = ts.tv_nsec;
+       WARN_ON(ts.tv_sec != 0);
+
        return 0;
 }
 __initcall(init_posix_cpu_timers);
index da2072d7381160493d540a51976f45a966b265fb..cc2e55373b68cc3f32e83fbf036200c30a14f343 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 97955b0e44f453969c8652b49d06d6d861aa62b6..36cb168e4330936a9120691fd19e80ddb8d2db9d 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 602033acd6c76e1f7ba06de0f053ff4ea4c28f77..f38b07f78a4e864da8fb2c7bcc5a0641bd04e7b5 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 78b087221c156640f901b8eb59a9ad716155bc7b..fb11a58b95948a08c57ec46033f538d974a480dd 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 91843ba7f2372a8633f753391283fe43c2e04cbe..2f76e06bea583d28e95d0466f35eb41d569b4986 100644 (file)
@@ -2904,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;
@@ -5079,17 +5092,16 @@ void account_idle_time(cputime_t cputime)
  */
 void account_process_tick(struct task_struct *p, int user_tick)
 {
-       cputime_t one_jiffy = jiffies_to_cputime(1);
-       cputime_t one_jiffy_scaled = cputime_to_scaled(one_jiffy);
+       cputime_t one_jiffy_scaled = cputime_to_scaled(cputime_one_jiffy);
        struct rq *rq = this_rq();
 
        if (user_tick)
-               account_user_time(p, one_jiffy, one_jiffy_scaled);
+               account_user_time(p, cputime_one_jiffy, one_jiffy_scaled);
        else if ((p != rq->idle) || (irq_count() != HARDIRQ_OFFSET))
-               account_system_time(p, HARDIRQ_OFFSET, one_jiffy,
+               account_system_time(p, HARDIRQ_OFFSET, cputime_one_jiffy,
                                    one_jiffy_scaled);
        else
-               account_idle_time(one_jiffy);
+               account_idle_time(cputime_one_jiffy);
 }
 
 /*
index 8e218500ab14b7ff0a91810b5bc34abbd64e2a7b..fd47a256a24e4e95005203ebe117a4e47fd9b44c 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 ea5c3bcac8812281d8b8809e30fffac951ecb9b0..ebcb15611728c510ef59312e3a0cd398757e0b8f 100644 (file)
@@ -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)
index 6ba49c7cb128ed92bf630dde9ee713282a2dce4b..0dfaa47d7cb6d0ec2ebde15695cc7e4a99fffcea 100644 (file)
@@ -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,
index 811e5c391456f1cbad8ede83257a5006f23aa740..5db5a8d2681168cfcf9c571d2da69629245c92ba 100644 (file)
@@ -46,6 +46,9 @@
 #include <asm/timex.h>
 #include <asm/io.h>
 
+#define CREATE_TRACE_POINTS
+#include <trace/events/timer.h>
+
 u64 jiffies_64 __cacheline_aligned_in_smp = INITIAL_JIFFIES;
 
 EXPORT_SYMBOL(jiffies_64);
@@ -521,6 +524,25 @@ static inline void debug_timer_activate(struct timer_list *timer) { }
 static inline void debug_timer_deactivate(struct timer_list *timer) { }
 #endif
 
+static inline void debug_init(struct timer_list *timer)
+{
+       debug_timer_init(timer);
+       trace_timer_init(timer);
+}
+
+static inline void
+debug_activate(struct timer_list *timer, unsigned long expires)
+{
+       debug_timer_activate(timer);
+       trace_timer_start(timer, expires);
+}
+
+static inline void debug_deactivate(struct timer_list *timer)
+{
+       debug_timer_deactivate(timer);
+       trace_timer_cancel(timer);
+}
+
 static void __init_timer(struct timer_list *timer,
                         const char *name,
                         struct lock_class_key *key)
@@ -549,7 +571,7 @@ void init_timer_key(struct timer_list *timer,
                    const char *name,
                    struct lock_class_key *key)
 {
-       debug_timer_init(timer);
+       debug_init(timer);
        __init_timer(timer, name, key);
 }
 EXPORT_SYMBOL(init_timer_key);
@@ -568,7 +590,7 @@ static inline void detach_timer(struct timer_list *timer,
 {
        struct list_head *entry = &timer->entry;
 
-       debug_timer_deactivate(timer);
+       debug_deactivate(timer);
 
        __list_del(entry->prev, entry->next);
        if (clear_pending)
@@ -632,7 +654,7 @@ __mod_timer(struct timer_list *timer, unsigned long expires,
                        goto out_unlock;
        }
 
-       debug_timer_activate(timer);
+       debug_activate(timer, expires);
 
        new_base = __get_cpu_var(tvec_bases);
 
@@ -787,7 +809,7 @@ void add_timer_on(struct timer_list *timer, int cpu)
        BUG_ON(timer_pending(timer) || !timer->function);
        spin_lock_irqsave(&base->lock, flags);
        timer_set_base(timer, base);
-       debug_timer_activate(timer);
+       debug_activate(timer, timer->expires);
        if (time_before(timer->expires, base->next_timer) &&
            !tbase_get_deferrable(timer->base))
                base->next_timer = timer->expires;
@@ -1000,7 +1022,9 @@ static inline void __run_timers(struct tvec_base *base)
                                 */
                                lock_map_acquire(&lockdep_map);
 
+                               trace_timer_expire_entry(timer);
                                fn(data);
+                               trace_timer_expire_exit(timer);
 
                                lock_map_release(&lockdep_map);
 
index e71634604400c6dd5bb9f7e0a019143ae9c7cc32..b416512ad17ff77eea13b6b391d907f32f76143b 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 c71e91bf7372499efc0dec2a6ede46f9aa492d0a..23df7771c937acfab46e4f695950a69f35fbe44b 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,
@@ -2459,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,
index a35925d222baa5b8b31f54c86327e605552c1ec9..6c0f6a8a22ebd5eafce5adf55423d4302734cd18 100644 (file)
@@ -1949,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,
@@ -2163,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,
index ca7d7c4d0c2aef41b74585996001d993ff4505e2..23b63859130e3e4084911ec07842c65c456331a9 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;
 }
index 9489a0a9b1be69ed21234d9211df1f05a9857ec5..cc89be5bc0f8ef3d8776ed0da0cf021cf6a35003 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 603c81b66549a013dac18294c41777c52c1b2003..846e039a86b4b4b39c1daa55b19d7bbd6a752682 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 7baed2fc3bc82920f97183c6fa70532250d165b4..66eef2e4483ea50caaecd2afd1e8ca652e5e28d0 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 d320c1816a7bfb3719b82e3b6da4531b473cb94c..73a14b8c6d1f860796ebe7982ff0a7ca1d6c2081 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 c3e4a2baf835abe630929b6138de0a9130a08110..46a31e5f49c3ef44ad5e7d2ecd557476b7f466f1 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 3aa519f52e18141e48cdf18db2c76e708df13dae..71eb0b4cce8dbc425aa476d54f2048e5679c7dea 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 aa99fd1f7109f03ef24085dd2ab37e5eb7c72534..af7cfb43d2f0526019b86fa35a75202aae222d1c 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 ea4b18bd396080acf19beb1cfcada5b3aa4fcc25..88193d73cd1a30dd623e94eb9b5bed0c96cf08e0 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 dd51c68e2b868adbb403b5967c4e7c6be357e722..bcc7372aebbc4375d0763e4f3acd8d096bcb612d 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 b16d636347771016cf8433ccc4a3807bec8ede4e..815dbd4a6dcb919f28d4331aceae088b8e5f62d7 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 f290c4db528b0e38afb243e498e8891007788545..22ec8d2b0fb8d641dabc76090b9062e9a5c557be 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 76eb4193acddb2e739b1e42a0a8371b59464f39f..d9ae2067952e5d2b5d09b260bc443d1ba0899d6a 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 fd4529d86de59cbfc7093a433752e9b9b604dc93..9b10d8753784c5e9fbbe33239a277a514fe99c67 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 e8f63d9961ea58f5c9643c111859911bc91dc675..b1443ac07c00a4f1a46de6bb260d00e8f52f99db 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 e4412a676c88494ec313ebb3e974d2d71ee5c525..821dee596377fadcd93e2116e117eea0a0340e97 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 32e75d4005032620e8f9cb9161a8c66f025470bb..1a3bc3d4d5543d5192848bedda8162933f07ada0 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 939888f9ddab21ecabdc2f732a8ee604cb56da13..16052e80aaacbc182c9ea421bb7f84b02fc3a5b4 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 45eb650b9654ed09bebe3b4de3c203442538792d..bd6f0e466f6c4f1c51b4bbbe1e605140bb3e6493 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 376492ed08f4a66cbc782171cc0924adb1287018..21d4029a07b31799d0a606b05b970eb2f27a6206 100644 (file)
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -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);
 
@@ -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);
 
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 5f4ef0250beea45533c0f8a316960b1f94b67825..7e33f2cb3c774ee960630032c4797c872f598ba8 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 a39b7b91be46722789a0ce95ed5382405796077c..20a07dba6be04fb20f21bbac5ed1e289a8ccd354 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 66e81e7e9fe98f6871cb0d159e13c6942ff8e44f..8d484241d0345e71750b71b36d37bfa7f21bdd06 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 a7b2460e922b779252ebcc225cecaf6060b0e964..ea2147dabba60febfb381b8fb788c9a0cbf9ed30 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 d1ba464410536570c899d6b5893c2fe5685e0afa..5f378dd588027c227dc95551e27e4b6431e5df60 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);
index a0de15f46987f65249bd60d4cad45e129fbddf29..5717f27a0704b18637221c0bd9dcd820c7bc17c3 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 f22b4ebbd8dc7a94680844ce214c5ff2fd2c1467..3d535d59482668012bd67c21b18cb59a909e1007 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 0895b5c7cbff35fc2e5eb8dbe4b2ee8eeacf27da..720fc03a7bc454de75fa86f542770ab9b9660788 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 bd20f8bb02aa7ac7d7dea5d581075309425d040c..b206a7a32e2a4e00bc7446ae839407f656031643 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 7b5d4deacfcd96f79460e3e91d159f22b47dec5f..7dfa481c96bade62ae4ba34299dcd4fb8d79cdb3 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 0a216aae227e8b3ca7daa5ab8140a2a804784181..4996fc7195528ba931dda8c042da44b2501b083e 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 a13ea6401ae7428d967d15a3c5a0cf5472ee2240..d9714bdcb4a387199a5875d9745999942a3aa4f8 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 da432d9f0ae825eb4e050ed8168c1600c6a793da..6ce4aab69e9974aea1838092efc26601ea7598b4 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 cb29ae5d33abfce703991cbfebd7bc1956752942..308e57d8d7ed9e256eb26be6b5478da06aac5d7f 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 5ae6b8b78c801d821d41003917b720116c938bd0..6d1daeb1cb4a3dfbcf522919312a67f861085b74 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 74f1102e8749a8b207aab5ae78fa4000ab0c5ca9..f1bf19daadc67143b099518c1bc29aa52ae04227 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 204b8243d8abb11cb9abd2f37dd8864ad0a346aa..69511e663234482228909f373e247d21082e6ada 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 ba8228e0a80635e01d497fc89328eec9528fe9be..613e89f471d92c2710be84e9e0fdcf17b0976d0b 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 138bed53706ed325e2d4aac3ae0065cffccdda47..c81321f9feec1cb28eee1b7e07237017336b89d0 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 9bf0b737aa517fde7bee51821be494e743a67cce..b2e07f0dd29844f046fef7acad2e6e1824d33d8b 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 09bedeb5579c6ecf5ba37488082f8e6c628641f7..49d8495d69be04bf2948e5467d6115eb0f7aa192 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 30d5446512f9de5d6fdc3e9400cebd728d3f13e5..524712a7b154c4627df17c1a6655eb941711cce4 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 923db06c7e55e2851a84000799e5d3ec23dafe92..bc4467082a00830f98fdd0c3f0c6b4738a4c0590 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 9383d3e5a1abb2d8916704c6f7e6a0a4fed0a32f..57662cabaf9b8e9a48011ff1138eacb736fcf45c 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 91867d3e632824c2da1f21718001198ced5a3da0..df9347314538bd353431afde7a4ca49ee48b5e2a 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 19a0612b8a207c3d92aba38e25ce8f01c5e73f72..21387ebabf00e491f428c11131a467c61c9150b9 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 3907510c2ce3e17f21fa9b2d5f151d18edb28f6e..090675e269ee7b62ffea095dd4c728de61853ab4 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 b37109817a988034272285e868036ddc188dbe84..7c9ec3dee96e3d17687087d6baf0fd2e594ccfe2 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 a6ac83a933483e719c338821ee9ef087fdd9e99b..f01955cce3147942545f89e618b6cf1be2b3aa28 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 219dcdbe388cb08db07824ab53fe4c02089e5685..dd16e404424fe7610449e8d95c1c809aada1af3f 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 c5aab6a368ce250badd33ab0d30e858292f91521..55180b99562a7bec3788a99906f2c0fd480fbfca 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 d9231245a79aba9b3331d2a81b6bfd90820d7fd9..bc0019f704fecb433b369798a064aaf7230a6a6c 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 375d64cb1a3df4a40452b889bcefea017f9e0b02..2c5c76be18f864e855bebb9020ad007aa8b9449a 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 c557f1fb1c66ac79647ff91cf80f72c59e0baf05..612dc878e05c9aaab9970d322e5ba2798f91bd6a 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 2a022c00d85c509e2346a8afac33eaa63154439a..49917a1cac7d921f6fae418bb89a19a4e9e02a1f 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 0c431c277af5be352e3c65b9fa4de99e25086e9b..54a4e042f10451cff4908d38e23dd362f08819fe 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 4028502f052858b1d66af4b31c17d641c16fac0b..bf88bf8e9365a0746eda3d0153135280b759bd3e 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 2e6a148d277c362fae87da7e5edb48eeea301712..f6c51e562a02d38406750bcc5db1c64d0399ac94 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 45cdaff9b361c17272872294c0dfc96962ce9cca..d6eee291a0e2bbe2b26e98283a346611e568b172 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 fac0ca93f06be9e4d7a8a10405726d3e61337d47..a417d5ab5dd753432ecf403646356a86d4fa50f5 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 7f676bdf70d3c1a44011bf33ea2e7f80930e90ab..858a443f418fcf108070736b179eb87a19a38417 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 8f459abe97cff614525775560ec355f9d4c69246..cef74ba0666c2c7cab9a755a29c8ce5985a5dde7 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 5d9dd742264ba3facff28e8fdf3496d2aa24df81..90c292e2738b5f7248db0f267aa63c1b88f7d8b2 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 27d44332f0175968c0729646ae4641321104bbd6..df124f78ee489762f4a9028af3b95f38a90f34d3 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 6caffa34ac016382a2e762af4332e62a4ee37b2e..117f68a8aa40c2d220b0dbd0ab3fda6ed6a6d523 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 23128ee191ae707973345e3438ccf9e055009bed..ccc5e83cae5d25cf592237025167d6d1b9d9c7bd 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 f412a852bc73d7f1eb59af470e2b87d25ca9fa58..fd46d42afa89ed89e6fe2813822f7570e6683160 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 5151f9f6c5731b168dc22ac63657fd84fed8866c..0cf5e8c27a105f399c02e94789227344f5d98934 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 62438f3a914d6cb9c6f8c47b89a6cd5e026dd933..bee41546575471cb85d036efbbed1e87e9370638 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 429dd06a4ecce51772e9d1f24ca7f6ca725fcc36..561a45cf2a6af562784113cedfd0952108895f9e 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 72c15205bb2b2b114578f3e33490a0838fd7c47c..8ab44861168087b01e3d3a643704e3ba6efe1129 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 2d5ece798c4c6e786b3e6ee305e9830e490d75e9..87bbb8bce9bfe3702a3e6b896dce4338bf4f6d2d 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 e0c6891a9ad4f5b35c7bb96b381a171f32887d99..263a44d57fa95dea88411e7df0527eb1528cb474 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 3a8297b5184cb1e1443c659905fdc41d9346902b..af6b8363a2d51ffd1a0d2b61f40f10927e78cbce 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 278a45bd45a5ea705b3d5bdb36e72a52b41ac08c..cdb44b63342e7acfac2229fe0ee75997173a1066 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 64343cc084b41f2f9f813742c381717e41ab77ac..86c3896a1e01862b222adeaac4e33bc9b8a01aad 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 40e0045876ee4fa954039dc1bed7c88a1db1d5d2..62a9025cdcc78c0640c2457f4735e0d782f815c6 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 4522948a012e0fb1d772949679a8c2a9af529345..801a16a1754532cee8f647ef178772209973120d 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 aadc5223dcdb015565910ed0a30f4d009e1efb27..ecf9c7dc18259358d10ba9ff1c1cf91d9664a63f 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 ca757d486187a8b025d138eb6901bc10ee4a45e3..b4ced8562587b088f698058fb0fa185410f9987d 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;
 
index 6bfc7eaebfdabb88d7fbc9c5c61d7089d2c83f23..8e9777b764052a1088d38fc3385c4dd1dfb25107 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 acae7ef4092dd02872b54d7861ad233f8a74978e..c33b6bb9b6dd018de224c46c11c76aad314a44c9 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 f83a809807263beacdb756adae4696b6cda33309..aeead7585093a301c20826b9f316776fc295f4ce 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 59e5fbe6af51eeb2edf002adff4761ea07387ba7..561d6d95a2d33fef48b98ccfc29c32571cb9dddd 100644 (file)
@@ -1387,11 +1387,6 @@ static struct action_ops snd_pcm_action_drain_init = {
        .post_action = snd_pcm_post_drain_init
 };
 
-struct drain_rec {
-       struct snd_pcm_substream *substream;
-       wait_queue_t wait;
-};
-
 static int snd_pcm_drop(struct snd_pcm_substream *substream);
 
 /*
@@ -1407,10 +1402,9 @@ static int snd_pcm_drain(struct snd_pcm_substream *substream,
        struct snd_card *card;
        struct snd_pcm_runtime *runtime;
        struct snd_pcm_substream *s;
+       wait_queue_t wait;
        int result = 0;
-       int i, num_drecs;
        int nonblock = 0;
-       struct drain_rec *drec, drec_tmp, *d;
 
        card = substream->pcm->card;
        runtime = substream->runtime;
@@ -1433,38 +1427,10 @@ static int snd_pcm_drain(struct snd_pcm_substream *substream,
        } else if (substream->f_flags & O_NONBLOCK)
                nonblock = 1;
 
-       if (nonblock)
-               goto lock; /* no need to allocate waitqueues */
-
-       /* allocate temporary record for drain sync */
        down_read(&snd_pcm_link_rwsem);
-       if (snd_pcm_stream_linked(substream)) {
-               drec = kmalloc(substream->group->count * sizeof(*drec), GFP_KERNEL);
-               if (! drec) {
-                       up_read(&snd_pcm_link_rwsem);
-                       snd_power_unlock(card);
-                       return -ENOMEM;
-               }
-       } else
-               drec = &drec_tmp;
-
-       /* count only playback streams */
-       num_drecs = 0;
-       snd_pcm_group_for_each_entry(s, substream) {
-               runtime = s->runtime;
-               if (s->stream == SNDRV_PCM_STREAM_PLAYBACK) {
-                       d = &drec[num_drecs++];
-                       d->substream = s;
-                       init_waitqueue_entry(&d->wait, current);
-                       add_wait_queue(&runtime->sleep, &d->wait);
-               }
-       }
-       up_read(&snd_pcm_link_rwsem);
-
- lock:
        snd_pcm_stream_lock_irq(substream);
        /* resume pause */
-       if (substream->runtime->status->state == SNDRV_PCM_STATE_PAUSED)
+       if (runtime->status->state == SNDRV_PCM_STATE_PAUSED)
                snd_pcm_pause(substream, 0);
 
        /* pre-start/stop - all running streams are changed to DRAINING state */
@@ -1479,25 +1445,35 @@ static int snd_pcm_drain(struct snd_pcm_substream *substream,
 
        for (;;) {
                long tout;
+               struct snd_pcm_runtime *to_check;
                if (signal_pending(current)) {
                        result = -ERESTARTSYS;
                        break;
                }
-               /* all finished? */
-               for (i = 0; i < num_drecs; i++) {
-                       runtime = drec[i].substream->runtime;
-                       if (runtime->status->state == SNDRV_PCM_STATE_DRAINING)
+               /* find a substream to drain */
+               to_check = NULL;
+               snd_pcm_group_for_each_entry(s, substream) {
+                       if (s->stream != SNDRV_PCM_STREAM_PLAYBACK)
+                               continue;
+                       runtime = s->runtime;
+                       if (runtime->status->state == SNDRV_PCM_STATE_DRAINING) {
+                               to_check = runtime;
                                break;
+                       }
                }
-               if (i == num_drecs)
-                       break; /* yes, all drained */
-
+               if (!to_check)
+                       break; /* all drained */
+               init_waitqueue_entry(&wait, current);
+               add_wait_queue(&to_check->sleep, &wait);
                set_current_state(TASK_INTERRUPTIBLE);
                snd_pcm_stream_unlock_irq(substream);
+               up_read(&snd_pcm_link_rwsem);
                snd_power_unlock(card);
                tout = schedule_timeout(10 * HZ);
                snd_power_lock(card);
+               down_read(&snd_pcm_link_rwsem);
                snd_pcm_stream_lock_irq(substream);
+               remove_wait_queue(&to_check->sleep, &wait);
                if (tout == 0) {
                        if (substream->runtime->status->state == SNDRV_PCM_STATE_SUSPENDED)
                                result = -ESTRPIPE;
@@ -1512,16 +1488,7 @@ static int snd_pcm_drain(struct snd_pcm_substream *substream,
 
  unlock:
        snd_pcm_stream_unlock_irq(substream);
-
-       if (!nonblock) {
-               for (i = 0; i < num_drecs; i++) {
-                       d = &drec[i];
-                       runtime = d->substream->runtime;
-                       remove_wait_queue(&runtime->sleep, &d->wait);
-               }
-               if (drec != &drec_tmp)
-                       kfree(drec);
-       }
+       up_read(&snd_pcm_link_rwsem);
        snd_power_unlock(card);
 
        return result;
index 1edab7b4ea83b26a41311671983d65625d0edb33..3136c88eacdfae03e84ab28e9c86d5d26996aa8a 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 107534477a2f4937fd0a308be70d9f10fb46016b..8db6aefe15e4043224a788c2d9bc314e1c2055a9 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 012c010c8c89540e421440e7d988f2880bbd7a30..51afc048961d9855c39e321e523f9f526bd8acd3 100644 (file)
@@ -86,7 +86,6 @@ struct lx6464es {
 
        /* messaging */
        spinlock_t              msg_lock;          /* message spinlock */
-       atomic_t                send_message_locked;
        struct lx_rmh           rmh;
 
        /* configuration */
@@ -95,7 +94,6 @@ struct lx6464es {
        uint                    hardware_running[2];
        u32                     board_sample_rate; /* sample rate read from
                                                    * board */
-       u32                     sample_rate;       /* our sample rate */
        u16                     pcm_granularity;   /* board blocksize */
 
        /* dma */
index 5812780d6e89c70ab193adec0bceb51c577d5137..3086b751da4a59271b497e1a8605c3664d15a2ff 100644 (file)
@@ -314,98 +314,6 @@ static inline void lx_message_dump(struct lx_rmh *rmh)
 #define XILINX_POLL_NO_SLEEP    100
 #define XILINX_POLL_ITERATIONS  150
 
-#if 0 /* not used now */
-static int lx_message_send(struct lx6464es *chip, struct lx_rmh *rmh)
-{
-       u32 reg = ED_DSP_TIMED_OUT;
-       int dwloop;
-       int answer_received;
-
-       if (lx_dsp_reg_read(chip, eReg_CSM) & (Reg_CSM_MC | Reg_CSM_MR)) {
-               snd_printk(KERN_ERR LXP "PIOSendMessage eReg_CSM %x\n", reg);
-               return -EBUSY;
-       }
-
-       /* write command */
-       lx_dsp_reg_writebuf(chip, eReg_CRM1, rmh->cmd, rmh->cmd_len);
-
-       snd_BUG_ON(atomic_read(&chip->send_message_locked) != 0);
-       atomic_set(&chip->send_message_locked, 1);
-
-       /* MicoBlaze gogogo */
-       lx_dsp_reg_write(chip, eReg_CSM, Reg_CSM_MC);
-
-       /* wait for interrupt to answer */
-       for (dwloop = 0; dwloop != XILINX_TIMEOUT_MS; ++dwloop) {
-               answer_received = atomic_read(&chip->send_message_locked);
-               if (answer_received == 0)
-                       break;
-               msleep(1);
-       }
-
-       if (answer_received == 0) {
-               /* in Debug mode verify Reg_CSM_MR */
-               snd_BUG_ON(!(lx_dsp_reg_read(chip, eReg_CSM) & Reg_CSM_MR));
-
-               /* command finished, read status */
-               if (rmh->dsp_stat == 0)
-                       reg = lx_dsp_reg_read(chip, eReg_CRM1);
-               else
-                       reg = 0;
-       } else {
-               int i;
-               snd_printk(KERN_WARNING LXP "TIMEOUT lx_message_send! "
-                          "Interrupts disabled?\n");
-
-               /* attente bit Reg_CSM_MR */
-               for (i = 0; i != XILINX_POLL_ITERATIONS; i++) {
-                       if ((lx_dsp_reg_read(chip, eReg_CSM) & Reg_CSM_MR)) {
-                               if (rmh->dsp_stat == 0)
-                                       reg = lx_dsp_reg_read(chip, eReg_CRM1);
-                               else
-                                       reg = 0;
-                               goto polling_successful;
-                       }
-
-                       if (i > XILINX_POLL_NO_SLEEP)
-                               msleep(1);
-               }
-               snd_printk(KERN_WARNING LXP "TIMEOUT lx_message_send! "
-                          "polling failed\n");
-
-polling_successful:
-               atomic_set(&chip->send_message_locked, 0);
-       }
-
-       if ((reg & ERROR_VALUE) == 0) {
-               /* read response */
-               if (rmh->stat_len) {
-                       snd_BUG_ON(rmh->stat_len >= (REG_CRM_NUMBER-1));
-
-                       lx_dsp_reg_readbuf(chip, eReg_CRM2, rmh->stat,
-                                          rmh->stat_len);
-               }
-       } else
-               snd_printk(KERN_WARNING LXP "lx_message_send: error_value %x\n",
-                          reg);
-
-       /* clear Reg_CSM_MR */
-       lx_dsp_reg_write(chip, eReg_CSM, 0);
-
-       switch (reg) {
-       case ED_DSP_TIMED_OUT:
-               snd_printk(KERN_WARNING LXP "lx_message_send: dsp timeout\n");
-               return -ETIMEDOUT;
-
-       case ED_DSP_CRASHED:
-               snd_printk(KERN_WARNING LXP "lx_message_send: dsp crashed\n");
-               return -EAGAIN;
-       }
-
-       lx_message_dump(rmh);
-       return 0;
-}
-#endif /* not used now */
 
 static int lx_message_send_atomic(struct lx6464es *chip, struct lx_rmh *rmh)
 {
@@ -423,7 +331,7 @@ static int lx_message_send_atomic(struct lx6464es *chip, struct lx_rmh *rmh)
        /* MicoBlaze gogogo */
        lx_dsp_reg_write(chip, eReg_CSM, Reg_CSM_MC);
 
-       /* wait for interrupt to answer */
+       /* wait for device to answer */
        for (dwloop = 0; dwloop != XILINX_TIMEOUT_MS * 1000; ++dwloop) {
                if (lx_dsp_reg_read(chip, eReg_CSM) & Reg_CSM_MR) {
                        if (rmh->dsp_stat == 0)
@@ -1175,10 +1083,6 @@ static int lx_interrupt_ack(struct lx6464es *chip, u32 *r_irqsrc,
                *r_async_escmd = 1;
        }
 
-       if (irqsrc & MASK_SYS_STATUS_CMD_DONE)
-               /* xilinx command notification */
-               atomic_set(&chip->send_message_locked, 0);
-
        if (irq_async) {
                /* snd_printd("interrupt: async event pending\n"); */
                *r_async_pending = 1;
index 2758b9017a7f2bac7b9323100ff664e851dedf29..e69322978739d760e27bf47aaf61021cbf958deb 100644 (file)
@@ -277,7 +277,11 @@ static int bf5xx_ac97_resume(struct snd_soc_dai *dai)
        if (!dai->active)
                return 0;
 
+#if defined(CONFIG_SND_BF5XX_MULTICHAN_SUPPORT)
+       ret = sport_set_multichannel(sport, 16, 0x3FF, 1);
+#else
        ret = sport_set_multichannel(sport, 16, 0x1F, 1);
+#endif
        if (ret) {
                pr_err("SPORT is busy!\n");
                return -EBUSY;
@@ -334,7 +338,11 @@ static int bf5xx_ac97_probe(struct platform_device *pdev,
                goto sport_err;
        }
        /*SPORT works in TDM mode to simulate AC97 transfers*/
+#if defined(CONFIG_SND_BF5XX_MULTICHAN_SUPPORT)
+       ret = sport_set_multichannel(sport_handle, 16, 0x3FF, 1);
+#else
        ret = sport_set_multichannel(sport_handle, 16, 0x1F, 1);
+#endif
        if (ret) {
                pr_err("SPORT is busy!\n");
                ret = -EBUSY;
index 3f2a911fe0cb2adda1c45473babef9845d9280c9..a1f97dd809d63fda550f4d62cd18a5a2c1eb7bde 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * linux/sound/arm/bf5xx-ac97.h
+ * sound/soc/blackfin/bf5xx-ac97.h
  *
  * 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
index 876abade27e1bab8a0ce3612213f37067f83de1c..1e9d161c76c4ff9b74e8f34b6cb923db76378850 100644 (file)
@@ -227,7 +227,8 @@ static int bf5xx_i2s_probe(struct platform_device *pdev,
        return 0;
 }
 
-static void bf5xx_i2s_remove(struct snd_soc_dai *dai)
+static void bf5xx_i2s_remove(struct platform_device *pdev,
+                       struct snd_soc_dai *dai)
 {
        pr_debug("%s enter\n", __func__);
        peripheral_free_list(&sport_req[sport_num][0]);
@@ -236,36 +237,31 @@ static void bf5xx_i2s_remove(struct snd_soc_dai *dai)
 #ifdef CONFIG_PM
 static int bf5xx_i2s_suspend(struct snd_soc_dai *dai)
 {
-       struct sport_device *sport =
-               (struct sport_device *)dai->private_data;
 
        pr_debug("%s : sport %d\n", __func__, dai->id);
-       if (!dai->active)
-               return 0;
+
        if (dai->capture.active)
-               sport_rx_stop(sport);
+               sport_rx_stop(sport_handle);
        if (dai->playback.active)
-               sport_tx_stop(sport);
+               sport_tx_stop(sport_handle);
        return 0;
 }
 
 static int bf5xx_i2s_resume(struct snd_soc_dai *dai)
 {
        int ret;
-       struct sport_device *sport =
-               (struct sport_device *)dai->private_data;
 
        pr_debug("%s : sport %d\n", __func__, dai->id);
-       if (!dai->active)
-               return 0;
 
-       ret = sport_config_rx(sport, RFSR | RCKFE, RSFSE|0x1f, 0, 0);
+       ret = sport_config_rx(sport_handle, bf5xx_i2s.rcr1,
+                                     bf5xx_i2s.rcr2, 0, 0);
        if (ret) {
                pr_err("SPORT is busy!\n");
                return -EBUSY;
        }
 
-       ret = sport_config_tx(sport, TFSR | TCKFE, TSFSE|0x1f, 0, 0);
+       ret = sport_config_tx(sport_handle, bf5xx_i2s.tcr1,
+                                     bf5xx_i2s.tcr2, 0, 0);
        if (ret) {
                pr_err("SPORT is busy!\n");
                return -EBUSY;
index 7107d1a0b06b810c8ef700d9985486eec4ad6de3..264ecdcba35a6edcb9b4f44eacf28337f9b2f3f1 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * linux/sound/arm/bf5xx-i2s.h
+ * sound/soc/blackfin/bf5xx-i2s.h
  *
  * 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
index 469ce7fab20ca6aad3d6474d8c63deeacb3f5101..99051ff0954e6ffe6772d0ee4957ee53e4d3ebc4 100644 (file)
@@ -326,7 +326,7 @@ static inline int sport_hook_tx_dummy(struct sport_device *sport)
 
 int sport_tx_start(struct sport_device *sport)
 {
-       unsigned flags;
+       unsigned long flags;
        pr_debug("%s: tx_run:%d, rx_run:%d\n", __func__,
                        sport->tx_run, sport->rx_run);
        if (sport->tx_run)
index 01343dc984fdfaf6c517fb86e0f0afb21cd9f108..c48485f2c55db3632f2ae18f412a7ab341b13316 100644 (file)
@@ -251,8 +251,7 @@ static int __devexit ad1836_spi_remove(struct spi_device *spi)
 
 static struct spi_driver ad1836_spi_driver = {
        .driver = {
-               .name   = "ad1836-spi",
-               .bus    = &spi_bus_type,
+               .name   = "ad1836",
                .owner  = THIS_MODULE,
        },
        .probe          = ad1836_spi_probe,
index 9a049a1995a38372e2a2090cc82810af5245d59f..34b30efc3cb009977ff7cb30ab413412eda275e0 100644 (file)
@@ -456,7 +456,6 @@ static int __devexit ad1938_spi_remove(struct spi_device *spi)
 static struct spi_driver ad1938_spi_driver = {
        .driver = {
                .name   = "ad1938",
-               .bus    = &spi_bus_type,
                .owner  = THIS_MODULE,
        },
        .probe          = ad1938_spi_probe,
@@ -515,6 +514,7 @@ static int ad1938_register(struct ad1938_priv *ad1938)
        codec->num_dai = 1;
        codec->write = ad1938_write_reg;
        codec->read = ad1938_read_reg_cache;
+       codec->set_bias_level = ad1938_set_bias_level;
        INIT_LIST_HEAD(&codec->dapm_widgets);
        INIT_LIST_HEAD(&codec->dapm_paths);
 
index d80d414cfbbdc8db7a8824a69813fe9e7774bf24..5ad677ce80da46baa8789c2d3072c3205474bb2b 100644 (file)
@@ -595,6 +595,7 @@ static const struct snd_soc_dapm_route audio_map[] = {
 
        /* Mono Capture mixer-mux */
        {"Capture Right Mixer", "Stereo", "Capture Right Mux"},
+       {"Capture Left Mixer", "Stereo", "Capture Left Mux"},
        {"Capture Left Mixer", "Analogue Mix Left", "Capture Left Mux"},
        {"Capture Left Mixer", "Analogue Mix Left", "Capture Right Mux"},
        {"Capture Right Mixer", "Analogue Mix Right", "Capture Left Mux"},
index c64e55aa63b6df4cf0508e340fba43e89f97fc88..686e5aa972067106f1f88056c5d367020a0c1356 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 eca22d7829d22744d1a57f797a3740ff1d8af96d..7a06c0a86665a806e0dfbda55f3bb34b509e6f7a 100644 (file)
@@ -512,34 +512,49 @@ static int davinci_config_channel_size(struct davinci_audio_dev *dev,
                                       int channel_size)
 {
        u32 fmt = 0;
+       u32 mask, rotate;
 
        switch (channel_size) {
        case DAVINCI_AUDIO_WORD_8:
                fmt = 0x03;
+               rotate = 6;
+               mask = 0x000000ff;
                break;
 
        case DAVINCI_AUDIO_WORD_12:
                fmt = 0x05;
+               rotate = 5;
+               mask = 0x00000fff;
                break;
 
        case DAVINCI_AUDIO_WORD_16:
                fmt = 0x07;
+               rotate = 4;
+               mask = 0x0000ffff;
                break;
 
        case DAVINCI_AUDIO_WORD_20:
                fmt = 0x09;
+               rotate = 3;
+               mask = 0x000fffff;
                break;
 
        case DAVINCI_AUDIO_WORD_24:
                fmt = 0x0B;
+               rotate = 2;
+               mask = 0x00ffffff;
                break;
 
        case DAVINCI_AUDIO_WORD_28:
                fmt = 0x0D;
+               rotate = 1;
+               mask = 0x0fffffff;
                break;
 
        case DAVINCI_AUDIO_WORD_32:
                fmt = 0x0F;
+               rotate = 0;
+               mask = 0xffffffff;
                break;
 
        default:
@@ -550,6 +565,13 @@ static int davinci_config_channel_size(struct davinci_audio_dev *dev,
                                        RXSSZ(fmt), RXSSZ(0x0F));
        mcasp_mod_bits(dev->base + DAVINCI_MCASP_TXFMT_REG,
                                        TXSSZ(fmt), TXSSZ(0x0F));
+       mcasp_mod_bits(dev->base + DAVINCI_MCASP_TXFMT_REG, TXROT(rotate),
+                                                       TXROT(7));
+       mcasp_mod_bits(dev->base + DAVINCI_MCASP_RXFMT_REG, RXROT(rotate),
+                                                       RXROT(7));
+       mcasp_set_reg(dev->base + DAVINCI_MCASP_TXMASK_REG, mask);
+       mcasp_set_reg(dev->base + DAVINCI_MCASP_RXMASK_REG, mask);
+
        return 0;
 }
 
@@ -638,7 +660,6 @@ static void davinci_hw_param(struct davinci_audio_dev *dev, int stream)
                        printk(KERN_ERR "playback tdm slot %d not supported\n",
                                dev->tdm_slots);
 
-               mcasp_set_reg(dev->base + DAVINCI_MCASP_TXMASK_REG, 0xFFFFFFFF);
                mcasp_clr_bits(dev->base + DAVINCI_MCASP_TXFMCTL_REG, FSXDUR);
        } else {
                /* bit stream is MSB first with no delay */
@@ -655,7 +676,6 @@ static void davinci_hw_param(struct davinci_audio_dev *dev, int stream)
                        printk(KERN_ERR "capture tdm slot %d not supported\n",
                                dev->tdm_slots);
 
-               mcasp_set_reg(dev->base + DAVINCI_MCASP_RXMASK_REG, 0xFFFFFFFF);
                mcasp_clr_bits(dev->base + DAVINCI_MCASP_RXFMCTL_REG, FSRDUR);
        }
 }
index 5b9ed64647898c028f723138ba9789251c8416e6..d11a6d7e384abdfeab68eb47120a251f8734fe47 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 8e79a416db57b06c8f68ab8ae01f13690d9b7c3f..c215d32d6322e410d32465a8b012d54e260694f9 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 f1d3fe34176ad08926c82c75084c84dc71662e64..83b3dde1a83b74a5f1e75cb2d98a44787e33bca2 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"