remove generic linux 2.4 support
authorFelix Fietkau <nbd@openwrt.org>
Sat, 26 Jun 2010 20:42:18 +0000 (20:42 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Sat, 26 Jun 2010 20:42:18 +0000 (20:42 +0000)
SVN-Revision: 21948

254 files changed:
target/linux/generic-2.4/config-default [deleted file]
target/linux/generic-2.4/files/crypto/ocf/Config.in [deleted file]
target/linux/generic-2.4/files/crypto/ocf/Kconfig [deleted file]
target/linux/generic-2.4/files/crypto/ocf/Makefile [deleted file]
target/linux/generic-2.4/files/crypto/ocf/README [deleted file]
target/linux/generic-2.4/files/crypto/ocf/c7108/Makefile [deleted file]
target/linux/generic-2.4/files/crypto/ocf/c7108/aes-7108.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/c7108/aes-7108.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/criov.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/crypto.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/cryptocteon/Makefile [deleted file]
target/linux/generic-2.4/files/crypto/ocf/cryptocteon/cavium_crypto.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/cryptocteon/cryptocteon.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/cryptodev.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/cryptodev.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/cryptosoft.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/ep80579/Makefile [deleted file]
target/linux/generic-2.4/files/crypto/ocf/ep80579/icp_asym.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/ep80579/icp_common.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/ep80579/icp_ocf.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/ep80579/icp_sym.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/hifn/Makefile [deleted file]
target/linux/generic-2.4/files/crypto/ocf/hifn/hifn7751.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/hifn/hifn7751reg.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/hifn/hifn7751var.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/hifn/hifnHIPP.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/hifn/hifnHIPPreg.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/hifn/hifnHIPPvar.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/ixp4xx/Makefile [deleted file]
target/linux/generic-2.4/files/crypto/ocf/ixp4xx/ixp4xx.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/Makefile [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/cesa/AES/mvAes.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/cesa/AES/mvAesAlg.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/cesa/AES/mvAesAlg.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/cesa/AES/mvAesApi.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/cesa/mvCesa.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/cesa/mvCesa.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/cesa/mvCesaDebug.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/cesa/mvCesaRegs.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/cesa/mvCesaTest.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/cesa/mvLru.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/cesa/mvLru.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/cesa/mvMD5.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/cesa/mvMD5.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/cesa/mvSHA1.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/cesa/mvSHA1.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/cesa_ocf_drv.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/common/mv802_3.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/common/mvCommon.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/common/mvCommon.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/common/mvDebug.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/common/mvDebug.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/common/mvDeviceId.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/common/mvHalVer.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/common/mvStack.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/common/mvStack.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/common/mvTypes.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/dbg-trace.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/dbg-trace.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/kw_family/boardEnv/mvBoardEnvLib.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/kw_family/boardEnv/mvBoardEnvLib.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/kw_family/boardEnv/mvBoardEnvSpec.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/kw_family/boardEnv/mvBoardEnvSpec.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/kw_family/cpu/mvCpu.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/kw_family/cpu/mvCpu.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvAddrDec.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvAddrDec.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvAsm.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvLib.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvLib.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvRegs.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvSpec.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvAhbToMbus.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvAhbToMbus.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvAhbToMbusRegs.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvCpuIf.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvCpuIf.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvCpuIfRegs.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysAudio.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysAudio.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysCesa.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysCesa.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysDram.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysDram.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysGbe.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysGbe.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysPex.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysPex.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysSata.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysSata.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysSdmmc.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysSdmmc.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysTdm.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysTdm.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysTs.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysTs.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysUsb.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysUsb.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysXor.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysXor.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/kw_family/device/mvDevice.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/kw_family/device/mvDevice.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/kw_family/device/mvDeviceRegs.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/linux_oss/mvOs.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/linux_oss/mvOs.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/linux_oss/mvOsSata.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mvSysHwConfig.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/cntmr/mvCntmr.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/cntmr/mvCntmr.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/cntmr/mvCntmrRegs.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/cpu/mvCpuCntrs.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/cpu/mvCpuCntrs.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/cpu/mvCpuL2Cntrs.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/cpu/mvCpuL2Cntrs.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDram.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDram.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDramIf.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDramIf.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDramIfConfig.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDramIfRegs.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIf.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIf.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIfConfig.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIfRegs.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIfStaticInit.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/spd/mvSpd.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/spd/mvSpd.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/gbe/mvEth.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/gbe/mvEthDebug.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/gbe/mvEthDebug.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/gbe/mvEthGbe.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/gbe/mvEthRegs.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/mvEth.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/gpp/mvGpp.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/gpp/mvGpp.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/gpp/mvGppRegs.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci-if/mvPciIf.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci-if/mvPciIf.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci-if/mvPciIfRegs.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci-if/pci_util/mvPciUtils.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci-if/pci_util/mvPciUtils.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci/mvPci.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci/mvPci.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci/mvPciRegs.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/pex/mvPex.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/pex/mvPex.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/pex/mvPexRegs.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/pex/mvVrtBrgPex.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/pex/mvVrtBrgPex.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/sflash/mvSFlash.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/sflash/mvSFlash.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/sflash/mvSFlashSpec.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/spi/mvSpi.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/spi/mvSpi.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/spi/mvSpiCmnd.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/spi/mvSpiCmnd.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/spi/mvSpiSpec.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/twsi/mvTwsi.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/twsi/mvTwsi.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/kirkwood/mvHal/mv_hal/twsi/mvTwsiSpec.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/ocf-bench.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/ocf-compat.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/ocfnull/Makefile [deleted file]
target/linux/generic-2.4/files/crypto/ocf/ocfnull/ocfnull.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/pasemi/Makefile [deleted file]
target/linux/generic-2.4/files/crypto/ocf/pasemi/pasemi.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/pasemi/pasemi_fnu.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/random.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/rndtest.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/rndtest.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/safe/Makefile [deleted file]
target/linux/generic-2.4/files/crypto/ocf/safe/md5.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/safe/md5.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/safe/safe.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/safe/safereg.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/safe/safevar.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/safe/sha1.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/safe/sha1.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/talitos/Makefile [deleted file]
target/linux/generic-2.4/files/crypto/ocf/talitos/talitos.c [deleted file]
target/linux/generic-2.4/files/crypto/ocf/talitos/talitos_dev.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/talitos/talitos_soft.h [deleted file]
target/linux/generic-2.4/files/crypto/ocf/uio.h [deleted file]
target/linux/generic-2.4/image [deleted symlink]
target/linux/generic-2.4/patches/000-linux_mips.patch [deleted file]
target/linux/generic-2.4/patches/001-squashfs.patch [deleted file]
target/linux/generic-2.4/patches/002-squashfs_lzma.patch [deleted file]
target/linux/generic-2.4/patches/003-jffs2_compression.patch [deleted file]
target/linux/generic-2.4/patches/004-exec_pagesize.patch [deleted file]
target/linux/generic-2.4/patches/005-mtd_flashtypes.patch [deleted file]
target/linux/generic-2.4/patches/008-intel_flashchip_fix.patch [deleted file]
target/linux/generic-2.4/patches/009-mtd_uaccess.patch [deleted file]
target/linux/generic-2.4/patches/010-disable_old_squashfs_compatibility.patch [deleted file]
target/linux/generic-2.4/patches/050-build_flags.patch [deleted file]
target/linux/generic-2.4/patches/051-parallel_build.patch [deleted file]
target/linux/generic-2.4/patches/051-remove_pcmcia_modinst_compat.patch [deleted file]
target/linux/generic-2.4/patches/100-wireless-extension.patch [deleted file]
target/linux/generic-2.4/patches/106-mppe_mppc.patch [deleted file]
target/linux/generic-2.4/patches/107-cifs.patch [deleted file]
target/linux/generic-2.4/patches/108-optional_aout_support.patch [deleted file]
target/linux/generic-2.4/patches/109-ipsec_nat_traversal.patch [deleted file]
target/linux/generic-2.4/patches/110-netdev_random_core.patch [deleted file]
target/linux/generic-2.4/patches/112-bridging_performance.patch [deleted file]
target/linux/generic-2.4/patches/113-even_more_gcc4_stuff.patch [deleted file]
target/linux/generic-2.4/patches/114-sched_use_tsc.patch [deleted file]
target/linux/generic-2.4/patches/115-branch_emul_fix.patch [deleted file]
target/linux/generic-2.4/patches/116-bridge_ioctls.patch [deleted file]
target/linux/generic-2.4/patches/200-i4l.patch [deleted file]
target/linux/generic-2.4/patches/201-hfc_usb_backport.patch [deleted file]
target/linux/generic-2.4/patches/203-hfsplus_fix.patch [deleted file]
target/linux/generic-2.4/patches/206-gcc_3.4_fixes.patch [deleted file]
target/linux/generic-2.4/patches/208-usb2_fix.patch [deleted file]
target/linux/generic-2.4/patches/209-build_fixes.patch [deleted file]
target/linux/generic-2.4/patches/210-fix-irq-serial.patch [deleted file]
target/linux/generic-2.4/patches/212-htb_time_fix.patch [deleted file]
target/linux/generic-2.4/patches/213-htb_disable_hysteresis.patch [deleted file]
target/linux/generic-2.4/patches/222-sound.patch [deleted file]
target/linux/generic-2.4/patches/224-atm_hotplug.patch [deleted file]
target/linux/generic-2.4/patches/225-string_lib_useful_exports.patch [deleted file]
target/linux/generic-2.4/patches/226-atm_br2684.patch [deleted file]
target/linux/generic-2.4/patches/227-jffs2_eofdetect.patch [deleted file]
target/linux/generic-2.4/patches/228-more_usb_fixes.patch [deleted file]
target/linux/generic-2.4/patches/229-usb_storage_16_byte_cdb.patch [deleted file]
target/linux/generic-2.4/patches/230-tun_get_user_backport.patch [deleted file]
target/linux/generic-2.4/patches/231-mini_fo.patch [deleted file]
target/linux/generic-2.4/patches/601-netfilter_ipp2p_0.8.1rc1.patch [deleted file]
target/linux/generic-2.4/patches/602-netfilter_layer7_2.21.patch [deleted file]
target/linux/generic-2.4/patches/604-netfilter_maxconn.patch [deleted file]
target/linux/generic-2.4/patches/605-netfilter_TTL.patch [deleted file]
target/linux/generic-2.4/patches/606-netfilter_NETMAP.patch [deleted file]
target/linux/generic-2.4/patches/607-netfilter_connmark.patch [deleted file]
target/linux/generic-2.4/patches/609-netfilter_string.patch [deleted file]
target/linux/generic-2.4/patches/610-netfilter_connbytes.patch [deleted file]
target/linux/generic-2.4/patches/611-netfilter_condition.patch [deleted file]
target/linux/generic-2.4/patches/612-netfilter_quota.patch [deleted file]
target/linux/generic-2.4/patches/613-netfilter_nat_h323.patch [deleted file]
target/linux/generic-2.4/patches/614-netfilter_nat_rtsp.patch [deleted file]
target/linux/generic-2.4/patches/615-netfilter_nat_mms.patch [deleted file]
target/linux/generic-2.4/patches/616-netfilter_imq.patch [deleted file]
target/linux/generic-2.4/patches/618-netfilter_multiport_backport.patch [deleted file]
target/linux/generic-2.4/patches/620-netfilter_iprange.patch [deleted file]
target/linux/generic-2.4/patches/621-netfilter_random.patch [deleted file]
target/linux/generic-2.4/patches/622-tc_esfq.patch [deleted file]
target/linux/generic-2.4/patches/624-netfilter_ip6t_reject.patch [deleted file]
target/linux/generic-2.4/patches/626-netfilter_conntrack_fix.patch [deleted file]
target/linux/generic-2.4/patches/628-netfilter_raw.patch [deleted file]
target/linux/generic-2.4/patches/629-netlink_types_h.patch [deleted file]
target/linux/generic-2.4/patches/630-netfilter_comment.patch [deleted file]
target/linux/generic-2.4/patches/700-multiple_default_gateways.patch [deleted file]
target/linux/generic-2.4/patches/801-usb_serial_endpoint_size.patch [deleted file]
target/linux/generic-2.4/patches/802-usb_serial_3g_cards.patch [deleted file]
target/linux/generic-2.4/patches/804-watchdog_include.patch [deleted file]
target/linux/generic-2.4/patches/900-ocf-kconfig-integration.patch [deleted file]
target/linux/generic-2.4/patches/901-ocf-20100325.patch [deleted file]

diff --git a/target/linux/generic-2.4/config-default b/target/linux/generic-2.4/config-default
deleted file mode 100644 (file)
index c5348ca..0000000
+++ /dev/null
@@ -1,777 +0,0 @@
-# CONFIG_64BIT_PHYS_ADDR is not set
-# CONFIG_ACENIC is not set
-# CONFIG_ACER_PICA_61 is not set
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_ADFS_FS is not set
-# CONFIG_ADFS_FS_RW is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_AGP is not set
-# CONFIG_AIRONET4500 is not set
-# CONFIG_AIRONET4500_NONCS is not set
-# CONFIG_AIRONET4500_PROC is not set
-# CONFIG_AMD_PM768 is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_APPLICOM is not set
-# CONFIG_ARCNET is not set
-# CONFIG_ARLAN is not set
-# CONFIG_ARPD is not set
-# CONFIG_ATALK is not set
-# CONFIG_ATARI_PARTITION is not set
-# CONFIG_AUTOFS4_FS is not set
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_BAGET_MIPS is not set
-# CONFIG_BEFS_DEBUG is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_BINFMT_AOUT is not set
-# CONFIG_BINFMT_ELF32 is not set
-# CONFIG_BINFMT_ELF_AOUT is not set
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_MISC is not set
-# CONFIG_BLK_CPQ_CISS_DA is not set
-# CONFIG_BLK_CPQ_DA is not set
-# CONFIG_BLK_DEV_DAC960 is not set
-# CONFIG_BLK_DEV_FD is not set
-# CONFIG_BLK_DEV_HD is not set
-# CONFIG_BLK_DEV_INITRD is not set
-CONFIG_BLK_DEV_LOOP=m
-# CONFIG_BLK_DEV_LVM is not set
-# CONFIG_BLK_DEV_MD is not set
-CONFIG_BLK_DEV_NBD=m
-# CONFIG_BLK_DEV_RAM is not set
-CONFIG_BLK_DEV_SD=m
-# CONFIG_BLK_DEV_SR is not set
-# CONFIG_BLK_DEV_SX8 is not set
-# CONFIG_BLK_DEV_UMEM is not set
-# CONFIG_BLK_DEV_XD is not set
-# CONFIG_BLK_STATS is not set
-# CONFIG_BONDING is not set
-CONFIG_BRIDGE=y
-# CONFIG_BSD_DISKLABEL is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_BUILD_ELF64 is not set
-# CONFIG_BUSMOUSE is not set
-# CONFIG_CASIO_E55 is not set
-# CONFIG_CHR_DEV_OSST is not set
-CONFIG_CHR_DEV_SG=m
-# CONFIG_CHR_DEV_ST is not set
-CONFIG_CIFS=m
-CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_STATS is not set
-# CONFIG_CISS_MONITOR_THREAD is not set
-# CONFIG_CISS_SCSI_TAPE is not set
-# CONFIG_CODA_FS is not set
-# CONFIG_COGENT_CSB250 is not set
-# CONFIG_CPU_ADVANCED is not set
-# CONFIG_CPU_HAS_LLDSCD is not set
-CONFIG_CPU_HAS_LLSC=y
-CONFIG_CPU_HAS_PREFETCH=y
-CONFIG_CPU_HAS_SYNC=y
-# CONFIG_CPU_HAS_WB is not set
-CONFIG_CPU_LITTLE_ENDIAN=y
-CONFIG_CPU_MIPS32=y
-# CONFIG_CPU_MIPS64 is not set
-# CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_R10000 is not set
-# CONFIG_CPU_R3000 is not set
-# CONFIG_CPU_R4300 is not set
-# CONFIG_CPU_R4X00 is not set
-# CONFIG_CPU_R5000 is not set
-# CONFIG_CPU_R5432 is not set
-# CONFIG_CPU_R6000 is not set
-# CONFIG_CPU_R8000 is not set
-# CONFIG_CPU_RM7000 is not set
-# CONFIG_CPU_RM9000 is not set
-# CONFIG_CPU_SB1 is not set
-# CONFIG_CPU_TX39XX is not set
-# CONFIG_CPU_TX49XX is not set
-# CONFIG_CPU_VR41XX is not set
-# CONFIG_CRAMFS is not set
-CONFIG_CROSSCOMPILE=y
-CONFIG_CRYPTO_AES=m
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=m
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_SHA256=m
-CONFIG_CRYPTO_SHA512=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_WP512=m
-CONFIG_CRYPTO=y
-# CONFIG_DDB5074 is not set
-# CONFIG_DDB5476 is not set
-# CONFIG_DDB5477 is not set
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_DECNET is not set
-# CONFIG_DECSTATION is not set
-# CONFIG_DEVFS_DEBUG is not set
-CONFIG_DEVFS_FS=y
-CONFIG_DEVFS_MOUNT=y
-CONFIG_DEVPTS_FS=y
-# CONFIG_DL2K is not set
-# CONFIG_DRM is not set
-# CONFIG_DTLK is not set
-# CONFIG_DUMMY is not set
-# CONFIG_DUMMY_KEYB is not set
-# CONFIG_E1000 is not set
-# CONFIG_ECONET is not set
-# CONFIG_EFI_PARTITION is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_EQUALIZER is not set
-# CONFIG_ETHERTAP is not set
-CONFIG_EXPERIMENTAL=y
-CONFIG_EXT2_FS=m
-CONFIG_EXT3_FS=m
-CONFIG_FAT_FS=m
-# CONFIG_FDDI is not set
-# CONFIG_FTAPE is not set
-# CONFIG_FTL is not set
-# CONFIG_FUSION_BOOT is not set
-# CONFIG_FUSION_CTL is not set
-# CONFIG_FUSION_ISENSE is not set
-# CONFIG_FUSION is not set
-# CONFIG_FUSION_LAN is not set
-# CONFIG_FW_LOADER is not set
-# CONFIG_GDB_CONSOLE is not set
-# CONFIG_HAMACHI is not set
-# CONFIG_HERMES is not set
-# CONFIG_HFS_FS is not set
-CONFIG_HFSPLUS_FS=m
-# CONFIG_HIGHMEM is not set
-# CONFIG_HIPPI is not set
-# CONFIG_HOTPLUG_PCI_COMPAQ is not set
-# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
-# CONFIG_HOTPLUG_PCI is not set
-# CONFIG_HOTPLUG_PCI_PCIE is not set
-# CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set
-# CONFIG_HOTPLUG_PCI_SHPC is not set
-# CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE is not set
-CONFIG_HOTPLUG=y
-# CONFIG_HPFS_FS is not set
-# CONFIG_HP_LASERJET is not set
-# CONFIG_I2C is not set
-# CONFIG_IBM_WORKPAD is not set
-# CONFIG_IEEE1394_CMP is not set
-# CONFIG_IEEE1394_DV1394 is not set
-# CONFIG_IEEE1394_ETH1394 is not set
-# CONFIG_IEEE1394_OHCI1394 is not set
-# CONFIG_IEEE1394_OUI_DB is not set
-# CONFIG_IEEE1394_RAWIO is not set
-# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
-# CONFIG_IEEE1394_VERBOSEDEBUG is not set
-# CONFIG_IEEE1394_VIDEO1394 is not set
-CONFIG_IMQ=m
-# CONFIG_INET_ECN is not set
-CONFIG_INET=y
-# CONFIG_INPUT is not set
-# CONFIG_INPUT_DB9 is not set
-# CONFIG_INPUT_EVDEV is not set
-# CONFIG_INPUT_GAMECON is not set
-# CONFIG_INPUT_GAMEPORT is not set
-# CONFIG_INPUT_IFORCE_USB is not set
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_KEYBDEV is not set
-# CONFIG_INPUT_MOUSEDEV is not set
-# CONFIG_INPUT_SERIO is not set
-# CONFIG_INPUT_TURBOGRAFX is not set
-# CONFIG_INPUT_UINPUT is not set
-# CONFIG_INTERMEZZO_FS is not set
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MANGLE=m
-# CONFIG_IP6_NF_MATCH_AHESP is not set
-# CONFIG_IP6_NF_MATCH_CONDITION is not set
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-# CONFIG_IP6_NF_MATCH_HL is not set
-# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
-CONFIG_IP6_NF_MATCH_LENGTH=m
-CONFIG_IP6_NF_MATCH_LIMIT=m
-CONFIG_IP6_NF_MATCH_MAC=m
-CONFIG_IP6_NF_MATCH_MARK=m
-CONFIG_IP6_NF_MATCH_MULTIPORT=m
-# CONFIG_IP6_NF_MATCH_OPTS is not set
-CONFIG_IP6_NF_MATCH_OWNER=m
-CONFIG_IP6_NF_MATCH_RANDOM=m
-# CONFIG_IP6_NF_MATCH_RT is not set
-# CONFIG_IP6_NF_QUEUE is not set
-CONFIG_IP6_NF_RAW=m
-CONFIG_IP6_NF_TARGET_IMQ=m
-CONFIG_IP6_NF_TARGET_LOG=m
-CONFIG_IP6_NF_TARGET_MARK=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP_ADVANCED_ROUTER=y
-# CONFIG_IPMI_DEVICE_INTERFACE is not set
-# CONFIG_IPMI_HANDLER is not set
-# CONFIG_IPMI_KCS is not set
-# CONFIG_IPMI_PANIC_EVENT is not set
-# CONFIG_IPMI_WATCHDOG is not set
-CONFIG_IP_MROUTE=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_NF_AMANDA=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-CONFIG_IP_NF_ARPTABLES=m
-# CONFIG_IP_NF_COMPAT_IPCHAINS is not set
-# CONFIG_IP_NF_COMPAT_IPFWADM is not set
-CONFIG_IP_NF_CONNTRACK=m
-CONFIG_IP_NF_CONNTRACK_MARK=y
-CONFIG_IP_NF_CT_ACCT=m
-CONFIG_IP_NF_CT_PROTO_GRE=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_FTP=m
-CONFIG_IP_NF_H323=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_IRC=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_MATCH_AH_ESP=m
-CONFIG_IP_NF_MATCH_CONDITION=m
-CONFIG_IP_NF_MATCH_CONNBYTES=m
-CONFIG_IP_NF_MATCH_CONNMARK=m
-CONFIG_IP_NF_MATCH_CONNTRACK=m
-CONFIG_IP_NF_MATCH_COMMENT=m
-CONFIG_IP_NF_MATCH_DSCP=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_HELPER=m
-CONFIG_IP_NF_MATCH_IPP2P=m
-CONFIG_IP_NF_MATCH_IPRANGE=m
-# CONFIG_IP_NF_MATCH_LAYER7_DEBUG is not set
-CONFIG_IP_NF_MATCH_LAYER7=m
-CONFIG_IP_NF_MATCH_LENGTH=m
-CONFIG_IP_NF_MATCH_LIMIT=m
-CONFIG_IP_NF_MATCH_MAC=m
-CONFIG_IP_NF_MATCH_MARK=m
-CONFIG_IP_NF_MATCH_MULTIPORT=m
-CONFIG_IP_NF_MATCH_OWNER=m
-CONFIG_IP_NF_MATCH_PKTTYPE=m
-# CONFIG_IP_NF_MATCH_QUOTA is not set
-CONFIG_IP_NF_MATCH_RANDOM=m
-CONFIG_IP_NF_MATCH_RECENT=m
-CONFIG_IP_NF_MATCH_SET=m
-CONFIG_IP_NF_MATCH_STATE=m
-CONFIG_IP_NF_MATCH_STRING=m
-CONFIG_IP_NF_MATCH_TCPMSS=m
-CONFIG_IP_NF_MATCH_TIME=m
-CONFIG_IP_NF_MATCH_TOS=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_MATCH_UNCLEAN=m
-CONFIG_IP_NF_MMS=m
-CONFIG_IP_NF_NAT_AMANDA=m
-CONFIG_IP_NF_NAT_FTP=m
-CONFIG_IP_NF_NAT_H323=m
-CONFIG_IP_NF_NAT_IRC=m
-CONFIG_IP_NF_NAT=m
-CONFIG_IP_NF_NAT_MMS=m
-CONFIG_IP_NF_NAT_NEEDED=y
-CONFIG_IP_NF_NAT_PPTP=m
-CONFIG_IP_NF_NAT_PROTO_GRE=m
-CONFIG_IP_NF_NAT_RTSP=m
-CONFIG_IP_NF_NAT_SNMP_BASIC=m
-CONFIG_IP_NF_NAT_TFTP=m
-CONFIG_IP_NF_PPTP=m
-CONFIG_IP_NF_QUEUE=m
-CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_RTSP=m
-CONFIG_IP_NF_SET_HASHSIZE=1024
-CONFIG_IP_NF_SET_IPHASH=m
-CONFIG_IP_NF_SET_IPMAP=m
-CONFIG_IP_NF_SET_IPTREE=m
-CONFIG_IP_NF_SET=m
-CONFIG_IP_NF_SET_MACIPMAP=m
-CONFIG_IP_NF_SET_MAX=256
-CONFIG_IP_NF_SET_NETHASH=m
-CONFIG_IP_NF_SET_PORTMAP=m
-CONFIG_IP_NF_TARGET_CLASSIFY=m
-CONFIG_IP_NF_TARGET_CONNMARK=m
-CONFIG_IP_NF_TARGET_DSCP=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_IMQ=m
-CONFIG_IP_NF_TARGET_LOG=m
-CONFIG_IP_NF_TARGET_MARK=m
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_MIRROR=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_NOTRACK=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_SET=m
-CONFIG_IP_NF_TARGET_TCPMSS=m
-CONFIG_IP_NF_TARGET_TOS=m
-CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_IP_NF_TFTP=m
-# CONFIG_IP_PIMSM_V1 is not set
-# CONFIG_IP_PIMSM_V2 is not set
-# CONFIG_IP_PNP is not set
-CONFIG_IP_ROUTE_FWMARK=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_NAT=y
-CONFIG_IP_ROUTE_TOS=y
-# CONFIG_IP_ROUTE_VERBOSE is not set
-# CONFIG_IP_SCTP is not set
-CONFIG_IPSEC_NAT_TRAVERSAL=y
-CONFIG_IPV6=m
-# CONFIG_IPX is not set
-# CONFIG_IRDA is not set
-# CONFIG_ISA is not set
-# CONFIG_ISAPNP is not set
-# CONFIG_ISDN is not set
-CONFIG_ISO9660_FS=m
-# CONFIG_JBD_DEBUG is not set
-CONFIG_JBD=m
-# CONFIG_JFFS2_BBC_ARMLIB is not set
-CONFIG_JFFS2_BBC_LZARI=y
-# CONFIG_JFFS2_BBC_LZHD is not set
-# CONFIG_JFFS2_BBC_LZO is not set
-# CONFIG_JFFS2_BBC_LZSS is not set
-CONFIG_JFFS2_FS_DEBUG=0
-CONFIG_JFFS2_FS=y
-# CONFIG_JFFS_FS is not set
-# CONFIG_JFS_DEBUG is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_JFS_STATISTICS is not set
-CONFIG_JOLIET=y
-# CONFIG_KCORE_AOUT is not set
-CONFIG_KCORE_ELF=y
-# CONFIG_KHTTPD is not set
-# CONFIG_KMOD is not set
-# CONFIG_LANCE is not set
-# CONFIG_LAPB is not set
-# CONFIG_LASAT is not set
-# CONFIG_LDM_PARTITION is not set
-# CONFIG_LLC is not set
-CONFIG_LOCKD=m
-CONFIG_LOCKD_V4=y
-CONFIG_MAC_PARTITION=y
-CONFIG_MAGIC_SYSRQ=y
-# CONFIG_MCA is not set
-# CONFIG_MD is not set
-# CONFIG_MD_LINEAR is not set
-# CONFIG_MD_MULTIPATH is not set
-# CONFIG_MD_RAID0 is not set
-# CONFIG_MD_RAID1 is not set
-# CONFIG_MD_RAID5 is not set
-CONFIG_MINI_FO=y
-# CONFIG_MINIX_SUBPARTITION is not set
-# CONFIG_MIPS32_COMPAT is not set
-# CONFIG_MIPS32_N32 is not set
-# CONFIG_MIPS32_O32 is not set
-CONFIG_MIPS32=y
-# CONFIG_MIPS64 is not set
-# CONFIG_MIPS_ATLAS is not set
-# CONFIG_MIPS_AU1000 is not set
-# CONFIG_MIPS_BOSPORUS is not set
-# CONFIG_MIPS_COBALT is not set
-# CONFIG_MIPS_DB1000 is not set
-# CONFIG_MIPS_DB1100 is not set
-# CONFIG_MIPS_DB1200 is not set
-# CONFIG_MIPS_DB1500 is not set
-# CONFIG_MIPS_DB1550 is not set
-# CONFIG_MIPS_EV64120 is not set
-# CONFIG_MIPS_EV96100 is not set
-# CONFIG_MIPS_FICMMP is not set
-# CONFIG_MIPS_HYDROGEN3 is not set
-# CONFIG_MIPS_ITE8172 is not set
-# CONFIG_MIPS_IVR is not set
-# CONFIG_MIPS_MAGNUM_4000 is not set
-# CONFIG_MIPS_MALTA is not set
-# CONFIG_MIPS_MIRAGE is not set
-# CONFIG_MIPS_MTX1 is not set
-# CONFIG_MIPS_PB1000 is not set
-# CONFIG_MIPS_PB1100 is not set
-# CONFIG_MIPS_PB1200 is not set
-# CONFIG_MIPS_PB1500 is not set
-# CONFIG_MIPS_PB1550 is not set
-# CONFIG_MIPS_SEAD is not set
-# CONFIG_MIPS_UNCACHED is not set
-# CONFIG_MIPS_XXS1500 is not set
-CONFIG_MIPS=y
-CONFIG_MODULES=y
-# CONFIG_MODVERSIONS is not set
-# CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MOMENCO_OCELOT_C is not set
-# CONFIG_MOMENCO_OCELOT_G is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOUSE is not set
-CONFIG_MSDOS_PARTITION=y
-# CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_AMDSTD is not set
-# CONFIG_MTD_BLKMTD is not set
-CONFIG_MTD_BLOCK=y
-# CONFIG_MTD_BOSPORUS is not set
-CONFIG_MTD_CFI_ADV_OPTIONS=y
-CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_CFI_B1=y
-CONFIG_MTD_CFI_B2=y
-# CONFIG_MTD_CFI_B4 is not set
-# CONFIG_MTD_CFI_B8 is not set
-# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
-CONFIG_MTD_CFI_GEOMETRY=y
-CONFIG_MTD_CFI_I1=y
-# CONFIG_MTD_CFI_I2 is not set
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-CONFIG_MTD_CFI_INTELEXT=y
-# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
-CONFIG_MTD_CFI_NOSWAP=y
-# CONFIG_MTD_CFI_STAA is not set
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CHAR=y
-# CONFIG_MTD_CMDLINE_PARTS is not set
-# CONFIG_MTD_CONCAT is not set
-# CONFIG_MTD_CSTM_MIPS_IXX is not set
-# CONFIG_MTD_DB1X00 is not set
-# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_DOC1000 is not set
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOCPROBE is not set
-CONFIG_MTD_GEN_PROBE=y
-# CONFIG_MTD_HYDROGEN3 is not set
-# CONFIG_MTD_JEDEC is not set
-# CONFIG_MTD_JEDECPROBE is not set
-# CONFIG_MTD_LASAT is not set
-# CONFIG_MTD_MIRAGE is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_MTX1 is not set
-# CONFIG_MTD_NAND is not set
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
-# CONFIG_MTD_OCELOT is not set
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_PB1000 is not set
-# CONFIG_MTD_PB1100 is not set
-# CONFIG_MTD_PB1500 is not set
-# CONFIG_MTD_PB1550 is not set
-# CONFIG_MTD_PCI is not set
-# CONFIG_MTD_PCMCIA is not set
-# CONFIG_MTD_PHYSMAP is not set
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_RAM is not set
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_SHARP is not set
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_XXS1500 is not set
-CONFIG_MTD=y
-# CONFIG_MYRI_SBUS is not set
-# CONFIG_NCPFS_EXTRAS is not set
-# CONFIG_NCPFS_IOCTL_LOCKING is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_NCPFS_NFS_NS is not set
-# CONFIG_NCPFS_NLS is not set
-# CONFIG_NCPFS_OS2_NS is not set
-# CONFIG_NCPFS_PACKET_SIGNING is not set
-# CONFIG_NCPFS_SMALLDOS is not set
-# CONFIG_NCPFS_STRONG is not set
-# CONFIG_NEC_EAGLE is not set
-# CONFIG_NEC_OSPREY is not set
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_POLICE=y
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_ROUTE=y
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_U32=m
-CONFIG_NET_CLS=y
-CONFIG_NETDEVICES=y
-# CONFIG_NET_DIVERT is not set
-CONFIG_NET_ESTIMATOR=y
-CONFIG_NET_ETHERNET=y
-# CONFIG_NET_FASTROUTE is not set
-# CONFIG_NET_FC is not set
-# CONFIG_NETFILTER_DEBUG is not set
-CONFIG_NETFILTER=y
-# CONFIG_NET_HW_FLOWCONTROL is not set
-# CONFIG_NET_IPGRE_BROADCAST is not set
-CONFIG_NET_IPGRE=m
-CONFIG_NET_IPIP=m
-# CONFIG_NET_ISA is not set
-CONFIG_NETLINK_DEV=m
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_NET_POCKET is not set
-CONFIG_NET_QOS=y
-CONFIG_NET_RADIO=y
-CONFIG_NET_RANDOM=y
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_CSZ=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCHED=y
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_INGRESS=m
-# CONFIG_NET_SCH_NETEM is not set
-CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_TEQL=m
-# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_NET_VENDOR_RACAL is not set
-# CONFIG_NET_VENDOR_SMC is not set
-CONFIG_NET=y
-# CONFIG_NFS_DIRECTIO is not set
-CONFIG_NFSD=m
-# CONFIG_NFSD_TCP is not set
-CONFIG_NFSD_V3=y
-CONFIG_NFS_FS=m
-CONFIG_NFS_V3=y
-# CONFIG_NFTL is not set
-# CONFIG_NINO is not set
-CONFIG_NLS_CODEPAGE_1250=m
-# CONFIG_NLS_CODEPAGE_1251 is not set
-CONFIG_NLS_CODEPAGE_437=m
-# CONFIG_NLS_CODEPAGE_737 is not set
-# CONFIG_NLS_CODEPAGE_775 is not set
-CONFIG_NLS_CODEPAGE_850=m
-# CONFIG_NLS_CODEPAGE_852 is not set
-# CONFIG_NLS_CODEPAGE_855 is not set
-# CONFIG_NLS_CODEPAGE_857 is not set
-# CONFIG_NLS_CODEPAGE_860 is not set
-# CONFIG_NLS_CODEPAGE_861 is not set
-# CONFIG_NLS_CODEPAGE_862 is not set
-# CONFIG_NLS_CODEPAGE_863 is not set
-# CONFIG_NLS_CODEPAGE_864 is not set
-# CONFIG_NLS_CODEPAGE_865 is not set
-# CONFIG_NLS_CODEPAGE_866 is not set
-# CONFIG_NLS_CODEPAGE_869 is not set
-# CONFIG_NLS_CODEPAGE_874 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
-# CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
-# CONFIG_NLS_CODEPAGE_950 is not set
-CONFIG_NLS_DEFAULT="iso8859-1"
-# CONFIG_NLS_ISO8859_13 is not set
-# CONFIG_NLS_ISO8859_14 is not set
-CONFIG_NLS_ISO8859_15=m
-CONFIG_NLS_ISO8859_1=m
-# CONFIG_NLS_ISO8859_2 is not set
-# CONFIG_NLS_ISO8859_3 is not set
-# CONFIG_NLS_ISO8859_4 is not set
-# CONFIG_NLS_ISO8859_5 is not set
-# CONFIG_NLS_ISO8859_6 is not set
-# CONFIG_NLS_ISO8859_7 is not set
-# CONFIG_NLS_ISO8859_8 is not set
-# CONFIG_NLS_ISO8859_9 is not set
-CONFIG_NLS_KOI8_R=m
-# CONFIG_NLS_KOI8_U is not set
-CONFIG_NLS_UTF8=m
-CONFIG_NLS=y
-CONFIG_NONCOHERENT_IO=y
-# CONFIG_NS83820 is not set
-CONFIG_NTFS_FS=m
-# CONFIG_NTFS_RW is not set
-# CONFIG_NVRAM is not set
-# CONFIG_OCF_BENCH is not set
-# CONFIG_OCF_C7108 is not set
-# CONFIG_OCF_CRYPTODEV is not set
-# CONFIG_OCF_CRYPTOSOFT is not set
-# CONFIG_OCF_EP80579 is not set
-# CONFIG_OCF_FIPS is not set
-# CONFIG_OCF_HIFN is not set
-# CONFIG_OCF_IXP4XX is not set
-# CONFIG_OCF_OCF is not set
-# CONFIG_OCF_OCFNULL is not set
-# CONFIG_OCF_PASEMI is not set
-# CONFIG_OCF_RANDOMHARVEST is not set
-# CONFIG_OCF_SAFE is not set
-# CONFIG_OCF_TALITOS is not set
-# CONFIG_OLIVETTI_M700 is not set
-# CONFIG_OOM_KILLER is not set
-# CONFIG_OSF_PARTITION is not set
-CONFIG_PACKET_MMAP=y
-CONFIG_PACKET=y
-# CONFIG_PAGE_SIZE_16KB is not set
-CONFIG_PAGE_SIZE_4KB=y
-# CONFIG_PAGE_SIZE_64KB is not set
-# CONFIG_PARIDE is not set
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_PHONE is not set
-# CONFIG_PHONE_IXJ is not set
-# CONFIG_PHONE_IXJ_PCMCIA is not set
-# CONFIG_PLIP is not set
-# CONFIG_PMC_BIG_SUR is not set
-# CONFIG_PMC_STRETCH is not set
-# CONFIG_PMC_YOSEMITE is not set
-# CONFIG_PNP is not set
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_FILTER=y
-CONFIG_PPP=m
-CONFIG_PPP_MPPE_MPPC=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPPOE=m
-CONFIG_PPP_SYNC_TTY=m
-# CONFIG_PRISM54 is not set
-CONFIG_PROC_FS=y
-# CONFIG_QFMT_V2 is not set
-# CONFIG_QIC02_TAPE is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_QNX4FS_RW is not set
-# CONFIG_QUOTA is not set
-# CONFIG_R3964 is not set
-# CONFIG_R8169 is not set
-CONFIG_RAMFS=y
-# CONFIG_RCPCI is not set
-# CONFIG_REISERFS_CHECK is not set
-# CONFIG_REISERFS_FS is not set
-# CONFIG_REISERFS_PROC_INFO is not set
-# CONFIG_ROMFS_FS is not set
-# CONFIG_ROOT_NFS is not set
-# CONFIG_RTC is not set
-# CONFIG_RUNTIME_DEBUG is not set
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
-# CONFIG_SBUS is not set
-# CONFIG_SCSI_7000FASST is not set
-# CONFIG_SCSI_AACRAID is not set
-# CONFIG_SCSI_ACARD is not set
-# CONFIG_SCSI_ADVANSYS is not set
-# CONFIG_SCSI_AHA152X is not set
-# CONFIG_SCSI_AHA1542 is not set
-# CONFIG_SCSI_AHA1740 is not set
-# CONFIG_SCSI_AIC79XX is not set
-# CONFIG_SCSI_AIC7XXX is not set
-# CONFIG_SCSI_AIC7XXX_OLD is not set
-# CONFIG_SCSI_AM53C974 is not set
-# CONFIG_SCSI_ATA_PIIX is not set
-# CONFIG_SCSI_BUSLOGIC is not set
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_DEBUG is not set
-# CONFIG_SCSI_DEBUG_QUEUES is not set
-# CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_DPT_I2O is not set
-# CONFIG_SCSI_DTC3280 is not set
-# CONFIG_SCSI_EATA_DMA is not set
-# CONFIG_SCSI_EATA is not set
-# CONFIG_SCSI_EATA_PIO is not set
-# CONFIG_SCSI_FUTURE_DOMAIN is not set
-# CONFIG_SCSI_GDTH is not set
-# CONFIG_SCSI_GENERIC_NCR5380 is not set
-# CONFIG_SCSI_IN2000 is not set
-# CONFIG_SCSI_INIA100 is not set
-# CONFIG_SCSI_INITIO is not set
-# CONFIG_SCSI_LOGGING is not set
-CONFIG_SCSI=m
-# CONFIG_SCSI_MEGARAID2 is not set
-# CONFIG_SCSI_MEGARAID is not set
-CONFIG_SCSI_MULTI_LUN=y
-# CONFIG_SCSI_NCR53C406A is not set
-# CONFIG_SCSI_NCR53C7xx is not set
-# CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_PAS16 is not set
-# CONFIG_SCSI_PCI2000 is not set
-# CONFIG_SCSI_PCI2220I is not set
-# CONFIG_SCSI_PSI240I is not set
-# CONFIG_SCSI_QLOGIC_FAS is not set
-# CONFIG_SCSI_SATA_AHCI is not set
-# CONFIG_SCSI_SATA is not set
-# CONFIG_SCSI_SATA_NV is not set
-# CONFIG_SCSI_SATA_PROMISE is not set
-# CONFIG_SCSI_SATA_QSTOR is not set
-# CONFIG_SCSI_SATA_SIL is not set
-# CONFIG_SCSI_SATA_SIS is not set
-# CONFIG_SCSI_SATA_SVW is not set
-# CONFIG_SCSI_SATA_SX4 is not set
-# CONFIG_SCSI_SATA_ULI is not set
-# CONFIG_SCSI_SATA_VIA is not set
-# CONFIG_SCSI_SATA_VITESSE is not set
-# CONFIG_SCSI_SIM710 is not set
-# CONFIG_SCSI_SYM53C416 is not set
-# CONFIG_SCSI_T128 is not set
-# CONFIG_SCSI_U14_34F is not set
-# CONFIG_SCx200_GPIO is not set
-# CONFIG_SCx200 is not set
-CONFIG_SD_EXTRA_DEVS=5
-CONFIG_SERIAL_CONSOLE=y
-# CONFIG_SERIAL_EXTENDED is not set
-# CONFIG_SERIAL_NONSTANDARD is not set
-CONFIG_SERIAL=y
-# CONFIG_SGI_IP22 is not set
-# CONFIG_SGI_IP27 is not set
-# CONFIG_SGI_PARTITION is not set
-CONFIG_SHAPER=m
-# CONFIG_SIBYTE_SB1xxx_SOC is not set
-# CONFIG_SK98LIN is not set
-# CONFIG_SKGE is not set
-# CONFIG_SKY2 is not set
-# CONFIG_SLIP is not set
-# CONFIG_SMB_FS is not set
-# CONFIG_SMB_NLS is not set
-# CONFIG_SNI_RM200_PCI is not set
-# CONFIG_SOLARIS_X86_PARTITION is not set
-# CONFIG_SQUASHFS_EMBEDDED is not set
-CONFIG_SQUASHFS=y
-# CONFIG_STRIP is not set
-# CONFIG_SUNBMAC is not set
-# CONFIG_SUNGEM is not set
-# CONFIG_SUNLANCE is not set
-# CONFIG_SUN_PARTITION is not set
-# CONFIG_SUNQE is not set
-CONFIG_SUNRPC=m
-CONFIG_SYN_COOKIES=y
-CONFIG_SYSCTL=y
-# CONFIG_SYSV_FS is not set
-CONFIG_SYSVIPC=y
-# CONFIG_TANBAC_TB0226 is not set
-# CONFIG_TANBAC_TB0229 is not set
-# CONFIG_TC is not set
-# CONFIG_TIGON3 is not set
-CONFIG_TMPFS=y
-# CONFIG_TOSHIBA_JMR3927 is not set
-# CONFIG_TOSHIBA_RBTX4927 is not set
-# CONFIG_TR is not set
-CONFIG_TUN=m
-# CONFIG_UDF_FS is not set
-# CONFIG_UDF_RW is not set
-# CONFIG_UFS_FS is not set
-# CONFIG_UFS_FS_WRITE is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_UMSDOS_FS is not set
-CONFIG_UNIX98_PTY_COUNT=128
-CONFIG_UNIX98_PTYS=y
-# CONFIG_UNIXWARE_DISKLABEL is not set
-CONFIG_UNIX=y
-# CONFIG_USB_BLUETOOTH is not set
-# CONFIG_USB_GADGET is not set
-CONFIG_USB_USBNET=m
-CONFIG_VFAT_FS=m
-# CONFIG_VICTOR_MPC30X is not set
-CONFIG_VLAN_8021Q=y
-# CONFIG_VTAG_ICACHE is not set
-# CONFIG_VT is not set
-# CONFIG_VXFS_FS is not set
-# CONFIG_WAN is not set
-CONFIG_WAN_ROUTER=m
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-CONFIG_WATCHDOG=y
-# CONFIG_WAVELAN is not set
-# CONFIG_WDT_W83627 is not set
-# CONFIG_X25 is not set
-# CONFIG_XFS_DEBUG is not set
-CONFIG_XFS_FS=m
-# CONFIG_XFS_QUOTA is not set
-# CONFIG_XFS_RT is not set
-# CONFIG_XFS_TRACE is not set
-# CONFIG_YELLOWFIN is not set
-# CONFIG_ZAO_CAPCELLA is not set
-# CONFIG_ZISOFS_FS is not set
-# CONFIG_ZISOFS is not set
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_ZLIB_INFLATE=y
diff --git a/target/linux/generic-2.4/files/crypto/ocf/Config.in b/target/linux/generic-2.4/files/crypto/ocf/Config.in
deleted file mode 100644 (file)
index d722cba..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-#############################################################################
-
-mainmenu_option next_comment
-comment 'OCF Configuration'
-tristate 'OCF (Open Cryptograhic Framework)' CONFIG_OCF_OCF
-dep_mbool '  enable fips RNG checks (fips check on RNG data before use)' \
-                               CONFIG_OCF_FIPS $CONFIG_OCF_OCF
-dep_mbool '  enable harvesting entropy for /dev/random' \
-                               CONFIG_OCF_RANDOMHARVEST $CONFIG_OCF_OCF
-dep_tristate '  cryptodev (user space support)' \
-                               CONFIG_OCF_CRYPTODEV $CONFIG_OCF_OCF
-dep_tristate '  cryptosoft (software crypto engine)' \
-                               CONFIG_OCF_CRYPTOSOFT $CONFIG_OCF_OCF
-dep_tristate '  safenet (HW crypto engine)' \
-                               CONFIG_OCF_SAFE $CONFIG_OCF_OCF
-dep_tristate '  IXP4xx (HW crypto engine)' \
-                               CONFIG_OCF_IXP4XX $CONFIG_OCF_OCF
-dep_mbool    '  Enable IXP4xx HW to perform SHA1 and MD5 hashing (very slow)' \
-                               CONFIG_OCF_IXP4XX_SHA1_MD5 $CONFIG_OCF_IXP4XX
-dep_tristate '  hifn (HW crypto engine)' \
-                               CONFIG_OCF_HIFN $CONFIG_OCF_OCF
-dep_tristate '  talitos (HW crypto engine)' \
-                               CONFIG_OCF_TALITOS $CONFIG_OCF_OCF
-dep_tristate '  pasemi (HW crypto engine)' \
-                               CONFIG_OCF_PASEMI $CONFIG_OCF_OCF
-dep_tristate '  ep80579 (HW crypto engine)' \
-                               CONFIG_OCF_EP80579 $CONFIG_OCF_OCF
-dep_tristate '  Micronas c7108 (HW crypto engine)' \
-                               CONFIG_OCF_C7108 $CONFIG_OCF_OCF
-dep_tristate '  ocfnull (does no crypto)' \
-                               CONFIG_OCF_OCFNULL $CONFIG_OCF_OCF
-dep_tristate '  ocf-bench (HW crypto in-kernel benchmark)' \
-                               CONFIG_OCF_BENCH $CONFIG_OCF_OCF
-endmenu
-
-#############################################################################
diff --git a/target/linux/generic-2.4/files/crypto/ocf/Kconfig b/target/linux/generic-2.4/files/crypto/ocf/Kconfig
deleted file mode 100644 (file)
index b9c24ff..0000000
+++ /dev/null
@@ -1,119 +0,0 @@
-menu "OCF Configuration"
-
-config OCF_OCF
-       tristate "OCF (Open Cryptograhic Framework)"
-       help
-         A linux port of the OpenBSD/FreeBSD crypto framework.
-
-config OCF_RANDOMHARVEST
-       bool "crypto random --- harvest entropy for /dev/random"
-       depends on OCF_OCF
-       help
-         Includes code to harvest random numbers from devices that support it.
-
-config OCF_FIPS
-       bool "enable fips RNG checks"
-       depends on OCF_OCF && OCF_RANDOMHARVEST
-       help
-         Run all RNG provided data through a fips check before
-         adding it /dev/random's entropy pool.
-
-config OCF_CRYPTODEV
-       tristate "cryptodev (user space support)"
-       depends on OCF_OCF
-       help
-         The user space API to access crypto hardware.
-
-config OCF_CRYPTOSOFT
-       tristate "cryptosoft (software crypto engine)"
-       depends on OCF_OCF
-       help
-         A software driver for the OCF framework that uses
-         the kernel CryptoAPI.
-
-config OCF_SAFE
-       tristate "safenet (HW crypto engine)"
-       depends on OCF_OCF
-       help
-         A driver for a number of the safenet Excel crypto accelerators.
-         Currently tested and working on the 1141 and 1741.
-
-config OCF_IXP4XX
-       tristate "IXP4xx (HW crypto engine)"
-       depends on OCF_OCF
-       help
-         XScale IXP4xx crypto accelerator driver.  Requires the
-         Intel Access library.
-
-config OCF_IXP4XX_SHA1_MD5
-       bool "IXP4xx SHA1 and MD5 Hashing"
-       depends on OCF_IXP4XX
-       help
-         Allows the IXP4xx crypto accelerator to perform SHA1 and MD5 hashing.
-         Note: this is MUCH slower than using cryptosoft (software crypto engine).
-
-config OCF_HIFN
-       tristate "hifn (HW crypto engine)"
-       depends on OCF_OCF
-       help
-         OCF driver for various HIFN based crypto accelerators.
-         (7951, 7955, 7956, 7751, 7811)
-
-config OCF_HIFNHIPP
-       tristate "Hifn HIPP (HW packet crypto engine)"
-       depends on OCF_OCF
-       help
-         OCF driver for various HIFN (HIPP) based crypto accelerators
-         (7855)
-
-config OCF_TALITOS
-       tristate "talitos (HW crypto engine)"
-       depends on OCF_OCF
-       help
-         OCF driver for Freescale's security engine (SEC/talitos).
-
-config OCF_PASEMI
-       tristate "pasemi (HW crypto engine)"
-       depends on OCF_OCF && PPC_PASEMI
-       help
-         OCF driver for the PA Semi PWRficient DMA Engine
-
-config OCF_EP80579
-       tristate "ep80579 (HW crypto engine)"
-       depends on OCF_OCF
-       help
-         OCF driver for the Intel EP80579 Integrated Processor Product Line.
-
-config OCF_CRYPTOCTEON
-       tristate "cryptocteon (HW crypto engine)"
-       depends on OCF_OCF
-       help
-         OCF driver for the Cavium OCTEON Processors.
-
-config OCF_KIRKWOOD
-       tristate "kirkwood (HW crypto engine)"
-       depends on OCF_OCF
-       help
-         OCF driver for the Marvell Kirkwood (88F6xxx) Processors.
-
-config OCF_C7108
-       tristate "Micronas 7108 (HW crypto engine)"
-       depends on OCF_OCF
-       help
-         OCF driver for the Microna 7108 Cipher processors.
-
-config OCF_OCFNULL
-       tristate "ocfnull (fake crypto engine)"
-       depends on OCF_OCF
-       help
-         OCF driver for measuring ipsec overheads (does no crypto)
-
-config OCF_BENCH
-       tristate "ocf-bench (HW crypto in-kernel benchmark)"
-       depends on OCF_OCF
-       help
-         A very simple encryption test for the in-kernel interface
-         of OCF.  Also includes code to benchmark the IXP Access library
-         for comparison.
-
-endmenu
diff --git a/target/linux/generic-2.4/files/crypto/ocf/Makefile b/target/linux/generic-2.4/files/crypto/ocf/Makefile
deleted file mode 100644 (file)
index fa951f4..0000000
+++ /dev/null
@@ -1,124 +0,0 @@
-# for SGlinux builds
--include $(ROOTDIR)/modules/.config
-
-OCF_OBJS = crypto.o criov.o
-
-ifdef CONFIG_OCF_RANDOMHARVEST
-       OCF_OBJS += random.o
-endif
-
-ifdef CONFIG_OCF_FIPS
-       OCF_OBJS += rndtest.o
-endif
-
-# Add in autoconf.h to get #defines for CONFIG_xxx
-AUTOCONF_H=$(ROOTDIR)/modules/autoconf.h
-ifeq ($(AUTOCONF_H), $(wildcard $(AUTOCONF_H)))
-       EXTRA_CFLAGS += -include $(AUTOCONF_H)
-       export EXTRA_CFLAGS
-endif
-
-ifndef obj
-       obj ?= .
-       _obj = subdir
-       mod-subdirs := safe hifn ixp4xx talitos ocfnull
-       export-objs += crypto.o criov.o random.o
-       list-multi += ocf.o
-       _slash :=
-else
-       _obj = obj
-       _slash := /
-endif
-
-EXTRA_CFLAGS += -I$(obj)/.
-
-obj-$(CONFIG_OCF_OCF)         += ocf.o
-obj-$(CONFIG_OCF_CRYPTODEV)   += cryptodev.o
-obj-$(CONFIG_OCF_CRYPTOSOFT)  += cryptosoft.o
-obj-$(CONFIG_OCF_BENCH)       += ocf-bench.o
-
-$(_obj)-$(CONFIG_OCF_SAFE)    += safe$(_slash)
-$(_obj)-$(CONFIG_OCF_HIFN)    += hifn$(_slash)
-$(_obj)-$(CONFIG_OCF_IXP4XX)  += ixp4xx$(_slash)
-$(_obj)-$(CONFIG_OCF_TALITOS) += talitos$(_slash)
-$(_obj)-$(CONFIG_OCF_PASEMI)  += pasemi$(_slash)
-$(_obj)-$(CONFIG_OCF_EP80579) += ep80579$(_slash)
-$(_obj)-$(CONFIG_OCF_CRYPTOCTEON) += cryptocteon$(_slash)
-$(_obj)-$(CONFIG_OCF_KIRKWOOD) += kirkwood$(_slash)
-$(_obj)-$(CONFIG_OCF_OCFNULL) += ocfnull$(_slash)
-$(_obj)-$(CONFIG_OCF_C7108) += c7108$(_slash)
-
-ocf-objs := $(OCF_OBJS)
-
-$(list-multi) dummy1: $(ocf-objs)
-       $(LD) -r -o $@ $(ocf-objs)
-
-.PHONY:
-clean:
-       rm -f *.o *.ko .*.o.flags .*.ko.cmd .*.o.cmd .*.mod.o.cmd *.mod.c
-       rm -f */*.o */*.ko */.*.o.cmd */.*.ko.cmd */.*.mod.o.cmd */*.mod.c */.*.o.flags
-
-ifdef TOPDIR
--include $(TOPDIR)/Rules.make
-endif
-
-#
-# release gen targets
-#
-
-.PHONY: patch
-patch:
-       REL=`date +%Y%m%d`; \
-               patch=ocf-linux-$$REL.patch; \
-               patch24=ocf-linux-24-$$REL.patch; \
-               patch26=ocf-linux-26-$$REL.patch; \
-               ( \
-                       find . -name Makefile; \
-                       find . -name Config.in; \
-                       find . -name Kconfig; \
-                       find . -name README; \
-                       find . -name '*.[ch]' | grep -v '.mod.c'; \
-               ) | while read t; do \
-                       diff -Nau /dev/null $$t | sed 's?^+++ \./?+++ linux/crypto/ocf/?'; \
-               done > $$patch; \
-               cat patches/linux-2.4.35-ocf.patch $$patch > $$patch24; \
-               cat patches/linux-2.6.33-ocf.patch $$patch > $$patch26
-
-.PHONY: tarball
-tarball:
-       REL=`date +%Y%m%d`; RELDIR=/tmp/ocf-linux-$$REL; \
-               CURDIR=`pwd`; \
-               rm -rf /tmp/ocf-linux-$$REL*; \
-               mkdir -p $$RELDIR/tools; \
-               cp README* $$RELDIR; \
-               cp patches/openss*.patch $$RELDIR; \
-               cp patches/crypto-tools.patch $$RELDIR; \
-               cp tools/[!C]* $$RELDIR/tools; \
-               cd ..; \
-               tar cvf $$RELDIR/ocf-linux.tar \
-                                       --exclude=CVS \
-                                       --exclude=.* \
-                                       --exclude=*.o \
-                                       --exclude=*.ko \
-                                       --exclude=*.mod.* \
-                                       --exclude=README* \
-                                       --exclude=ocf-*.patch \
-                                       --exclude=ocf/patches/openss*.patch \
-                                       --exclude=ocf/patches/crypto-tools.patch \
-                                       --exclude=ocf/tools \
-                                       ocf; \
-               gzip -9 $$RELDIR/ocf-linux.tar; \
-               cd /tmp; \
-               tar cvf ocf-linux-$$REL.tar ocf-linux-$$REL; \
-               gzip -9 ocf-linux-$$REL.tar; \
-               cd $$CURDIR/../../user; \
-               rm -rf /tmp/crypto-tools-$$REL*; \
-               tar cvf /tmp/crypto-tools-$$REL.tar \
-                                       --exclude=CVS \
-                                       --exclude=.* \
-                                       --exclude=*.o \
-                                       --exclude=cryptotest \
-                                       --exclude=cryptokeytest \
-                                       crypto-tools; \
-               gzip -9 /tmp/crypto-tools-$$REL.tar
-
diff --git a/target/linux/generic-2.4/files/crypto/ocf/README b/target/linux/generic-2.4/files/crypto/ocf/README
deleted file mode 100644 (file)
index 5ac39f7..0000000
+++ /dev/null
@@ -1,167 +0,0 @@
-README - ocf-linux-20100325
----------------------------
-
-This README provides instructions for getting ocf-linux compiled and
-operating in a generic linux environment.  For other information you
-might like to visit the home page for this project:
-
-    http://ocf-linux.sourceforge.net/
-
-Adding OCF to linux
--------------------
-
-    Not much in this file for now,  just some notes.  I usually build
-    the ocf support as modules but it can be built into the kernel as
-    well.  To use it:
-
-    * mknod /dev/crypto c 10 70
-
-    * to add OCF to your kernel source,  you have two options.  Apply
-      the kernel specific patch:
-
-          cd linux-2.4*; gunzip < ocf-linux-24-XXXXXXXX.patch.gz | patch -p1
-          cd linux-2.6*; gunzip < ocf-linux-26-XXXXXXXX.patch.gz | patch -p1
-    
-      if you do one of the above,  then you can proceed to the next step,
-      or you can do the above process by hand with using the patches against
-      linux-2.4.35 and 2.6.33 to include the ocf code under crypto/ocf.
-      Here's how to add it:
-
-      for 2.4.35 (and later)
-
-          cd linux-2.4.35/crypto
-          tar xvzf ocf-linux.tar.gz
-          cd ..
-          patch -p1 < crypto/ocf/patches/linux-2.4.35-ocf.patch
-
-      for 2.6.23 (and later),  find the kernel patch specific (or nearest)
-      to your kernel versions and then:
-
-          cd linux-2.6.NN/crypto
-          tar xvzf ocf-linux.tar.gz
-          cd ..
-          patch -p1 < crypto/ocf/patches/linux-2.6.NN-ocf.patch
-
-      It should be easy to take this patch and apply it to other more
-      recent versions of the kernels.  The same patches should also work
-      relatively easily on kernels as old as 2.6.11 and 2.4.18.
-      
-    * under 2.4 if you are on a non-x86 platform,  you may need to:
-
-        cp linux-2.X.x/include/asm-i386/kmap_types.h linux-2.X.x/include/asm-YYY
-
-      so that you can build the kernel crypto support needed for the cryptosoft
-      driver.
-
-    * For simplicity you should enable all the crypto support in your kernel
-      except for the test driver.  Likewise for the OCF options.  Do not
-      enable OCF crypto drivers for HW that you do not have (for example
-      ixp4xx will not compile on non-Xscale systems).
-
-    * make sure that cryptodev.h (from ocf-linux.tar.gz) is installed as
-      crypto/cryptodev.h in an include directory that is used for building
-      applications for your platform.  For example on a host system that
-      might be:
-
-              /usr/include/crypto/cryptodev.h
-
-    * patch your openssl-0.9.8n code with the openssl-0.9.8n.patch.
-      (NOTE: there is no longer a need to patch ssh). The patch is against:
-      openssl-0_9_8e
-
-      If you need a patch for an older version of openssl,  you should look
-      to older OCF releases.  This patch is unlikely to work on older
-      openssl versions.
-
-      openssl-0.9.8n.patch
-                - enables --with-cryptodev for non BSD systems
-                - adds -cpu option to openssl speed for calculating CPU load
-                  under linux
-                - fixes null pointer in openssl speed multi thread output.
-                - fixes test keys to work with linux crypto's more stringent
-                  key checking.
-                - adds MD5/SHA acceleration (Ronen Shitrit), only enabled
-                  with the --with-cryptodev-digests option
-                - fixes bug in engine code caching.
-
-    * build crypto-tools-XXXXXXXX.tar.gz if you want to try some of the BSD
-      tools for testing OCF (ie., cryptotest).
-
-How to load the OCF drivers
----------------------------
-
-    First insert the base modules:
-
-        insmod ocf
-        insmod cryptodev
-
-    You can then install the software OCF driver with:
-
-        insmod cryptosoft
-
-    and one or more of the OCF HW drivers with:
-
-        insmod safe
-        insmod hifn7751
-        insmod ixp4xx
-        ...
-
-    all the drivers take a debug option to enable verbose debug so that
-    you can see what is going on.  For debug you load them as:
-
-        insmod ocf crypto_debug=1
-        insmod cryptodev cryptodev_debug=1
-        insmod cryptosoft swcr_debug=1
-
-    You may load more than one OCF crypto driver but then there is no guarantee
-    as to which will be used.
-
-    You can also enable debug at run time on 2.6 systems with the following:
-
-        echo 1 > /sys/module/ocf/parameters/crypto_debug
-        echo 1 > /sys/module/cryptodev/parameters/cryptodev_debug
-        echo 1 > /sys/module/cryptosoft/parameters/swcr_debug
-        echo 1 > /sys/module/hifn7751/parameters/hifn_debug
-        echo 1 > /sys/module/safe/parameters/safe_debug
-        echo 1 > /sys/module/ixp4xx/parameters/ixp_debug
-        ...
-
-Testing the OCF support
------------------------
-
-    run "cryptotest",  it should do a short test for a couple of
-    des packets.  If it does everything is working.
-
-    If this works,  then ssh will use the driver when invoked as:
-
-        ssh -c 3des username@host
-
-    to see for sure that it is operating, enable debug as defined above.
-
-    To get a better idea of performance run:
-
-        cryptotest 100 4096
-
-    There are more options to cryptotest,  see the help.
-
-    It is also possible to use openssl to test the speed of the crypto
-    drivers.
-
-        openssl speed -evp des -engine cryptodev -elapsed
-        openssl speed -evp des3 -engine cryptodev -elapsed
-        openssl speed -evp aes128 -engine cryptodev -elapsed
-
-    and multiple threads (10) with:
-
-        openssl speed -evp des -engine cryptodev -elapsed -multi 10
-        openssl speed -evp des3 -engine cryptodev -elapsed -multi 10
-        openssl speed -evp aes128 -engine cryptodev -elapsed -multi 10
-
-    for public key testing you can try:
-
-        cryptokeytest
-        openssl speed -engine cryptodev rsa -elapsed
-        openssl speed -engine cryptodev dsa -elapsed
-
-David McCullough
-david_mccullough@mcafee.com
diff --git a/target/linux/generic-2.4/files/crypto/ocf/c7108/Makefile b/target/linux/generic-2.4/files/crypto/ocf/c7108/Makefile
deleted file mode 100644 (file)
index e7e634b..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-# for SGlinux builds
--include $(ROOTDIR)/modules/.config
-
-obj-$(CONFIG_OCF_C7108) += aes-7108.o
-
-obj ?= .
-EXTRA_CFLAGS += -I$(obj)/.. -I$(obj)/
-
-ifdef TOPDIR
--include $(TOPDIR)/Rules.make
-endif
-
diff --git a/target/linux/generic-2.4/files/crypto/ocf/c7108/aes-7108.c b/target/linux/generic-2.4/files/crypto/ocf/c7108/aes-7108.c
deleted file mode 100644 (file)
index a5ac054..0000000
+++ /dev/null
@@ -1,839 +0,0 @@
-/*
- * Copyright (C) 2006 Micronas USA
- *
- * 1. Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- *
- * Effort sponsored in part by the Defense Advanced Research Projects
- * Agency (DARPA) and Air Force Research Laboratory, Air Force
- * Materiel Command, USAF, under agreement number F30602-01-2-0537.
- *
- */
-
-//#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/list.h>
-#include <linux/slab.h>
-#include <linux/sched.h>
-#include <linux/wait.h>
-#include <linux/crypto.h>
-#include <linux/mm.h>
-#include <linux/skbuff.h>
-#include <linux/random.h>
-#include <asm/io.h>
-#include <asm/delay.h>
-//#include <asm/scatterlist.h>
-#include <linux/scatterlist.h>
-#include <linux/dma-mapping.h>
-#include <linux/highmem.h>
-#include <cryptodev.h>
-#include <uio.h>
-#include <aes-7108.h>
-
-/* Runtime mode */
-static int c7108_crypto_mode = C7108_AES_CTRL_MODE_CTR;
-//static int c7108_crypto_mode = C7108_AES_CTRL_MODE_CBC;
-
-static int32_t c7108_id = -1;
-static struct cipher_7108 **c7108_sessions = NULL;
-static u_int32_t c7108_sesnum = 0;
-static unsigned long iobar;
-
-/* Crypto entry points */
-static int c7108_process(void *, struct cryptop *, int);
-static int c7108_newsession(void *, u_int32_t *, struct cryptoini *);
-static int c7108_freesession(void *, u_int64_t);
-
-/* Globals */
-static int debug = 0;
-static spinlock_t csr_mutex;
-
-/* Generic controller-based lock */
-#define AES_LOCK()\
-          spin_lock(&csr_mutex)
-#define AES_UNLOCK()\
-          spin_unlock(&csr_mutex)
-
-/* 7108 AES register access */
-#define c7108_reg_wr8(a,d)   iowrite8(d, (void*)(iobar+(a)))
-#define c7108_reg_wr16(a,d)  iowrite16(d, (void*)(iobar+(a)))
-#define c7108_reg_wr32(a,d)  iowrite32(d, (void*)(iobar+(a)))
-#define c7108_reg_rd8(a)     ioread8((void*)(iobar+(a)))
-#define c7108_reg_rd16(a)    ioread16((void*)(iobar+(a)))
-#define c7108_reg_rd32(a)    ioread32((void*)(iobar+(a)))
-
-static int 
-c7108_xlate_key(int klen, u8* k8ptr, u32* k32ptr)
-{
-        int i, nw=0;
-       nw = ((klen >= 256) ? 8 : (klen >= 192) ? 6 : 4);
-       for ( i = 0; i < nw; i++) { 
-           k32ptr[i] =    (k8ptr[i+3] << 24) | (k8ptr[i+2] << 16) | 
-                          (k8ptr[i+1] << 8)  | k8ptr[i];
-           
-       }
-       return 0;
-}
-
-static int 
-c7108_cache_key(int klen, u32* k32ptr, u8* k8ptr)
-{
-        int i, nb=0;
-       u8* ptr = (u8*)k32ptr;
-       nb = ((klen >= 256) ? 32 : (klen >= 192) ? 24 : 16);
-       for ( i = 0; i < nb; i++)
-           k8ptr[i] = ptr[i];
-       return 0;
-}
-
-static int
-c7108_aes_setup_dma(u32 src, u32 dst, u32 len)
-{
-        if (len < 16) {
-           printk("len < 16\n");
-           return -10;
-       }
-       if (len % 16) {
-           printk("len not multiple of 16\n");
-           return -11;
-       }       
-       c7108_reg_wr16(C7108_AES_DMA_SRC0_LO, (u16) src);
-       c7108_reg_wr16(C7108_AES_DMA_SRC0_HI, (u16)((src & 0xffff0000) >> 16));
-       c7108_reg_wr16(C7108_AES_DMA_DST0_LO, (u16) dst);
-       c7108_reg_wr16(C7108_AES_DMA_DST0_HI, (u16)((dst & 0xffff0000) >> 16));
-       c7108_reg_wr16(C7108_AES_DMA_LEN, (u16) ((len / 16) - 1));
-
-       return 0;
-}
-
-static int
-c7108_aes_set_hw_iv(u8 iv[16])
-{
-        c7108_reg_wr16(C7108_AES_IV0_LO, (u16) ((iv[1] << 8) | iv[0]));
-       c7108_reg_wr16(C7108_AES_IV0_HI, (u16) ((iv[3] << 8) | iv[2]));
-       c7108_reg_wr16(C7108_AES_IV1_LO, (u16) ((iv[5] << 8) | iv[4]));
-       c7108_reg_wr16(C7108_AES_IV1_HI, (u16) ((iv[7] << 8) | iv[6]));
-       c7108_reg_wr16(C7108_AES_IV2_LO, (u16) ((iv[9] << 8) | iv[8]));
-       c7108_reg_wr16(C7108_AES_IV2_HI, (u16) ((iv[11] << 8) | iv[10]));
-       c7108_reg_wr16(C7108_AES_IV3_LO, (u16) ((iv[13] << 8) | iv[12]));
-       c7108_reg_wr16(C7108_AES_IV3_HI, (u16) ((iv[15] << 8) | iv[14]));
-
-    return 0;
-}
-
-static void
-c7108_aes_read_dkey(u32 * dkey)
-{
-        dkey[0] = (c7108_reg_rd16(C7108_AES_EKEY0_HI) << 16) | 
-                  c7108_reg_rd16(C7108_AES_EKEY0_LO);
-       dkey[1] = (c7108_reg_rd16(C7108_AES_EKEY1_HI) << 16) | 
-                  c7108_reg_rd16(C7108_AES_EKEY1_LO);
-       dkey[2] = (c7108_reg_rd16(C7108_AES_EKEY2_HI) << 16) | 
-                  c7108_reg_rd16(C7108_AES_EKEY2_LO);
-       dkey[3] = (c7108_reg_rd16(C7108_AES_EKEY3_HI) << 16) | 
-                  c7108_reg_rd16(C7108_AES_EKEY3_LO);
-       dkey[4] = (c7108_reg_rd16(C7108_AES_EKEY4_HI) << 16) | 
-                   c7108_reg_rd16(C7108_AES_EKEY4_LO);
-       dkey[5] = (c7108_reg_rd16(C7108_AES_EKEY5_HI) << 16) | 
-                   c7108_reg_rd16(C7108_AES_EKEY5_LO);
-       dkey[6] = (c7108_reg_rd16(C7108_AES_EKEY6_HI) << 16) | 
-                   c7108_reg_rd16(C7108_AES_EKEY6_LO);
-       dkey[7] = (c7108_reg_rd16(C7108_AES_EKEY7_HI) << 16) | 
-                   c7108_reg_rd16(C7108_AES_EKEY7_LO);
-}
-
-static int
-c7108_aes_cipher(int op,
-                u32 dst,
-                u32 src,
-                u32 len,
-                int klen,
-                u16 mode,
-                u32 key[8],
-                u8 iv[16])
-{
-        int rv = 0, cnt=0;
-       u16 ctrl = 0, stat = 0;
-
-       AES_LOCK();
-
-       /* Setup key length */
-       if (klen == 128) {
-           ctrl |= C7108_AES_KEY_LEN_128;
-       } else if (klen == 192) {
-           ctrl |= C7108_AES_KEY_LEN_192;
-       } else if (klen == 256) {
-           ctrl |= C7108_AES_KEY_LEN_256;
-       } else {
-           AES_UNLOCK();
-           return -3;
-       }
-       
-       /* Check opcode */
-       if (C7108_AES_ENCRYPT == op) {
-           ctrl |= C7108_AES_ENCRYPT;
-       } else if (C7108_AES_DECRYPT == op) {
-           ctrl |= C7108_AES_DECRYPT;
-       } else {
-           AES_UNLOCK();
-           return -4;
-       }
-       
-       /* check mode */
-       if ( (mode != C7108_AES_CTRL_MODE_CBC) &&
-            (mode != C7108_AES_CTRL_MODE_CFB) &&
-            (mode != C7108_AES_CTRL_MODE_OFB) &&
-            (mode != C7108_AES_CTRL_MODE_CTR) && 
-            (mode != C7108_AES_CTRL_MODE_ECB) ) { 
-           AES_UNLOCK();           
-           return -5;
-       }
-       
-       /* Now set mode */
-       ctrl |= mode;
-       
-       /* For CFB, OFB, and CTR, neither backward key
-        * expansion nor key inversion is required.
-        */
-       if ( (C7108_AES_DECRYPT == op) &&  
-            (C7108_AES_CTRL_MODE_CBC == mode ||
-             C7108_AES_CTRL_MODE_ECB == mode ) ){ 
-
-           /* Program Key */
-           c7108_reg_wr16(C7108_AES_KEY0_LO, (u16) key[4]);
-           c7108_reg_wr16(C7108_AES_KEY0_HI, (u16) (key[4] >> 16));
-           c7108_reg_wr16(C7108_AES_KEY1_LO, (u16) key[5]);
-           c7108_reg_wr16(C7108_AES_KEY1_HI, (u16) (key[5] >> 16));
-           c7108_reg_wr16(C7108_AES_KEY2_LO, (u16) key[6]);
-           c7108_reg_wr16(C7108_AES_KEY2_HI, (u16) (key[6] >> 16));
-           c7108_reg_wr16(C7108_AES_KEY3_LO, (u16) key[7]);
-           c7108_reg_wr16(C7108_AES_KEY3_HI, (u16) (key[7] >> 16));
-           c7108_reg_wr16(C7108_AES_KEY6_LO, (u16) key[2]);
-           c7108_reg_wr16(C7108_AES_KEY6_HI, (u16) (key[2] >> 16));
-           c7108_reg_wr16(C7108_AES_KEY7_LO, (u16) key[3]);
-           c7108_reg_wr16(C7108_AES_KEY7_HI, (u16) (key[3] >> 16));
-           
-           
-           if (192 == klen) { 
-               c7108_reg_wr16(C7108_AES_KEY4_LO, (u16) key[7]);
-               c7108_reg_wr16(C7108_AES_KEY4_HI, (u16) (key[7] >> 16));
-               c7108_reg_wr16(C7108_AES_KEY5_LO, (u16) key[7]);
-               c7108_reg_wr16(C7108_AES_KEY5_HI, (u16) (key[7] >> 16));
-               
-           } else if (256 == klen) {
-               /* 256 */
-               c7108_reg_wr16(C7108_AES_KEY4_LO, (u16) key[0]);
-               c7108_reg_wr16(C7108_AES_KEY4_HI, (u16) (key[0] >> 16));
-               c7108_reg_wr16(C7108_AES_KEY5_LO, (u16) key[1]);
-               c7108_reg_wr16(C7108_AES_KEY5_HI, (u16) (key[1] >> 16));
-               
-           }
-           
-       } else { 
-           /* Program Key */
-           c7108_reg_wr16(C7108_AES_KEY0_LO, (u16) key[0]);
-           c7108_reg_wr16(C7108_AES_KEY0_HI, (u16) (key[0] >> 16));
-           c7108_reg_wr16(C7108_AES_KEY1_LO, (u16) key[1]);
-           c7108_reg_wr16(C7108_AES_KEY1_HI, (u16) (key[1] >> 16));
-           c7108_reg_wr16(C7108_AES_KEY2_LO, (u16) key[2]);
-           c7108_reg_wr16(C7108_AES_KEY2_HI, (u16) (key[2] >> 16));
-           c7108_reg_wr16(C7108_AES_KEY3_LO, (u16) key[3]);
-           c7108_reg_wr16(C7108_AES_KEY3_HI, (u16) (key[3] >> 16));
-           c7108_reg_wr16(C7108_AES_KEY4_LO, (u16) key[4]);
-           c7108_reg_wr16(C7108_AES_KEY4_HI, (u16) (key[4] >> 16));
-           c7108_reg_wr16(C7108_AES_KEY5_LO, (u16) key[5]);
-           c7108_reg_wr16(C7108_AES_KEY5_HI, (u16) (key[5] >> 16));
-           c7108_reg_wr16(C7108_AES_KEY6_LO, (u16) key[6]);
-           c7108_reg_wr16(C7108_AES_KEY6_HI, (u16) (key[6] >> 16));
-           c7108_reg_wr16(C7108_AES_KEY7_LO, (u16) key[7]);
-           c7108_reg_wr16(C7108_AES_KEY7_HI, (u16) (key[7] >> 16));
-           
-       }
-       
-       /* Set IV always */
-       c7108_aes_set_hw_iv(iv);
-       
-       /* Program DMA addresses */
-       if ((rv = c7108_aes_setup_dma(src, dst, len)) < 0) { 
-           AES_UNLOCK();
-           return rv;
-       }
-
-       
-       /* Start AES cipher */
-       c7108_reg_wr16(C7108_AES_CTRL, ctrl | C7108_AES_GO);
-       
-       //printk("Ctrl: 0x%x\n", ctrl | C7108_AES_GO);
-       do {
-           /* TODO: interrupt mode */
-           //        printk("aes_stat=0x%x\n", stat);
-           //udelay(100);
-       } while ((cnt++ < 1000000) && 
-                !((stat=c7108_reg_rd16(C7108_AES_CTRL))&C7108_AES_OP_DONE));
-
-
-       if ((mode == C7108_AES_CTRL_MODE_ECB)||
-           (mode == C7108_AES_CTRL_MODE_CBC)) { 
-           /* Save out key when the lock is held ... */
-           c7108_aes_read_dkey(key);
-       }
-       
-       AES_UNLOCK();
-       return 0;
-       
-}
-
-/*
- * Generate a new crypto device session.
- */
-static int
-c7108_newsession(void *arg, u_int32_t *sid, struct cryptoini *cri)
-{
-       struct cipher_7108 **swd;
-       u_int32_t i;
-       char *algo;
-       int mode, xfm_type;
-
-       dprintk("%s()\n", __FUNCTION__);
-       if (sid == NULL || cri == NULL) {
-               dprintk("%s,%d - EINVAL\n", __FILE__, __LINE__);
-               return EINVAL;
-       }
-
-       if (c7108_sessions) {
-               for (i = 1; i < c7108_sesnum; i++)
-                       if (c7108_sessions[i] == NULL)
-                               break;
-       } else
-               i = 1;          /* NB: to silence compiler warning */
-
-       if (c7108_sessions == NULL || i == c7108_sesnum) {
-           if (c7108_sessions == NULL) {
-               i = 1; /* We leave c7108_sessions[0] empty */
-               c7108_sesnum = CRYPTO_SW_SESSIONS;
-           } else
-               c7108_sesnum *= 2;
-           
-           swd = kmalloc(c7108_sesnum * sizeof(struct cipher_7108 *), 
-                         GFP_ATOMIC);
-           if (swd == NULL) {
-               /* Reset session number */
-               if (c7108_sesnum == CRYPTO_SW_SESSIONS)
-                   c7108_sesnum = 0;
-               else
-                   c7108_sesnum /= 2;
-               dprintk("%s,%d: ENOBUFS\n", __FILE__, __LINE__);
-               return ENOBUFS;
-           }
-           memset(swd, 0, c7108_sesnum * sizeof(struct cipher_7108 *));
-           
-           /* Copy existing sessions */
-           if (c7108_sessions) {
-               memcpy(swd, c7108_sessions,
-                      (c7108_sesnum / 2) * sizeof(struct cipher_7108 *));
-               kfree(c7108_sessions);
-           }
-           
-           c7108_sessions = swd;
-
-       }
-       
-       swd = &c7108_sessions[i];
-       *sid = i;
-
-       while (cri) {
-               *swd = (struct cipher_7108 *) 
-                   kmalloc(sizeof(struct cipher_7108), GFP_ATOMIC);
-               if (*swd == NULL) {
-                   c7108_freesession(NULL, i);
-                   dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
-                   return ENOBUFS;
-               }
-               memset(*swd, 0, sizeof(struct cipher_7108));
-
-               algo = NULL;
-               mode = 0;
-               xfm_type = HW_TYPE_CIPHER;
-
-               switch (cri->cri_alg) {
-
-               case CRYPTO_AES_CBC:
-                       algo = "aes";
-                       mode = CRYPTO_TFM_MODE_CBC;
-                       c7108_crypto_mode = C7108_AES_CTRL_MODE_CBC;
-                       break;
-#if 0
-               case CRYPTO_AES_CTR:
-                       algo = "aes_ctr";
-                       mode = CRYPTO_TFM_MODE_CBC;
-                       c7108_crypto_mode = C7108_AES_CTRL_MODE_CTR;
-                       break;
-               case CRYPTO_AES_ECB:
-                       algo = "aes_ecb";
-                       mode = CRYPTO_TFM_MODE_CBC;
-                       c7108_crypto_mode = C7108_AES_CTRL_MODE_ECB;
-                       break;
-               case CRYPTO_AES_OFB:
-                       algo = "aes_ofb";
-                       mode = CRYPTO_TFM_MODE_CBC;
-                       c7108_crypto_mode = C7108_AES_CTRL_MODE_OFB;
-                       break;
-               case CRYPTO_AES_CFB:
-                       algo = "aes_cfb";
-                       mode = CRYPTO_TFM_MODE_CBC;
-                       c7108_crypto_mode = C7108_AES_CTRL_MODE_CFB;
-                       break;
-#endif
-               default:
-                       printk("unsupported crypto algorithm: %d\n", 
-                              cri->cri_alg);
-                       return -EINVAL;
-                       break;
-               }
-
-
-               if (!algo || !*algo) {
-                   printk("cypher_7108_crypto: Unknown algo 0x%x\n", 
-                          cri->cri_alg);
-                   c7108_freesession(NULL, i);
-                   return EINVAL;
-               }
-               
-               if (xfm_type == HW_TYPE_CIPHER) {
-                   if (debug) {
-                       dprintk("%s key:", __FUNCTION__);
-                       for (i = 0; i < (cri->cri_klen + 7) / 8; i++)
-                           dprintk("%s0x%02x", (i % 8) ? " " : "\n    ",
-                                   cri->cri_key[i]);
-                       dprintk("\n");
-                   }
-
-               } else if (xfm_type == SW_TYPE_HMAC || 
-                          xfm_type == SW_TYPE_HASH) {
-                   printk("cypher_7108_crypto: HMAC unsupported!\n");
-                   return -EINVAL;
-                   c7108_freesession(NULL, i);
-               } else {
-                   printk("cypher_7108_crypto: "
-                          "Unhandled xfm_type %d\n", xfm_type);
-                   c7108_freesession(NULL, i);
-                   return EINVAL;
-               }
-               
-               (*swd)->cri_alg = cri->cri_alg;
-               (*swd)->xfm_type = xfm_type;
-               
-               cri = cri->cri_next;
-               swd = &((*swd)->next);
-       }
-       return 0;
-}
-
-/*
- * Free a session.
- */
-static int
-c7108_freesession(void *arg, u_int64_t tid)
-{
-       struct cipher_7108 *swd;
-       u_int32_t sid = CRYPTO_SESID2LID(tid);
-
-       dprintk("%s()\n", __FUNCTION__);
-       if (sid > c7108_sesnum || c7108_sessions == NULL ||
-                       c7108_sessions[sid] == NULL) {
-               dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
-               return(EINVAL);
-       }
-
-       /* Silently accept and return */
-       if (sid == 0)
-               return(0);
-
-       while ((swd = c7108_sessions[sid]) != NULL) {
-               c7108_sessions[sid] = swd->next;
-               kfree(swd);
-       }
-       return 0;
-}
-
-/*
- * Process a hardware request.
- */
-static int
-c7108_process(void *arg, struct cryptop *crp, int hint)
-{
-       struct cryptodesc *crd;
-       struct cipher_7108 *sw;
-       u_int32_t lid;
-       int type;
-       u32 hwkey[8];
-
-#define SCATTERLIST_MAX 16
-       struct scatterlist sg[SCATTERLIST_MAX];
-       int sg_num, sg_len, skip;
-       struct sk_buff *skb = NULL;
-       struct uio *uiop = NULL;
-
-       dprintk("%s()\n", __FUNCTION__);
-       /* Sanity check */
-       if (crp == NULL) {
-               dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
-               return EINVAL;
-       }
-
-       crp->crp_etype = 0;
-
-       if (crp->crp_desc == NULL || crp->crp_buf == NULL) {
-               dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
-               crp->crp_etype = EINVAL;
-               goto done;
-       }
-
-       lid = crp->crp_sid & 0xffffffff;
-       if (lid >= c7108_sesnum || lid == 0 || c7108_sessions == NULL ||
-                       c7108_sessions[lid] == NULL) {
-               crp->crp_etype = ENOENT;
-               dprintk("%s,%d: ENOENT\n", __FILE__, __LINE__);
-               goto done;
-       }
-
-       /*
-        * do some error checking outside of the loop for SKB and IOV
-        * processing this leaves us with valid skb or uiop pointers
-        * for later
-        */
-       if (crp->crp_flags & CRYPTO_F_SKBUF) {
-               skb = (struct sk_buff *) crp->crp_buf;
-               if (skb_shinfo(skb)->nr_frags >= SCATTERLIST_MAX) {
-                       printk("%s,%d: %d nr_frags > SCATTERLIST_MAX", 
-                              __FILE__, __LINE__,
-                              skb_shinfo(skb)->nr_frags);
-                       goto done;
-               }
-       } else if (crp->crp_flags & CRYPTO_F_IOV) {
-               uiop = (struct uio *) crp->crp_buf;
-               if (uiop->uio_iovcnt > SCATTERLIST_MAX) {
-                       printk("%s,%d: %d uio_iovcnt > SCATTERLIST_MAX", 
-                              __FILE__, __LINE__,
-                              uiop->uio_iovcnt);
-                       goto done;
-               }
-       }
-
-       /* Go through crypto descriptors, processing as we go */
-       for (crd = crp->crp_desc; crd; crd = crd->crd_next) {
-           /*
-            * Find the crypto context.
-            *
-            * XXX Note that the logic here prevents us from having
-            * XXX the same algorithm multiple times in a session
-            * XXX (or rather, we can but it won't give us the right
-            * XXX results). To do that, we'd need some way of differentiating
-            * XXX between the various instances of an algorithm (so we can
-            * XXX locate the correct crypto context).
-            */
-           for (sw = c7108_sessions[lid]; 
-                sw && sw->cri_alg != crd->crd_alg;
-                sw = sw->next)
-               ;
-           
-           /* No such context ? */
-           if (sw == NULL) {
-               crp->crp_etype = EINVAL;
-               dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
-               goto done;
-           }
-           
-           skip = crd->crd_skip;
-           
-           /*
-            * setup the SG list skip from the start of the buffer
-            */
-           memset(sg, 0, sizeof(sg));
-           if (crp->crp_flags & CRYPTO_F_SKBUF) {
-               int i, len;
-               type = CRYPTO_BUF_SKBUF;
-               
-               sg_num = 0;
-               sg_len = 0;
-
-               if (skip < skb_headlen(skb)) {
-                   //sg[sg_num].page   = virt_to_page(skb->data + skip);
-                       //sg[sg_num].offset = offset_in_page(skb->data + skip);
-                   len = skb_headlen(skb) - skip;
-                   if (len + sg_len > crd->crd_len)
-                       len = crd->crd_len - sg_len;
-                   //sg[sg_num].length = len;
-                   sg_set_page(&sg[sg_num], virt_to_page(skb->data + skip), len, offset_in_page(skb->data + skip));
-                       sg_len += sg[sg_num].length;
-                   sg_num++;
-                   skip = 0;
-               } else
-                   skip -= skb_headlen(skb);
-               
-               for (i = 0; sg_len < crd->crd_len &&
-                        i < skb_shinfo(skb)->nr_frags &&
-                        sg_num < SCATTERLIST_MAX; i++) {
-                   if (skip < skb_shinfo(skb)->frags[i].size) {
-                       //sg[sg_num].page   = skb_shinfo(skb)->frags[i].page;
-                       //sg[sg_num].offset = skb_shinfo(skb)->frags[i].page_offset + skip;
-                       len = skb_shinfo(skb)->frags[i].size - skip;
-                       if (len + sg_len > crd->crd_len)
-                           len = crd->crd_len - sg_len;
-                       //sg[sg_num].length = len;
-                       sg_set_page(&sg[sg_num], skb_shinfo(skb)->frags[i].page, len, skb_shinfo(skb)->frags[i].page_offset + skip);
-                       sg_len += sg[sg_num].length;
-                       sg_num++;
-                       skip = 0;
-                   } else
-                       skip -= skb_shinfo(skb)->frags[i].size;
-               }
-           } else if (crp->crp_flags & CRYPTO_F_IOV) {
-               int len;
-               type = CRYPTO_BUF_IOV;
-               sg_len = 0;
-               for (sg_num = 0; sg_len < crd->crd_len &&
-                        sg_num < uiop->uio_iovcnt &&
-                        sg_num < SCATTERLIST_MAX; sg_num++) {
-                   if (skip < uiop->uio_iov[sg_num].iov_len) {
-                       //sg[sg_num].page   =                       virt_to_page(uiop->uio_iov[sg_num].iov_base+skip);
-                       //sg[sg_num].offset =                      offset_in_page(uiop->uio_iov[sg_num].iov_base+skip);
-                       len = uiop->uio_iov[sg_num].iov_len - skip;
-                       if (len + sg_len > crd->crd_len)
-                           len = crd->crd_len - sg_len;
-                       //sg[sg_num].length = len;
-                       sg_set_page(&sg[sg_num], virt_to_page(uiop->uio_iov[sg_num].iov_base+skip), len, offset_in_page(uiop->uio_iov[sg_num].iov_base+skip));
-                       sg_len += sg[sg_num].length;
-                       skip = 0;
-                   } else 
-                       skip -= uiop->uio_iov[sg_num].iov_len;
-               }
-           } else {
-               type = CRYPTO_BUF_CONTIG;
-               //sg[0].page   = virt_to_page(crp->crp_buf + skip);
-               //sg[0].offset = offset_in_page(crp->crp_buf + skip);
-               sg_len = (crp->crp_ilen - skip);
-               if (sg_len > crd->crd_len)
-                   sg_len = crd->crd_len;
-               //sg[0].length = sg_len;
-               sg_set_page(&sg[0], virt_to_page(crp->crp_buf + skip), sg_len, offset_in_page(crp->crp_buf + skip));
-               sg_num = 1;
-           }
-           
-           
-           switch (sw->xfm_type) {
-
-           case HW_TYPE_CIPHER: {
-
-               unsigned char iv[64];
-               unsigned char *ivp = iv;
-               int i;
-               int ivsize = 16;    /* fixed for AES */
-               int blocksize = 16; /* fixed for AES */
-
-               if (sg_len < blocksize) {
-                   crp->crp_etype = EINVAL;
-                   dprintk("%s,%d: EINVAL len %d < %d\n", 
-                           __FILE__, __LINE__,
-                           sg_len, 
-                           blocksize);
-                   goto done;
-               }
-               
-               if (ivsize > sizeof(iv)) {
-                   crp->crp_etype = EINVAL;
-                   dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
-                   goto done;
-               }
-               
-               if (crd->crd_flags & CRD_F_ENCRYPT) { /* encrypt */
-                   
-                   if (crd->crd_flags & CRD_F_IV_EXPLICIT) {
-                       ivp = crd->crd_iv;
-                   } else {
-                       get_random_bytes(ivp, ivsize);
-                   }
-                   /*
-                    * do we have to copy the IV back to the buffer ?
-                    */
-                   if ((crd->crd_flags & CRD_F_IV_PRESENT) == 0) {
-                           crypto_copyback(crp->crp_buf,
-                                         crd->crd_inject,
-                                         ivsize,
-                                         (caddr_t)ivp);
-                   }
-
-                   c7108_xlate_key(crd->crd_klen,
-                                   (u8*)crd->crd_key, (u32*)hwkey);
-
-                   /* Encrypt SG list */
-                   for (i = 0; i < sg_num; i++) { 
-                       sg[i].dma_address = 
-                           dma_map_single(NULL, 
-                                          kmap(sg_page(&sg[i])) + sg[i].offset, sg_len, DMA_BIDIRECTIONAL);
-#if 0                                                     
-                       printk("sg[%d]:0x%08x, off 0x%08x "
-                              "kmap 0x%08x phys 0x%08x\n", 
-                              i, sg[i].page, sg[i].offset,
-                              kmap(sg[i].page) + sg[i].offset,
-                              sg[i].dma_address);
-#endif
-                       c7108_aes_cipher(C7108_AES_ENCRYPT,
-                                        sg[i].dma_address,
-                                        sg[i].dma_address,
-                                        sg_len,
-                                        crd->crd_klen,
-                                        c7108_crypto_mode,
-                                        hwkey,
-                                        ivp);
-
-                       if ((c7108_crypto_mode == C7108_AES_CTRL_MODE_CBC)||
-                           (c7108_crypto_mode == C7108_AES_CTRL_MODE_ECB)) { 
-                           /* Read back expanded key and cache it in key
-                            * context.
-                            * NOTE: for ECB/CBC modes only (not CTR, CFB, OFB)
-                            *       where you set the key once.
-                            */
-                           c7108_cache_key(crd->crd_klen, 
-                                           (u32*)hwkey, (u8*)crd->crd_key);
-#if 0
-                           printk("%s expanded key:", __FUNCTION__);
-                           for (i = 0; i < (crd->crd_klen + 7) / 8; i++)
-                               printk("%s0x%02x", (i % 8) ? " " : "\n    ",
-                                      crd->crd_key[i]);
-                           printk("\n");
-#endif
-                       }
-                   }
-               }
-               else { /*decrypt */
-
-                   if (crd->crd_flags & CRD_F_IV_EXPLICIT) {
-                       ivp = crd->crd_iv;
-                   } else {
-                       crypto_copydata(crp->crp_buf, crd->crd_inject,
-                                 ivsize, (caddr_t)ivp);
-                   }
-
-                   c7108_xlate_key(crd->crd_klen,
-                                   (u8*)crd->crd_key, (u32*)hwkey);
-
-                   /* Decrypt SG list */
-                   for (i = 0; i < sg_num; i++) { 
-                       sg[i].dma_address = 
-                           dma_map_single(NULL, 
-                                          kmap(sg_page(&sg[i])) + sg[i].offset,
-                                          sg_len, DMA_BIDIRECTIONAL);
-
-#if 0
-                       printk("sg[%d]:0x%08x, off 0x%08x "
-                              "kmap 0x%08x phys 0x%08x\n", 
-                              i, sg[i].page, sg[i].offset,
-                              kmap(sg[i].page) + sg[i].offset,
-                              sg[i].dma_address);
-#endif
-                       c7108_aes_cipher(C7108_AES_DECRYPT,
-                                        sg[i].dma_address,
-                                        sg[i].dma_address,
-                                        sg_len,
-                                        crd->crd_klen,
-                                        c7108_crypto_mode,
-                                        hwkey,
-                                        ivp);
-                   }
-               }
-           } break;
-           case SW_TYPE_HMAC:
-           case SW_TYPE_HASH:
-               crp->crp_etype = EINVAL;
-               goto done;
-               break;
-               
-           case SW_TYPE_COMP:
-               crp->crp_etype = EINVAL;
-               goto done;
-               break;
-               
-           default:
-               /* Unknown/unsupported algorithm */
-               dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
-               crp->crp_etype = EINVAL;
-               goto done;
-           }
-       }
-       
-done:
-       crypto_done(crp);
-       return 0;
-}
-
-static struct {                                                                                                                 
-       softc_device_decl sc_dev;                                                                                               
-} a7108dev;
-
-static device_method_t a7108_methods = {                                                                                          
-/* crypto device methods */                                                                                             
-       DEVMETHOD(cryptodev_newsession, c7108_newsession),                                                                  
-       DEVMETHOD(cryptodev_freesession, c7108_freesession),                                                             
-       DEVMETHOD(cryptodev_process, c7108_process),                                                                     
-       DEVMETHOD(cryptodev_kprocess, NULL) 
-};   
-
-static int
-cypher_7108_crypto_init(void)
-{
-       dprintk("%s(%p)\n", __FUNCTION__, cypher_7108_crypto_init);
-       
-       iobar = (unsigned long)ioremap(CCU_AES_REG_BASE, 0x4000);
-       printk("7108: AES @ 0x%08x (0x%08x phys) %s mode\n", 
-              iobar, CCU_AES_REG_BASE, 
-              c7108_crypto_mode & C7108_AES_CTRL_MODE_CBC ? "CBC" :
-              c7108_crypto_mode & C7108_AES_CTRL_MODE_ECB ? "ECB" : 
-              c7108_crypto_mode & C7108_AES_CTRL_MODE_CTR ? "CTR" : 
-              c7108_crypto_mode & C7108_AES_CTRL_MODE_CFB ? "CFB" : 
-              c7108_crypto_mode & C7108_AES_CTRL_MODE_OFB ? "OFB" : "???");
-       csr_mutex  = SPIN_LOCK_UNLOCKED;
-
-       memset(&a7108dev, 0, sizeof(a7108dev));                                                                                     
-       softc_device_init(&a7108dev, "aes7108", 0, a7108_methods);
-
-               c7108_id = crypto_get_driverid(softc_get_device(&a7108dev), CRYPTOCAP_F_HARDWARE);
-       if (c7108_id < 0)
-               panic("7108: crypto device cannot initialize!");
-
-//     crypto_register(c7108_id, CRYPTO_AES_CBC, 0, 0, c7108_newsession, c7108_freesession, c7108_process, NULL);
-       crypto_register(c7108_id, CRYPTO_AES_CBC, 0, 0);
-
-       return(0);
-}
-
-static void
-cypher_7108_crypto_exit(void)
-{
-       dprintk("%s()\n", __FUNCTION__);
-       crypto_unregister_all(c7108_id);
-       c7108_id = -1;
-}
-
-module_init(cypher_7108_crypto_init);
-module_exit(cypher_7108_crypto_exit);
-
-MODULE_LICENSE("Dual BSD/GPL");
-MODULE_DESCRIPTION("Cypher 7108 Crypto (OCF module for kernel crypto)");
diff --git a/target/linux/generic-2.4/files/crypto/ocf/c7108/aes-7108.h b/target/linux/generic-2.4/files/crypto/ocf/c7108/aes-7108.h
deleted file mode 100644 (file)
index 0c7bfcb..0000000
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (C) 2006 Micronas USA
- *
- * 1. Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- *
- * Effort sponsored in part by the Defense Advanced Research Projects
- * Agency (DARPA) and Air Force Research Laboratory, Air Force
- * Materiel Command, USAF, under agreement number F30602-01-2-0537.
- *
- */
-
-#ifndef __AES_7108_H__
-#define __AES_7108_H__
-
-/* Cypher 7108 AES Controller Hardware */
-#define CCU_REG_BASE       0x1b500000  
-#define CCU_AES_REG_BASE   (CCU_REG_BASE + 0x100)
-#define C7108_AES_KEY0_LO        (0x0000) 
-#define C7108_AES_KEY0_HI        (0x0004) 
-#define C7108_AES_KEY1_LO        (0x0008) 
-#define C7108_AES_KEY1_HI        (0x000c) 
-#define C7108_AES_KEY2_LO        (0x0010) 
-#define C7108_AES_KEY2_HI        (0x0014) 
-#define C7108_AES_KEY3_LO        (0x0018) 
-#define C7108_AES_KEY3_HI        (0x001c) 
-#define C7108_AES_KEY4_LO        (0x0020) 
-#define C7108_AES_KEY4_HI        (0x0024) 
-#define C7108_AES_KEY5_LO        (0x0028) 
-#define C7108_AES_KEY5_HI        (0x002c) 
-#define C7108_AES_KEY6_LO        (0x0030) 
-#define C7108_AES_KEY6_HI        (0x0034) 
-#define C7108_AES_KEY7_LO        (0x0038) 
-#define C7108_AES_KEY7_HI        (0x003c) 
-#define C7108_AES_IV0_LO         (0x0040) 
-#define C7108_AES_IV0_HI         (0x0044) 
-#define C7108_AES_IV1_LO         (0x0048) 
-#define C7108_AES_IV1_HI         (0x004c) 
-#define C7108_AES_IV2_LO         (0x0050) 
-#define C7108_AES_IV2_HI         (0x0054) 
-#define C7108_AES_IV3_LO         (0x0058) 
-#define C7108_AES_IV3_HI         (0x005c) 
-
-#define C7108_AES_DMA_SRC0_LO    (0x0068) /* Bits 0:15 */
-#define C7108_AES_DMA_SRC0_HI    (0x006c) /* Bits 27:16 */
-#define C7108_AES_DMA_DST0_LO    (0x0070) /* Bits 0:15 */
-#define C7108_AES_DMA_DST0_HI    (0x0074) /* Bits 27:16 */
-#define C7108_AES_DMA_LEN        (0x0078)  /*Bytes:(Count+1)x16 */
-
-/* AES/Copy engine control register */
-#define C7108_AES_CTRL           (0x007c) /* AES control */
-#define C7108_AES_CTRL_RS        (1<<0)     /* Which set of src/dst to use */
-
-/* AES Cipher mode, controlled by setting Bits 2:0 */
-#define C7108_AES_CTRL_MODE_CBC     0
-#define C7108_AES_CTRL_MODE_CFB     (1<<0)
-#define C7108_AES_CTRL_MODE_OFB     (1<<1)
-#define C7108_AES_CTRL_MODE_CTR     ((1<<0)|(1<<1))
-#define C7108_AES_CTRL_MODE_ECB     (1<<2)
-
-/* AES Key length , Bits 5:4 */
-#define C7108_AES_KEY_LEN_128         0       /* 00 */
-#define C7108_AES_KEY_LEN_192         (1<<4)  /* 01 */
-#define C7108_AES_KEY_LEN_256         (1<<5)  /* 10 */
-
-/* AES Operation (crypt/decrypt), Bit 3 */
-#define C7108_AES_DECRYPT             (1<<3)   /* Clear for encrypt */
-#define C7108_AES_ENCRYPT              0       
-#define C7108_AES_INTR                (1<<13) /* Set on done trans from 0->1*/
-#define C7108_AES_GO                  (1<<14) /* Run */
-#define C7108_AES_OP_DONE             (1<<15) /* Set when complete */
-
-
-/* Expanded key registers */
-#define C7108_AES_EKEY0_LO            (0x0080)
-#define C7108_AES_EKEY0_HI            (0x0084)
-#define C7108_AES_EKEY1_LO            (0x0088)
-#define C7108_AES_EKEY1_HI            (0x008c)
-#define C7108_AES_EKEY2_LO            (0x0090)
-#define C7108_AES_EKEY2_HI            (0x0094)
-#define C7108_AES_EKEY3_LO            (0x0098)
-#define C7108_AES_EKEY3_HI            (0x009c)
-#define C7108_AES_EKEY4_LO            (0x00a0)
-#define C7108_AES_EKEY4_HI            (0x00a4)
-#define C7108_AES_EKEY5_LO            (0x00a8)
-#define C7108_AES_EKEY5_HI            (0x00ac)
-#define C7108_AES_EKEY6_LO            (0x00b0)
-#define C7108_AES_EKEY6_HI            (0x00b4)
-#define C7108_AES_EKEY7_LO            (0x00b8)
-#define C7108_AES_EKEY7_HI            (0x00bc)
-#define C7108_AES_OK                  (0x00fc) /* Reset: "OK" */
-
-#define offset_in_page(p) ((unsigned long)(p) & ~PAGE_MASK)
-
-/* Software session entry */
-
-#define HW_TYPE_CIPHER 0
-#define SW_TYPE_HMAC   1
-#define SW_TYPE_AUTH2  2
-#define SW_TYPE_HASH   3
-#define SW_TYPE_COMP   4
-
-struct cipher_7108 {
-       int                     xfm_type;
-       int                     cri_alg;
-       union {
-               struct {
-                       char sw_key[HMAC_BLOCK_LEN];
-                       int  sw_klen;
-                       int  sw_authlen;
-               } hmac;
-       } u;
-       struct cipher_7108      *next;
-};
-
-
-
-#endif /* __C7108_AES_7108_H__ */
diff --git a/target/linux/generic-2.4/files/crypto/ocf/criov.c b/target/linux/generic-2.4/files/crypto/ocf/criov.c
deleted file mode 100644 (file)
index 6d7d3ad..0000000
+++ /dev/null
@@ -1,215 +0,0 @@
-/*      $OpenBSD: criov.c,v 1.9 2002/01/29 15:48:29 jason Exp $        */
-
-/*
- * Linux port done by David McCullough <david_mccullough@mcafee.com>
- * Copyright (C) 2006-2010 David McCullough
- * Copyright (C) 2004-2005 Intel Corporation.
- * The license and original author are listed below.
- *
- * Copyright (c) 1999 Theo de Raadt
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- *
-__FBSDID("$FreeBSD: src/sys/opencrypto/criov.c,v 1.5 2006/06/04 22:15:13 pjd Exp $");
- */
-
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/uio.h>
-#include <linux/skbuff.h>
-#include <linux/kernel.h>
-#include <linux/mm.h>
-#include <asm/io.h>
-
-#include <uio.h>
-#include <cryptodev.h>
-
-/*
- * This macro is only for avoiding code duplication, as we need to skip
- * given number of bytes in the same way in three functions below.
- */
-#define        CUIO_SKIP()     do {                                            \
-       KASSERT(off >= 0, ("%s: off %d < 0", __func__, off));           \
-       KASSERT(len >= 0, ("%s: len %d < 0", __func__, len));           \
-       while (off > 0) {                                               \
-               KASSERT(iol >= 0, ("%s: empty in skip", __func__));     \
-               if (off < iov->iov_len)                                 \
-                       break;                                          \
-               off -= iov->iov_len;                                    \
-               iol--;                                                  \
-               iov++;                                                  \
-       }                                                               \
-} while (0)
-
-void
-cuio_copydata(struct uio* uio, int off, int len, caddr_t cp)
-{
-       struct iovec *iov = uio->uio_iov;
-       int iol = uio->uio_iovcnt;
-       unsigned count;
-
-       CUIO_SKIP();
-       while (len > 0) {
-               KASSERT(iol >= 0, ("%s: empty", __func__));
-               count = min((int)(iov->iov_len - off), len);
-               memcpy(cp, ((caddr_t)iov->iov_base) + off, count);
-               len -= count;
-               cp += count;
-               off = 0;
-               iol--;
-               iov++;
-       }
-}
-
-void
-cuio_copyback(struct uio* uio, int off, int len, caddr_t cp)
-{
-       struct iovec *iov = uio->uio_iov;
-       int iol = uio->uio_iovcnt;
-       unsigned count;
-
-       CUIO_SKIP();
-       while (len > 0) {
-               KASSERT(iol >= 0, ("%s: empty", __func__));
-               count = min((int)(iov->iov_len - off), len);
-               memcpy(((caddr_t)iov->iov_base) + off, cp, count);
-               len -= count;
-               cp += count;
-               off = 0;
-               iol--;
-               iov++;
-       }
-}
-
-/*
- * Return a pointer to iov/offset of location in iovec list.
- */
-struct iovec *
-cuio_getptr(struct uio *uio, int loc, int *off)
-{
-       struct iovec *iov = uio->uio_iov;
-       int iol = uio->uio_iovcnt;
-
-       while (loc >= 0) {
-               /* Normal end of search */
-               if (loc < iov->iov_len) {
-                       *off = loc;
-                       return (iov);
-               }
-
-               loc -= iov->iov_len;
-               if (iol == 0) {
-                       if (loc == 0) {
-                               /* Point at the end of valid data */
-                               *off = iov->iov_len;
-                               return (iov);
-                       } else
-                               return (NULL);
-               } else {
-                       iov++, iol--;
-               }
-       }
-
-       return (NULL);
-}
-
-EXPORT_SYMBOL(cuio_copyback);
-EXPORT_SYMBOL(cuio_copydata);
-EXPORT_SYMBOL(cuio_getptr);
-
-
-static void
-skb_copy_bits_back(struct sk_buff *skb, int offset, caddr_t cp, int len)
-{
-       int i;
-       if (offset < skb_headlen(skb)) {
-               memcpy(skb->data + offset, cp, min_t(int, skb_headlen(skb), len));
-               len -= skb_headlen(skb);
-               cp += skb_headlen(skb);
-       }
-       offset -= skb_headlen(skb);
-       for (i = 0; len > 0 && i < skb_shinfo(skb)->nr_frags; i++) {
-               if (offset < skb_shinfo(skb)->frags[i].size) {
-                       memcpy(page_address(skb_shinfo(skb)->frags[i].page) +
-                                       skb_shinfo(skb)->frags[i].page_offset,
-                                       cp, min_t(int, skb_shinfo(skb)->frags[i].size, len));
-                       len -= skb_shinfo(skb)->frags[i].size;
-                       cp += skb_shinfo(skb)->frags[i].size;
-               }
-               offset -= skb_shinfo(skb)->frags[i].size;
-       }
-}
-
-void
-crypto_copyback(int flags, caddr_t buf, int off, int size, caddr_t in)
-{
-
-       if ((flags & CRYPTO_F_SKBUF) != 0)
-               skb_copy_bits_back((struct sk_buff *)buf, off, in, size);
-       else if ((flags & CRYPTO_F_IOV) != 0)
-               cuio_copyback((struct uio *)buf, off, size, in);
-       else
-               bcopy(in, buf + off, size);
-}
-
-void
-crypto_copydata(int flags, caddr_t buf, int off, int size, caddr_t out)
-{
-
-       if ((flags & CRYPTO_F_SKBUF) != 0)
-               skb_copy_bits((struct sk_buff *)buf, off, out, size);
-       else if ((flags & CRYPTO_F_IOV) != 0)
-               cuio_copydata((struct uio *)buf, off, size, out);
-       else
-               bcopy(buf + off, out, size);
-}
-
-int
-crypto_apply(int flags, caddr_t buf, int off, int len,
-    int (*f)(void *, void *, u_int), void *arg)
-{
-#if 0
-       int error;
-
-       if ((flags & CRYPTO_F_SKBUF) != 0)
-               error = XXXXXX((struct mbuf *)buf, off, len, f, arg);
-       else if ((flags & CRYPTO_F_IOV) != 0)
-               error = cuio_apply((struct uio *)buf, off, len, f, arg);
-       else
-               error = (*f)(arg, buf + off, len);
-       return (error);
-#else
-       KASSERT(0, ("crypto_apply not implemented!\n"));
-#endif
-       return 0;
-}
-
-EXPORT_SYMBOL(crypto_copyback);
-EXPORT_SYMBOL(crypto_copydata);
-EXPORT_SYMBOL(crypto_apply);
-
diff --git a/target/linux/generic-2.4/files/crypto/ocf/crypto.c b/target/linux/generic-2.4/files/crypto/ocf/crypto.c
deleted file mode 100644 (file)
index 9735f0c..0000000
+++ /dev/null
@@ -1,1784 +0,0 @@
-/*-
- * Linux port done by David McCullough <david_mccullough@mcafee.com>
- * Copyright (C) 2006-2010 David McCullough
- * Copyright (C) 2004-2005 Intel Corporation.
- * The license and original author are listed below.
- *
- * Redistribution and use in source and binary forms, with or without
- * Copyright (c) 2002-2006 Sam Leffler.  All rights reserved.
- *
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
-
-#if 0
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/opencrypto/crypto.c,v 1.27 2007/03/21 03:42:51 sam Exp $");
-#endif
-
-/*
- * Cryptographic Subsystem.
- *
- * This code is derived from the Openbsd Cryptographic Framework (OCF)
- * that has the copyright shown below.  Very little of the original
- * code remains.
- */
-/*-
- * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu)
- *
- * This code was written by Angelos D. Keromytis in Athens, Greece, in
- * February 2000. Network Security Technologies Inc. (NSTI) kindly
- * supported the development of this code.
- *
- * Copyright (c) 2000, 2001 Angelos D. Keromytis
- *
- * Permission to use, copy, and modify this software with or without fee
- * is hereby granted, provided that this entire notice is included in
- * all source code copies of any software which is or includes a copy or
- * modification of this software.
- *
- * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTY. IN PARTICULAR, NONE OF THE AUTHORS MAKES ANY
- * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE
- * MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
- * PURPOSE.
- *
-__FBSDID("$FreeBSD: src/sys/opencrypto/crypto.c,v 1.16 2005/01/07 02:29:16 imp Exp $");
- */
-
-
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/list.h>
-#include <linux/slab.h>
-#include <linux/wait.h>
-#include <linux/sched.h>
-#include <linux/spinlock.h>
-#include <linux/version.h>
-#include <cryptodev.h>
-
-/*
- * keep track of whether or not we have been initialised, a big
- * issue if we are linked into the kernel and a driver gets started before
- * us
- */
-static int crypto_initted = 0;
-
-/*
- * Crypto drivers register themselves by allocating a slot in the
- * crypto_drivers table with crypto_get_driverid() and then registering
- * each algorithm they support with crypto_register() and crypto_kregister().
- */
-
-/*
- * lock on driver table
- * we track its state as spin_is_locked does not do anything on non-SMP boxes
- */
-static spinlock_t      crypto_drivers_lock;
-static int                     crypto_drivers_locked;          /* for non-SMP boxes */
-
-#define        CRYPTO_DRIVER_LOCK() \
-                       ({ \
-                               spin_lock_irqsave(&crypto_drivers_lock, d_flags); \
-                               crypto_drivers_locked = 1; \
-                               dprintk("%s,%d: DRIVER_LOCK()\n", __FILE__, __LINE__); \
-                        })
-#define        CRYPTO_DRIVER_UNLOCK() \
-                       ({ \
-                               dprintk("%s,%d: DRIVER_UNLOCK()\n", __FILE__, __LINE__); \
-                               crypto_drivers_locked = 0; \
-                               spin_unlock_irqrestore(&crypto_drivers_lock, d_flags); \
-                        })
-#define        CRYPTO_DRIVER_ASSERT() \
-                       ({ \
-                               if (!crypto_drivers_locked) { \
-                                       dprintk("%s,%d: DRIVER_ASSERT!\n", __FILE__, __LINE__); \
-                               } \
-                        })
-
-/*
- * Crypto device/driver capabilities structure.
- *
- * Synchronization:
- * (d) - protected by CRYPTO_DRIVER_LOCK()
- * (q) - protected by CRYPTO_Q_LOCK()
- * Not tagged fields are read-only.
- */
-struct cryptocap {
-       device_t        cc_dev;                 /* (d) device/driver */
-       u_int32_t       cc_sessions;            /* (d) # of sessions */
-       u_int32_t       cc_koperations;         /* (d) # os asym operations */
-       /*
-        * Largest possible operator length (in bits) for each type of
-        * encryption algorithm. XXX not used
-        */
-       u_int16_t       cc_max_op_len[CRYPTO_ALGORITHM_MAX + 1];
-       u_int8_t        cc_alg[CRYPTO_ALGORITHM_MAX + 1];
-       u_int8_t        cc_kalg[CRK_ALGORITHM_MAX + 1];
-
-       int             cc_flags;               /* (d) flags */
-#define CRYPTOCAP_F_CLEANUP    0x80000000      /* needs resource cleanup */
-       int             cc_qblocked;            /* (q) symmetric q blocked */
-       int             cc_kqblocked;           /* (q) asymmetric q blocked */
-
-       int             cc_unqblocked;          /* (q) symmetric q blocked */
-       int             cc_unkqblocked;         /* (q) asymmetric q blocked */
-};
-static struct cryptocap *crypto_drivers = NULL;
-static int crypto_drivers_num = 0;
-
-/*
- * There are two queues for crypto requests; one for symmetric (e.g.
- * cipher) operations and one for asymmetric (e.g. MOD)operations.
- * A single mutex is used to lock access to both queues.  We could
- * have one per-queue but having one simplifies handling of block/unblock
- * operations.
- */
-static int crp_sleep = 0;
-static LIST_HEAD(crp_q);               /* request queues */
-static LIST_HEAD(crp_kq);
-
-static spinlock_t crypto_q_lock;
-
-int crypto_all_qblocked = 0;  /* protect with Q_LOCK */
-module_param(crypto_all_qblocked, int, 0444);
-MODULE_PARM_DESC(crypto_all_qblocked, "Are all crypto queues blocked");
-
-int crypto_all_kqblocked = 0; /* protect with Q_LOCK */
-module_param(crypto_all_kqblocked, int, 0444);
-MODULE_PARM_DESC(crypto_all_kqblocked, "Are all asym crypto queues blocked");
-
-#define        CRYPTO_Q_LOCK() \
-                       ({ \
-                               spin_lock_irqsave(&crypto_q_lock, q_flags); \
-                               dprintk("%s,%d: Q_LOCK()\n", __FILE__, __LINE__); \
-                        })
-#define        CRYPTO_Q_UNLOCK() \
-                       ({ \
-                               dprintk("%s,%d: Q_UNLOCK()\n", __FILE__, __LINE__); \
-                               spin_unlock_irqrestore(&crypto_q_lock, q_flags); \
-                        })
-
-/*
- * There are two queues for processing completed crypto requests; one
- * for the symmetric and one for the asymmetric ops.  We only need one
- * but have two to avoid type futzing (cryptop vs. cryptkop).  A single
- * mutex is used to lock access to both queues.  Note that this lock
- * must be separate from the lock on request queues to insure driver
- * callbacks don't generate lock order reversals.
- */
-static LIST_HEAD(crp_ret_q);           /* callback queues */
-static LIST_HEAD(crp_ret_kq);
-
-static spinlock_t crypto_ret_q_lock;
-#define        CRYPTO_RETQ_LOCK() \
-                       ({ \
-                               spin_lock_irqsave(&crypto_ret_q_lock, r_flags); \
-                               dprintk("%s,%d: RETQ_LOCK\n", __FILE__, __LINE__); \
-                        })
-#define        CRYPTO_RETQ_UNLOCK() \
-                       ({ \
-                               dprintk("%s,%d: RETQ_UNLOCK\n", __FILE__, __LINE__); \
-                               spin_unlock_irqrestore(&crypto_ret_q_lock, r_flags); \
-                        })
-#define        CRYPTO_RETQ_EMPTY()     (list_empty(&crp_ret_q) && list_empty(&crp_ret_kq))
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
-static kmem_cache_t *cryptop_zone;
-static kmem_cache_t *cryptodesc_zone;
-#else
-static struct kmem_cache *cryptop_zone;
-static struct kmem_cache *cryptodesc_zone;
-#endif
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
-#include <linux/sched.h>
-#define        kill_proc(p,s,v)        send_sig(s,find_task_by_vpid(p),0)
-#endif
-
-#define debug crypto_debug
-int crypto_debug = 0;
-module_param(crypto_debug, int, 0644);
-MODULE_PARM_DESC(crypto_debug, "Enable debug");
-EXPORT_SYMBOL(crypto_debug);
-
-/*
- * Maximum number of outstanding crypto requests before we start
- * failing requests.  We need this to prevent DOS when too many
- * requests are arriving for us to keep up.  Otherwise we will
- * run the system out of memory.  Since crypto is slow,  we are
- * usually the bottleneck that needs to say, enough is enough.
- *
- * We cannot print errors when this condition occurs,  we are already too
- * slow,  printing anything will just kill us
- */
-
-static int crypto_q_cnt = 0;
-module_param(crypto_q_cnt, int, 0444);
-MODULE_PARM_DESC(crypto_q_cnt,
-               "Current number of outstanding crypto requests");
-
-static int crypto_q_max = 1000;
-module_param(crypto_q_max, int, 0644);
-MODULE_PARM_DESC(crypto_q_max,
-               "Maximum number of outstanding crypto requests");
-
-#define bootverbose crypto_verbose
-static int crypto_verbose = 0;
-module_param(crypto_verbose, int, 0644);
-MODULE_PARM_DESC(crypto_verbose,
-               "Enable verbose crypto startup");
-
-int    crypto_usercrypto = 1;  /* userland may do crypto reqs */
-module_param(crypto_usercrypto, int, 0644);
-MODULE_PARM_DESC(crypto_usercrypto,
-          "Enable/disable user-mode access to crypto support");
-
-int    crypto_userasymcrypto = 1;      /* userland may do asym crypto reqs */
-module_param(crypto_userasymcrypto, int, 0644);
-MODULE_PARM_DESC(crypto_userasymcrypto,
-          "Enable/disable user-mode access to asymmetric crypto support");
-
-int    crypto_devallowsoft = 0;        /* only use hardware crypto */
-module_param(crypto_devallowsoft, int, 0644);
-MODULE_PARM_DESC(crypto_devallowsoft,
-          "Enable/disable use of software crypto support");
-
-/*
- * This parameter controls the maximum number of crypto operations to 
- * do consecutively in the crypto kernel thread before scheduling to allow 
- * other processes to run. Without it, it is possible to get into a 
- * situation where the crypto thread never allows any other processes to run.
- * Default to 1000 which should be less than one second.
- */
-static int crypto_max_loopcount = 1000;
-module_param(crypto_max_loopcount, int, 0644);
-MODULE_PARM_DESC(crypto_max_loopcount,
-          "Maximum number of crypto ops to do before yielding to other processes");
-
-static pid_t   cryptoproc = (pid_t) -1;
-static struct  completion cryptoproc_exited;
-static DECLARE_WAIT_QUEUE_HEAD(cryptoproc_wait);
-static pid_t   cryptoretproc = (pid_t) -1;
-static struct  completion cryptoretproc_exited;
-static DECLARE_WAIT_QUEUE_HEAD(cryptoretproc_wait);
-
-static int crypto_proc(void *arg);
-static int crypto_ret_proc(void *arg);
-static int crypto_invoke(struct cryptocap *cap, struct cryptop *crp, int hint);
-static int crypto_kinvoke(struct cryptkop *krp, int flags);
-static void crypto_exit(void);
-static  int crypto_init(void);
-
-static struct cryptostats cryptostats;
-
-static struct cryptocap *
-crypto_checkdriver(u_int32_t hid)
-{
-       if (crypto_drivers == NULL)
-               return NULL;
-       return (hid >= crypto_drivers_num ? NULL : &crypto_drivers[hid]);
-}
-
-/*
- * Compare a driver's list of supported algorithms against another
- * list; return non-zero if all algorithms are supported.
- */
-static int
-driver_suitable(const struct cryptocap *cap, const struct cryptoini *cri)
-{
-       const struct cryptoini *cr;
-
-       /* See if all the algorithms are supported. */
-       for (cr = cri; cr; cr = cr->cri_next)
-               if (cap->cc_alg[cr->cri_alg] == 0)
-                       return 0;
-       return 1;
-}
-
-/*
- * Select a driver for a new session that supports the specified
- * algorithms and, optionally, is constrained according to the flags.
- * The algorithm we use here is pretty stupid; just use the
- * first driver that supports all the algorithms we need. If there
- * are multiple drivers we choose the driver with the fewest active
- * sessions.  We prefer hardware-backed drivers to software ones.
- *
- * XXX We need more smarts here (in real life too, but that's
- * XXX another story altogether).
- */
-static struct cryptocap *
-crypto_select_driver(const struct cryptoini *cri, int flags)
-{
-       struct cryptocap *cap, *best;
-       int match, hid;
-
-       CRYPTO_DRIVER_ASSERT();
-
-       /*
-        * Look first for hardware crypto devices if permitted.
-        */
-       if (flags & CRYPTOCAP_F_HARDWARE)
-               match = CRYPTOCAP_F_HARDWARE;
-       else
-               match = CRYPTOCAP_F_SOFTWARE;
-       best = NULL;
-again:
-       for (hid = 0; hid < crypto_drivers_num; hid++) {
-               cap = &crypto_drivers[hid];
-               /*
-                * If it's not initialized, is in the process of
-                * going away, or is not appropriate (hardware
-                * or software based on match), then skip.
-                */
-               if (cap->cc_dev == NULL ||
-                   (cap->cc_flags & CRYPTOCAP_F_CLEANUP) ||
-                   (cap->cc_flags & match) == 0)
-                       continue;
-
-               /* verify all the algorithms are supported. */
-               if (driver_suitable(cap, cri)) {
-                       if (best == NULL ||
-                           cap->cc_sessions < best->cc_sessions)
-                               best = cap;
-               }
-       }
-       if (best != NULL)
-               return best;
-       if (match == CRYPTOCAP_F_HARDWARE && (flags & CRYPTOCAP_F_SOFTWARE)) {
-               /* sort of an Algol 68-style for loop */
-               match = CRYPTOCAP_F_SOFTWARE;
-               goto again;
-       }
-       return best;
-}
-
-/*
- * Create a new session.  The crid argument specifies a crypto
- * driver to use or constraints on a driver to select (hardware
- * only, software only, either).  Whatever driver is selected
- * must be capable of the requested crypto algorithms.
- */
-int
-crypto_newsession(u_int64_t *sid, struct cryptoini *cri, int crid)
-{
-       struct cryptocap *cap;
-       u_int32_t hid, lid;
-       int err;
-       unsigned long d_flags;
-
-       CRYPTO_DRIVER_LOCK();
-       if ((crid & (CRYPTOCAP_F_HARDWARE | CRYPTOCAP_F_SOFTWARE)) == 0) {
-               /*
-                * Use specified driver; verify it is capable.
-                */
-               cap = crypto_checkdriver(crid);
-               if (cap != NULL && !driver_suitable(cap, cri))
-                       cap = NULL;
-       } else {
-               /*
-                * No requested driver; select based on crid flags.
-                */
-               cap = crypto_select_driver(cri, crid);
-               /*
-                * if NULL then can't do everything in one session.
-                * XXX Fix this. We need to inject a "virtual" session
-                * XXX layer right about here.
-                */
-       }
-       if (cap != NULL) {
-               /* Call the driver initialization routine. */
-               hid = cap - crypto_drivers;
-               lid = hid;              /* Pass the driver ID. */
-               cap->cc_sessions++;
-               CRYPTO_DRIVER_UNLOCK();
-               err = CRYPTODEV_NEWSESSION(cap->cc_dev, &lid, cri);
-               CRYPTO_DRIVER_LOCK();
-               if (err == 0) {
-                       (*sid) = (cap->cc_flags & 0xff000000)
-                              | (hid & 0x00ffffff);
-                       (*sid) <<= 32;
-                       (*sid) |= (lid & 0xffffffff);
-               } else
-                       cap->cc_sessions--;
-       } else
-               err = EINVAL;
-       CRYPTO_DRIVER_UNLOCK();
-       return err;
-}
-
-static void
-crypto_remove(struct cryptocap *cap)
-{
-       CRYPTO_DRIVER_ASSERT();
-       if (cap->cc_sessions == 0 && cap->cc_koperations == 0)
-               bzero(cap, sizeof(*cap));
-}
-
-/*
- * Delete an existing session (or a reserved session on an unregistered
- * driver).
- */
-int
-crypto_freesession(u_int64_t sid)
-{
-       struct cryptocap *cap;
-       u_int32_t hid;
-       int err = 0;
-       unsigned long d_flags;
-
-       dprintk("%s()\n", __FUNCTION__);
-       CRYPTO_DRIVER_LOCK();
-
-       if (crypto_drivers == NULL) {
-               err = EINVAL;
-               goto done;
-       }
-
-       /* Determine two IDs. */
-       hid = CRYPTO_SESID2HID(sid);
-
-       if (hid >= crypto_drivers_num) {
-               dprintk("%s - INVALID DRIVER NUM %d\n", __FUNCTION__, hid);
-               err = ENOENT;
-               goto done;
-       }
-       cap = &crypto_drivers[hid];
-
-       if (cap->cc_dev) {
-               CRYPTO_DRIVER_UNLOCK();
-               /* Call the driver cleanup routine, if available, unlocked. */
-               err = CRYPTODEV_FREESESSION(cap->cc_dev, sid);
-               CRYPTO_DRIVER_LOCK();
-       }
-
-       if (cap->cc_sessions)
-               cap->cc_sessions--;
-
-       if (cap->cc_flags & CRYPTOCAP_F_CLEANUP)
-               crypto_remove(cap);
-
-done:
-       CRYPTO_DRIVER_UNLOCK();
-       return err;
-}
-
-/*
- * Return an unused driver id.  Used by drivers prior to registering
- * support for the algorithms they handle.
- */
-int32_t
-crypto_get_driverid(device_t dev, int flags)
-{
-       struct cryptocap *newdrv;
-       int i;
-       unsigned long d_flags;
-
-       if ((flags & (CRYPTOCAP_F_HARDWARE | CRYPTOCAP_F_SOFTWARE)) == 0) {
-               printf("%s: no flags specified when registering driver\n",
-                   device_get_nameunit(dev));
-               return -1;
-       }
-
-       CRYPTO_DRIVER_LOCK();
-
-       for (i = 0; i < crypto_drivers_num; i++) {
-               if (crypto_drivers[i].cc_dev == NULL &&
-                   (crypto_drivers[i].cc_flags & CRYPTOCAP_F_CLEANUP) == 0) {
-                       break;
-               }
-       }
-
-       /* Out of entries, allocate some more. */
-       if (i == crypto_drivers_num) {
-               /* Be careful about wrap-around. */
-               if (2 * crypto_drivers_num <= crypto_drivers_num) {
-                       CRYPTO_DRIVER_UNLOCK();
-                       printk("crypto: driver count wraparound!\n");
-                       return -1;
-               }
-
-               newdrv = kmalloc(2 * crypto_drivers_num * sizeof(struct cryptocap),
-                               GFP_KERNEL);
-               if (newdrv == NULL) {
-                       CRYPTO_DRIVER_UNLOCK();
-                       printk("crypto: no space to expand driver table!\n");
-                       return -1;
-               }
-
-               memcpy(newdrv, crypto_drivers,
-                               crypto_drivers_num * sizeof(struct cryptocap));
-               memset(&newdrv[crypto_drivers_num], 0,
-                               crypto_drivers_num * sizeof(struct cryptocap));
-
-               crypto_drivers_num *= 2;
-
-               kfree(crypto_drivers);
-               crypto_drivers = newdrv;
-       }
-
-       /* NB: state is zero'd on free */
-       crypto_drivers[i].cc_sessions = 1;      /* Mark */
-       crypto_drivers[i].cc_dev = dev;
-       crypto_drivers[i].cc_flags = flags;
-       if (bootverbose)
-               printf("crypto: assign %s driver id %u, flags %u\n",
-                   device_get_nameunit(dev), i, flags);
-
-       CRYPTO_DRIVER_UNLOCK();
-
-       return i;
-}
-
-/*
- * Lookup a driver by name.  We match against the full device
- * name and unit, and against just the name.  The latter gives
- * us a simple widlcarding by device name.  On success return the
- * driver/hardware identifier; otherwise return -1.
- */
-int
-crypto_find_driver(const char *match)
-{
-       int i, len = strlen(match);
-       unsigned long d_flags;
-
-       CRYPTO_DRIVER_LOCK();
-       for (i = 0; i < crypto_drivers_num; i++) {
-               device_t dev = crypto_drivers[i].cc_dev;
-               if (dev == NULL ||
-                   (crypto_drivers[i].cc_flags & CRYPTOCAP_F_CLEANUP))
-                       continue;
-               if (strncmp(match, device_get_nameunit(dev), len) == 0 ||
-                   strncmp(match, device_get_name(dev), len) == 0)
-                       break;
-       }
-       CRYPTO_DRIVER_UNLOCK();
-       return i < crypto_drivers_num ? i : -1;
-}
-
-/*
- * Return the device_t for the specified driver or NULL
- * if the driver identifier is invalid.
- */
-device_t
-crypto_find_device_byhid(int hid)
-{
-       struct cryptocap *cap = crypto_checkdriver(hid);
-       return cap != NULL ? cap->cc_dev : NULL;
-}
-
-/*
- * Return the device/driver capabilities.
- */
-int
-crypto_getcaps(int hid)
-{
-       struct cryptocap *cap = crypto_checkdriver(hid);
-       return cap != NULL ? cap->cc_flags : 0;
-}
-
-/*
- * Register support for a key-related algorithm.  This routine
- * is called once for each algorithm supported a driver.
- */
-int
-crypto_kregister(u_int32_t driverid, int kalg, u_int32_t flags)
-{
-       struct cryptocap *cap;
-       int err;
-       unsigned long d_flags;
-
-       dprintk("%s()\n", __FUNCTION__);
-       CRYPTO_DRIVER_LOCK();
-
-       cap = crypto_checkdriver(driverid);
-       if (cap != NULL &&
-           (CRK_ALGORITM_MIN <= kalg && kalg <= CRK_ALGORITHM_MAX)) {
-               /*
-                * XXX Do some performance testing to determine placing.
-                * XXX We probably need an auxiliary data structure that
-                * XXX describes relative performances.
-                */
-
-               cap->cc_kalg[kalg] = flags | CRYPTO_ALG_FLAG_SUPPORTED;
-               if (bootverbose)
-                       printf("crypto: %s registers key alg %u flags %u\n"
-                               , device_get_nameunit(cap->cc_dev)
-                               , kalg
-                               , flags
-                       );
-               err = 0;
-       } else
-               err = EINVAL;
-
-       CRYPTO_DRIVER_UNLOCK();
-       return err;
-}
-
-/*
- * Register support for a non-key-related algorithm.  This routine
- * is called once for each such algorithm supported by a driver.
- */
-int
-crypto_register(u_int32_t driverid, int alg, u_int16_t maxoplen,
-    u_int32_t flags)
-{
-       struct cryptocap *cap;
-       int err;
-       unsigned long d_flags;
-
-       dprintk("%s(id=0x%x, alg=%d, maxoplen=%d, flags=0x%x)\n", __FUNCTION__,
-                       driverid, alg, maxoplen, flags);
-
-       CRYPTO_DRIVER_LOCK();
-
-       cap = crypto_checkdriver(driverid);
-       /* NB: algorithms are in the range [1..max] */
-       if (cap != NULL &&
-           (CRYPTO_ALGORITHM_MIN <= alg && alg <= CRYPTO_ALGORITHM_MAX)) {
-               /*
-                * XXX Do some performance testing to determine placing.
-                * XXX We probably need an auxiliary data structure that
-                * XXX describes relative performances.
-                */
-
-               cap->cc_alg[alg] = flags | CRYPTO_ALG_FLAG_SUPPORTED;
-               cap->cc_max_op_len[alg] = maxoplen;
-               if (bootverbose)
-                       printf("crypto: %s registers alg %u flags %u maxoplen %u\n"
-                               , device_get_nameunit(cap->cc_dev)
-                               , alg
-                               , flags
-                               , maxoplen
-                       );
-               cap->cc_sessions = 0;           /* Unmark */
-               err = 0;
-       } else
-               err = EINVAL;
-
-       CRYPTO_DRIVER_UNLOCK();
-       return err;
-}
-
-static void
-driver_finis(struct cryptocap *cap)
-{
-       u_int32_t ses, kops;
-
-       CRYPTO_DRIVER_ASSERT();
-
-       ses = cap->cc_sessions;
-       kops = cap->cc_koperations;
-       bzero(cap, sizeof(*cap));
-       if (ses != 0 || kops != 0) {
-               /*
-                * If there are pending sessions,
-                * just mark as invalid.
-                */
-               cap->cc_flags |= CRYPTOCAP_F_CLEANUP;
-               cap->cc_sessions = ses;
-               cap->cc_koperations = kops;
-       }
-}
-
-/*
- * Unregister a crypto driver. If there are pending sessions using it,
- * leave enough information around so that subsequent calls using those
- * sessions will correctly detect the driver has been unregistered and
- * reroute requests.
- */
-int
-crypto_unregister(u_int32_t driverid, int alg)
-{
-       struct cryptocap *cap;
-       int i, err;
-       unsigned long d_flags;
-
-       dprintk("%s()\n", __FUNCTION__);
-       CRYPTO_DRIVER_LOCK();
-
-       cap = crypto_checkdriver(driverid);
-       if (cap != NULL &&
-           (CRYPTO_ALGORITHM_MIN <= alg && alg <= CRYPTO_ALGORITHM_MAX) &&
-           cap->cc_alg[alg] != 0) {
-               cap->cc_alg[alg] = 0;
-               cap->cc_max_op_len[alg] = 0;
-
-               /* Was this the last algorithm ? */
-               for (i = 1; i <= CRYPTO_ALGORITHM_MAX; i++)
-                       if (cap->cc_alg[i] != 0)
-                               break;
-
-               if (i == CRYPTO_ALGORITHM_MAX + 1)
-                       driver_finis(cap);
-               err = 0;
-       } else
-               err = EINVAL;
-       CRYPTO_DRIVER_UNLOCK();
-       return err;
-}
-
-/*
- * Unregister all algorithms associated with a crypto driver.
- * If there are pending sessions using it, leave enough information
- * around so that subsequent calls using those sessions will
- * correctly detect the driver has been unregistered and reroute
- * requests.
- */
-int
-crypto_unregister_all(u_int32_t driverid)
-{
-       struct cryptocap *cap;
-       int err;
-       unsigned long d_flags;
-
-       dprintk("%s()\n", __FUNCTION__);
-       CRYPTO_DRIVER_LOCK();
-       cap = crypto_checkdriver(driverid);
-       if (cap != NULL) {
-               driver_finis(cap);
-               err = 0;
-       } else
-               err = EINVAL;
-       CRYPTO_DRIVER_UNLOCK();
-
-       return err;
-}
-
-/*
- * Clear blockage on a driver.  The what parameter indicates whether
- * the driver is now ready for cryptop's and/or cryptokop's.
- */
-int
-crypto_unblock(u_int32_t driverid, int what)
-{
-       struct cryptocap *cap;
-       int err;
-       unsigned long q_flags;
-
-       CRYPTO_Q_LOCK();
-       cap = crypto_checkdriver(driverid);
-       if (cap != NULL) {
-               if (what & CRYPTO_SYMQ) {
-                       cap->cc_qblocked = 0;
-                       cap->cc_unqblocked = 0;
-                       crypto_all_qblocked = 0;
-               }
-               if (what & CRYPTO_ASYMQ) {
-                       cap->cc_kqblocked = 0;
-                       cap->cc_unkqblocked = 0;
-                       crypto_all_kqblocked = 0;
-               }
-               if (crp_sleep)
-                       wake_up_interruptible(&cryptoproc_wait);
-               err = 0;
-       } else
-               err = EINVAL;
-       CRYPTO_Q_UNLOCK(); //DAVIDM should this be a driver lock
-
-       return err;
-}
-
-/*
- * Add a crypto request to a queue, to be processed by the kernel thread.
- */
-int
-crypto_dispatch(struct cryptop *crp)
-{
-       struct cryptocap *cap;
-       int result = -1;
-       unsigned long q_flags;
-
-       dprintk("%s()\n", __FUNCTION__);
-
-       cryptostats.cs_ops++;
-
-       CRYPTO_Q_LOCK();
-       if (crypto_q_cnt >= crypto_q_max) {
-               CRYPTO_Q_UNLOCK();
-               cryptostats.cs_drops++;
-               return ENOMEM;
-       }
-       crypto_q_cnt++;
-
-       /* make sure we are starting a fresh run on this crp. */
-       crp->crp_flags &= ~CRYPTO_F_DONE;
-       crp->crp_etype = 0;
-
-       /*
-        * Caller marked the request to be processed immediately; dispatch
-        * it directly to the driver unless the driver is currently blocked.
-        */
-       if ((crp->crp_flags & CRYPTO_F_BATCH) == 0) {
-               int hid = CRYPTO_SESID2HID(crp->crp_sid);
-               cap = crypto_checkdriver(hid);
-               /* Driver cannot disappear when there is an active session. */
-               KASSERT(cap != NULL, ("%s: Driver disappeared.", __func__));
-               if (!cap->cc_qblocked) {
-                       crypto_all_qblocked = 0;
-                       crypto_drivers[hid].cc_unqblocked = 1;
-                       CRYPTO_Q_UNLOCK();
-                       result = crypto_invoke(cap, crp, 0);
-                       CRYPTO_Q_LOCK();
-                       if (result == ERESTART)
-                               if (crypto_drivers[hid].cc_unqblocked)
-                                       crypto_drivers[hid].cc_qblocked = 1;
-                       crypto_drivers[hid].cc_unqblocked = 0;
-               }
-       }
-       if (result == ERESTART) {
-               /*
-                * The driver ran out of resources, mark the
-                * driver ``blocked'' for cryptop's and put
-                * the request back in the queue.  It would
-                * best to put the request back where we got
-                * it but that's hard so for now we put it
-                * at the front.  This should be ok; putting
-                * it at the end does not work.
-                */
-               list_add(&crp->crp_next, &crp_q);
-               cryptostats.cs_blocks++;
-               result = 0;
-       } else if (result == -1) {
-               TAILQ_INSERT_TAIL(&crp_q, crp, crp_next);
-               result = 0;
-       }
-       if (crp_sleep)
-               wake_up_interruptible(&cryptoproc_wait);
-       CRYPTO_Q_UNLOCK();
-       return result;
-}
-
-/*
- * Add an asymetric crypto request to a queue,
- * to be processed by the kernel thread.
- */
-int
-crypto_kdispatch(struct cryptkop *krp)
-{
-       int error;
-       unsigned long q_flags;
-
-       cryptostats.cs_kops++;
-
-       error = crypto_kinvoke(krp, krp->krp_crid);
-       if (error == ERESTART) {
-               CRYPTO_Q_LOCK();
-               TAILQ_INSERT_TAIL(&crp_kq, krp, krp_next);
-               if (crp_sleep)
-                       wake_up_interruptible(&cryptoproc_wait);
-               CRYPTO_Q_UNLOCK();
-               error = 0;
-       }
-       return error;
-}
-
-/*
- * Verify a driver is suitable for the specified operation.
- */
-static __inline int
-kdriver_suitable(const struct cryptocap *cap, const struct cryptkop *krp)
-{
-       return (cap->cc_kalg[krp->krp_op] & CRYPTO_ALG_FLAG_SUPPORTED) != 0;
-}
-
-/*
- * Select a driver for an asym operation.  The driver must
- * support the necessary algorithm.  The caller can constrain
- * which device is selected with the flags parameter.  The
- * algorithm we use here is pretty stupid; just use the first
- * driver that supports the algorithms we need. If there are
- * multiple suitable drivers we choose the driver with the
- * fewest active operations.  We prefer hardware-backed
- * drivers to software ones when either may be used.
- */
-static struct cryptocap *
-crypto_select_kdriver(const struct cryptkop *krp, int flags)
-{
-       struct cryptocap *cap, *best, *blocked;
-       int match, hid;
-
-       CRYPTO_DRIVER_ASSERT();
-
-       /*
-        * Look first for hardware crypto devices if permitted.
-        */
-       if (flags & CRYPTOCAP_F_HARDWARE)
-               match = CRYPTOCAP_F_HARDWARE;
-       else
-               match = CRYPTOCAP_F_SOFTWARE;
-       best = NULL;
-       blocked = NULL;
-again:
-       for (hid = 0; hid < crypto_drivers_num; hid++) {
-               cap = &crypto_drivers[hid];
-               /*
-                * If it's not initialized, is in the process of
-                * going away, or is not appropriate (hardware
-                * or software based on match), then skip.
-                */
-               if (cap->cc_dev == NULL ||
-                   (cap->cc_flags & CRYPTOCAP_F_CLEANUP) ||
-                   (cap->cc_flags & match) == 0)
-                       continue;
-
-               /* verify all the algorithms are supported. */
-               if (kdriver_suitable(cap, krp)) {
-                       if (best == NULL ||
-                           cap->cc_koperations < best->cc_koperations)
-                               best = cap;
-               }
-       }
-       if (best != NULL)
-               return best;
-       if (match == CRYPTOCAP_F_HARDWARE && (flags & CRYPTOCAP_F_SOFTWARE)) {
-               /* sort of an Algol 68-style for loop */
-               match = CRYPTOCAP_F_SOFTWARE;
-               goto again;
-       }
-       return best;
-}
-
-/*
- * Dispatch an assymetric crypto request.
- */
-static int
-crypto_kinvoke(struct cryptkop *krp, int crid)
-{
-       struct cryptocap *cap = NULL;
-       int error;
-       unsigned long d_flags;
-
-       KASSERT(krp != NULL, ("%s: krp == NULL", __func__));
-       KASSERT(krp->krp_callback != NULL,
-           ("%s: krp->crp_callback == NULL", __func__));
-
-       CRYPTO_DRIVER_LOCK();
-       if ((crid & (CRYPTOCAP_F_HARDWARE | CRYPTOCAP_F_SOFTWARE)) == 0) {
-               cap = crypto_checkdriver(crid);
-               if (cap != NULL) {
-                       /*
-                        * Driver present, it must support the necessary
-                        * algorithm and, if s/w drivers are excluded,
-                        * it must be registered as hardware-backed.
-                        */
-                       if (!kdriver_suitable(cap, krp) ||
-                           (!crypto_devallowsoft &&
-                            (cap->cc_flags & CRYPTOCAP_F_HARDWARE) == 0))
-                               cap = NULL;
-               }
-       } else {
-               /*
-                * No requested driver; select based on crid flags.
-                */
-               if (!crypto_devallowsoft)       /* NB: disallow s/w drivers */
-                       crid &= ~CRYPTOCAP_F_SOFTWARE;
-               cap = crypto_select_kdriver(krp, crid);
-       }
-       if (cap != NULL && !cap->cc_kqblocked) {
-               krp->krp_hid = cap - crypto_drivers;
-               cap->cc_koperations++;
-               CRYPTO_DRIVER_UNLOCK();
-               error = CRYPTODEV_KPROCESS(cap->cc_dev, krp, 0);
-               CRYPTO_DRIVER_LOCK();
-               if (error == ERESTART) {
-                       cap->cc_koperations--;
-                       CRYPTO_DRIVER_UNLOCK();
-                       return (error);
-               }
-               /* return the actual device used */
-               krp->krp_crid = krp->krp_hid;
-       } else {
-               /*
-                * NB: cap is !NULL if device is blocked; in
-                *     that case return ERESTART so the operation
-                *     is resubmitted if possible.
-                */
-               error = (cap == NULL) ? ENODEV : ERESTART;
-       }
-       CRYPTO_DRIVER_UNLOCK();
-
-       if (error) {
-               krp->krp_status = error;
-               crypto_kdone(krp);
-       }
-       return 0;
-}
-
-
-/*
- * Dispatch a crypto request to the appropriate crypto devices.
- */
-static int
-crypto_invoke(struct cryptocap *cap, struct cryptop *crp, int hint)
-{
-       KASSERT(crp != NULL, ("%s: crp == NULL", __func__));
-       KASSERT(crp->crp_callback != NULL,
-           ("%s: crp->crp_callback == NULL", __func__));
-       KASSERT(crp->crp_desc != NULL, ("%s: crp->crp_desc == NULL", __func__));
-
-       dprintk("%s()\n", __FUNCTION__);
-
-#ifdef CRYPTO_TIMING
-       if (crypto_timing)
-               crypto_tstat(&cryptostats.cs_invoke, &crp->crp_tstamp);
-#endif
-       if (cap->cc_flags & CRYPTOCAP_F_CLEANUP) {
-               struct cryptodesc *crd;
-               u_int64_t nid;
-
-               /*
-                * Driver has unregistered; migrate the session and return
-                * an error to the caller so they'll resubmit the op.
-                *
-                * XXX: What if there are more already queued requests for this
-                *      session?
-                */
-               crypto_freesession(crp->crp_sid);
-
-               for (crd = crp->crp_desc; crd->crd_next; crd = crd->crd_next)
-                       crd->CRD_INI.cri_next = &(crd->crd_next->CRD_INI);
-
-               /* XXX propagate flags from initial session? */
-               if (crypto_newsession(&nid, &(crp->crp_desc->CRD_INI),
-                   CRYPTOCAP_F_HARDWARE | CRYPTOCAP_F_SOFTWARE) == 0)
-                       crp->crp_sid = nid;
-
-               crp->crp_etype = EAGAIN;
-               crypto_done(crp);
-               return 0;
-       } else {
-               /*
-                * Invoke the driver to process the request.
-                */
-               return CRYPTODEV_PROCESS(cap->cc_dev, crp, hint);
-       }
-}
-
-/*
- * Release a set of crypto descriptors.
- */
-void
-crypto_freereq(struct cryptop *crp)
-{
-       struct cryptodesc *crd;
-
-       if (crp == NULL)
-               return;
-
-#ifdef DIAGNOSTIC
-       {
-               struct cryptop *crp2;
-               unsigned long q_flags;
-
-               CRYPTO_Q_LOCK();
-               TAILQ_FOREACH(crp2, &crp_q, crp_next) {
-                       KASSERT(crp2 != crp,
-                           ("Freeing cryptop from the crypto queue (%p).",
-                           crp));
-               }
-               CRYPTO_Q_UNLOCK();
-               CRYPTO_RETQ_LOCK();
-               TAILQ_FOREACH(crp2, &crp_ret_q, crp_next) {
-                       KASSERT(crp2 != crp,
-                           ("Freeing cryptop from the return queue (%p).",
-                           crp));
-               }
-               CRYPTO_RETQ_UNLOCK();
-       }
-#endif
-
-       while ((crd = crp->crp_desc) != NULL) {
-               crp->crp_desc = crd->crd_next;
-               kmem_cache_free(cryptodesc_zone, crd);
-       }
-       kmem_cache_free(cryptop_zone, crp);
-}
-
-/*
- * Acquire a set of crypto descriptors.
- */
-struct cryptop *
-crypto_getreq(int num)
-{
-       struct cryptodesc *crd;
-       struct cryptop *crp;
-
-       crp = kmem_cache_alloc(cryptop_zone, SLAB_ATOMIC);
-       if (crp != NULL) {
-               memset(crp, 0, sizeof(*crp));
-               INIT_LIST_HEAD(&crp->crp_next);
-               init_waitqueue_head(&crp->crp_waitq);
-               while (num--) {
-                       crd = kmem_cache_alloc(cryptodesc_zone, SLAB_ATOMIC);
-                       if (crd == NULL) {
-                               crypto_freereq(crp);
-                               return NULL;
-                       }
-                       memset(crd, 0, sizeof(*crd));
-                       crd->crd_next = crp->crp_desc;
-                       crp->crp_desc = crd;
-               }
-       }
-       return crp;
-}
-
-/*
- * Invoke the callback on behalf of the driver.
- */
-void
-crypto_done(struct cryptop *crp)
-{
-       unsigned long q_flags;
-
-       dprintk("%s()\n", __FUNCTION__);
-       if ((crp->crp_flags & CRYPTO_F_DONE) == 0) {
-               crp->crp_flags |= CRYPTO_F_DONE;
-               CRYPTO_Q_LOCK();
-               crypto_q_cnt--;
-               CRYPTO_Q_UNLOCK();
-       } else
-               printk("crypto: crypto_done op already done, flags 0x%x",
-                               crp->crp_flags);
-       if (crp->crp_etype != 0)
-               cryptostats.cs_errs++;
-       /*
-        * CBIMM means unconditionally do the callback immediately;
-        * CBIFSYNC means do the callback immediately only if the
-        * operation was done synchronously.  Both are used to avoid
-        * doing extraneous context switches; the latter is mostly
-        * used with the software crypto driver.
-        */
-       if ((crp->crp_flags & CRYPTO_F_CBIMM) ||
-           ((crp->crp_flags & CRYPTO_F_CBIFSYNC) &&
-            (CRYPTO_SESID2CAPS(crp->crp_sid) & CRYPTOCAP_F_SYNC))) {
-               /*
-                * Do the callback directly.  This is ok when the
-                * callback routine does very little (e.g. the
-                * /dev/crypto callback method just does a wakeup).
-                */
-               crp->crp_callback(crp);
-       } else {
-               unsigned long r_flags;
-               /*
-                * Normal case; queue the callback for the thread.
-                */
-               CRYPTO_RETQ_LOCK();
-               if (CRYPTO_RETQ_EMPTY())
-                       wake_up_interruptible(&cryptoretproc_wait);/* shared wait channel */
-               TAILQ_INSERT_TAIL(&crp_ret_q, crp, crp_next);
-               CRYPTO_RETQ_UNLOCK();
-       }
-}
-
-/*
- * Invoke the callback on behalf of the driver.
- */
-void
-crypto_kdone(struct cryptkop *krp)
-{
-       struct cryptocap *cap;
-       unsigned long d_flags;
-
-       if ((krp->krp_flags & CRYPTO_KF_DONE) != 0)
-               printk("crypto: crypto_kdone op already done, flags 0x%x",
-                               krp->krp_flags);
-       krp->krp_flags |= CRYPTO_KF_DONE;
-       if (krp->krp_status != 0)
-               cryptostats.cs_kerrs++;
-
-       CRYPTO_DRIVER_LOCK();
-       /* XXX: What if driver is loaded in the meantime? */
-       if (krp->krp_hid < crypto_drivers_num) {
-               cap = &crypto_drivers[krp->krp_hid];
-               cap->cc_koperations--;
-               KASSERT(cap->cc_koperations >= 0, ("cc_koperations < 0"));
-               if (cap->cc_flags & CRYPTOCAP_F_CLEANUP)
-                       crypto_remove(cap);
-       }
-       CRYPTO_DRIVER_UNLOCK();
-
-       /*
-        * CBIMM means unconditionally do the callback immediately;
-        * This is used to avoid doing extraneous context switches
-        */
-       if ((krp->krp_flags & CRYPTO_KF_CBIMM)) {
-               /*
-                * Do the callback directly.  This is ok when the
-                * callback routine does very little (e.g. the
-                * /dev/crypto callback method just does a wakeup).
-                */
-               krp->krp_callback(krp);
-       } else {
-               unsigned long r_flags;
-               /*
-                * Normal case; queue the callback for the thread.
-                */
-               CRYPTO_RETQ_LOCK();
-               if (CRYPTO_RETQ_EMPTY())
-                       wake_up_interruptible(&cryptoretproc_wait);/* shared wait channel */
-               TAILQ_INSERT_TAIL(&crp_ret_kq, krp, krp_next);
-               CRYPTO_RETQ_UNLOCK();
-       }
-}
-
-int
-crypto_getfeat(int *featp)
-{
-       int hid, kalg, feat = 0;
-       unsigned long d_flags;
-
-       CRYPTO_DRIVER_LOCK();
-       for (hid = 0; hid < crypto_drivers_num; hid++) {
-               const struct cryptocap *cap = &crypto_drivers[hid];
-
-               if ((cap->cc_flags & CRYPTOCAP_F_SOFTWARE) &&
-                   !crypto_devallowsoft) {
-                       continue;
-               }
-               for (kalg = 0; kalg < CRK_ALGORITHM_MAX; kalg++)
-                       if (cap->cc_kalg[kalg] & CRYPTO_ALG_FLAG_SUPPORTED)
-                               feat |=  1 << kalg;
-       }
-       CRYPTO_DRIVER_UNLOCK();
-       *featp = feat;
-       return (0);
-}
-
-/*
- * Crypto thread, dispatches crypto requests.
- */
-static int
-crypto_proc(void *arg)
-{
-       struct cryptop *crp, *submit;
-       struct cryptkop *krp, *krpp;
-       struct cryptocap *cap;
-       u_int32_t hid;
-       int result, hint;
-       unsigned long q_flags;
-       int loopcount = 0;
-
-       ocf_daemonize("crypto");
-
-       CRYPTO_Q_LOCK();
-       for (;;) {
-               /*
-                * we need to make sure we don't get into a busy loop with nothing
-                * to do,  the two crypto_all_*blocked vars help us find out when
-                * we are all full and can do nothing on any driver or Q.  If so we
-                * wait for an unblock.
-                */
-               crypto_all_qblocked  = !list_empty(&crp_q);
-
-               /*
-                * Find the first element in the queue that can be
-                * processed and look-ahead to see if multiple ops
-                * are ready for the same driver.
-                */
-               submit = NULL;
-               hint = 0;
-               list_for_each_entry(crp, &crp_q, crp_next) {
-                       hid = CRYPTO_SESID2HID(crp->crp_sid);
-                       cap = crypto_checkdriver(hid);
-                       /*
-                        * Driver cannot disappear when there is an active
-                        * session.
-                        */
-                       KASSERT(cap != NULL, ("%s:%u Driver disappeared.",
-                           __func__, __LINE__));
-                       if (cap == NULL || cap->cc_dev == NULL) {
-                               /* Op needs to be migrated, process it. */
-                               if (submit == NULL)
-                                       submit = crp;
-                               break;
-                       }
-                       if (!cap->cc_qblocked) {
-                               if (submit != NULL) {
-                                       /*
-                                        * We stop on finding another op,
-                                        * regardless whether its for the same
-                                        * driver or not.  We could keep
-                                        * searching the queue but it might be
-                                        * better to just use a per-driver
-                                        * queue instead.
-                                        */
-                                       if (CRYPTO_SESID2HID(submit->crp_sid) == hid)
-                                               hint = CRYPTO_HINT_MORE;
-                                       break;
-                               } else {
-                                       submit = crp;
-                                       if ((submit->crp_flags & CRYPTO_F_BATCH) == 0)
-                                               break;
-                                       /* keep scanning for more are q'd */
-                               }
-                       }
-               }
-               if (submit != NULL) {
-                       hid = CRYPTO_SESID2HID(submit->crp_sid);
-                       crypto_all_qblocked = 0;
-                       list_del(&submit->crp_next);
-                       crypto_drivers[hid].cc_unqblocked = 1;
-                       cap = crypto_checkdriver(hid);
-                       CRYPTO_Q_UNLOCK();
-                       KASSERT(cap != NULL, ("%s:%u Driver disappeared.",
-                           __func__, __LINE__));
-                       result = crypto_invoke(cap, submit, hint);
-                       CRYPTO_Q_LOCK();
-                       if (result == ERESTART) {
-                               /*
-                                * The driver ran out of resources, mark the
-                                * driver ``blocked'' for cryptop's and put
-                                * the request back in the queue.  It would
-                                * best to put the request back where we got
-                                * it but that's hard so for now we put it
-                                * at the front.  This should be ok; putting
-                                * it at the end does not work.
-                                */
-                               /* XXX validate sid again? */
-                               list_add(&submit->crp_next, &crp_q);
-                               cryptostats.cs_blocks++;
-                               if (crypto_drivers[hid].cc_unqblocked)
-                                       crypto_drivers[hid].cc_qblocked=0;
-                               crypto_drivers[hid].cc_unqblocked=0;
-                       }
-                       crypto_drivers[hid].cc_unqblocked = 0;
-               }
-
-               crypto_all_kqblocked = !list_empty(&crp_kq);
-
-               /* As above, but for key ops */
-               krp = NULL;
-               list_for_each_entry(krpp, &crp_kq, krp_next) {
-                       cap = crypto_checkdriver(krpp->krp_hid);
-                       if (cap == NULL || cap->cc_dev == NULL) {
-                               /*
-                                * Operation needs to be migrated, invalidate
-                                * the assigned device so it will reselect a
-                                * new one below.  Propagate the original
-                                * crid selection flags if supplied.
-                                */
-                               krp->krp_hid = krp->krp_crid &
-                                   (CRYPTOCAP_F_SOFTWARE|CRYPTOCAP_F_HARDWARE);
-                               if (krp->krp_hid == 0)
-                                       krp->krp_hid =
-                                   CRYPTOCAP_F_SOFTWARE|CRYPTOCAP_F_HARDWARE;
-                               break;
-                       }
-                       if (!cap->cc_kqblocked) {
-                               krp = krpp;
-                               break;
-                       }
-               }
-               if (krp != NULL) {
-                       crypto_all_kqblocked = 0;
-                       list_del(&krp->krp_next);
-                       crypto_drivers[krp->krp_hid].cc_kqblocked = 1;
-                       CRYPTO_Q_UNLOCK();
-                       result = crypto_kinvoke(krp, krp->krp_hid);
-                       CRYPTO_Q_LOCK();
-                       if (result == ERESTART) {
-                               /*
-                                * The driver ran out of resources, mark the
-                                * driver ``blocked'' for cryptkop's and put
-                                * the request back in the queue.  It would
-                                * best to put the request back where we got
-                                * it but that's hard so for now we put it
-                                * at the front.  This should be ok; putting
-                                * it at the end does not work.
-                                */
-                               /* XXX validate sid again? */
-                               list_add(&krp->krp_next, &crp_kq);
-                               cryptostats.cs_kblocks++;
-                       } else
-                               crypto_drivers[krp->krp_hid].cc_kqblocked = 0;
-               }
-
-               if (submit == NULL && krp == NULL) {
-                       /*
-                        * Nothing more to be processed.  Sleep until we're
-                        * woken because there are more ops to process.
-                        * This happens either by submission or by a driver
-                        * becoming unblocked and notifying us through
-                        * crypto_unblock.  Note that when we wakeup we
-                        * start processing each queue again from the
-                        * front. It's not clear that it's important to
-                        * preserve this ordering since ops may finish
-                        * out of order if dispatched to different devices
-                        * and some become blocked while others do not.
-                        */
-                       dprintk("%s - sleeping (qe=%d qb=%d kqe=%d kqb=%d)\n",
-                                       __FUNCTION__,
-                                       list_empty(&crp_q), crypto_all_qblocked,
-                                       list_empty(&crp_kq), crypto_all_kqblocked);
-                       loopcount = 0;
-                       CRYPTO_Q_UNLOCK();
-                       crp_sleep = 1;
-                       wait_event_interruptible(cryptoproc_wait,
-                                       !(list_empty(&crp_q) || crypto_all_qblocked) ||
-                                       !(list_empty(&crp_kq) || crypto_all_kqblocked) ||
-                                       cryptoproc == (pid_t) -1);
-                       crp_sleep = 0;
-                       if (signal_pending (current)) {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-                               spin_lock_irq(&current->sigmask_lock);
-#endif
-                               flush_signals(current);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-                               spin_unlock_irq(&current->sigmask_lock);
-#endif
-                       }
-                       CRYPTO_Q_LOCK();
-                       dprintk("%s - awake\n", __FUNCTION__);
-                       if (cryptoproc == (pid_t) -1)
-                               break;
-                       cryptostats.cs_intrs++;
-               } else if (loopcount > crypto_max_loopcount) {
-                       /*
-                        * Give other processes a chance to run if we've 
-                        * been using the CPU exclusively for a while.
-                        */
-                       loopcount = 0;
-                       schedule();
-               }
-               loopcount++;
-       }
-       CRYPTO_Q_UNLOCK();
-       complete_and_exit(&cryptoproc_exited, 0);
-}
-
-/*
- * Crypto returns thread, does callbacks for processed crypto requests.
- * Callbacks are done here, rather than in the crypto drivers, because
- * callbacks typically are expensive and would slow interrupt handling.
- */
-static int
-crypto_ret_proc(void *arg)
-{
-       struct cryptop *crpt;
-       struct cryptkop *krpt;
-       unsigned long  r_flags;
-
-       ocf_daemonize("crypto_ret");
-
-       CRYPTO_RETQ_LOCK();
-       for (;;) {
-               /* Harvest return q's for completed ops */
-               crpt = NULL;
-               if (!list_empty(&crp_ret_q))
-                       crpt = list_entry(crp_ret_q.next, typeof(*crpt), crp_next);
-               if (crpt != NULL)
-                       list_del(&crpt->crp_next);
-
-               krpt = NULL;
-               if (!list_empty(&crp_ret_kq))
-                       krpt = list_entry(crp_ret_kq.next, typeof(*krpt), krp_next);
-               if (krpt != NULL)
-                       list_del(&krpt->krp_next);
-
-               if (crpt != NULL || krpt != NULL) {
-                       CRYPTO_RETQ_UNLOCK();
-                       /*
-                        * Run callbacks unlocked.
-                        */
-                       if (crpt != NULL)
-                               crpt->crp_callback(crpt);
-                       if (krpt != NULL)
-                               krpt->krp_callback(krpt);
-                       CRYPTO_RETQ_LOCK();
-               } else {
-                       /*
-                        * Nothing more to be processed.  Sleep until we're
-                        * woken because there are more returns to process.
-                        */
-                       dprintk("%s - sleeping\n", __FUNCTION__);
-                       CRYPTO_RETQ_UNLOCK();
-                       wait_event_interruptible(cryptoretproc_wait,
-                                       cryptoretproc == (pid_t) -1 ||
-                                       !list_empty(&crp_ret_q) ||
-                                       !list_empty(&crp_ret_kq));
-                       if (signal_pending (current)) {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-                               spin_lock_irq(&current->sigmask_lock);
-#endif
-                               flush_signals(current);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-                               spin_unlock_irq(&current->sigmask_lock);
-#endif
-                       }
-                       CRYPTO_RETQ_LOCK();
-                       dprintk("%s - awake\n", __FUNCTION__);
-                       if (cryptoretproc == (pid_t) -1) {
-                               dprintk("%s - EXITING!\n", __FUNCTION__);
-                               break;
-                       }
-                       cryptostats.cs_rets++;
-               }
-       }
-       CRYPTO_RETQ_UNLOCK();
-       complete_and_exit(&cryptoretproc_exited, 0);
-}
-
-
-#if 0 /* should put this into /proc or something */
-static void
-db_show_drivers(void)
-{
-       int hid;
-
-       db_printf("%12s %4s %4s %8s %2s %2s\n"
-               , "Device"
-               , "Ses"
-               , "Kops"
-               , "Flags"
-               , "QB"
-               , "KB"
-       );
-       for (hid = 0; hid < crypto_drivers_num; hid++) {
-               const struct cryptocap *cap = &crypto_drivers[hid];
-               if (cap->cc_dev == NULL)
-                       continue;
-               db_printf("%-12s %4u %4u %08x %2u %2u\n"
-                   , device_get_nameunit(cap->cc_dev)
-                   , cap->cc_sessions
-                   , cap->cc_koperations
-                   , cap->cc_flags
-                   , cap->cc_qblocked
-                   , cap->cc_kqblocked
-               );
-       }
-}
-
-DB_SHOW_COMMAND(crypto, db_show_crypto)
-{
-       struct cryptop *crp;
-
-       db_show_drivers();
-       db_printf("\n");
-
-       db_printf("%4s %8s %4s %4s %4s %4s %8s %8s\n",
-           "HID", "Caps", "Ilen", "Olen", "Etype", "Flags",
-           "Desc", "Callback");
-       TAILQ_FOREACH(crp, &crp_q, crp_next) {
-               db_printf("%4u %08x %4u %4u %4u %04x %8p %8p\n"
-                   , (int) CRYPTO_SESID2HID(crp->crp_sid)
-                   , (int) CRYPTO_SESID2CAPS(crp->crp_sid)
-                   , crp->crp_ilen, crp->crp_olen
-                   , crp->crp_etype
-                   , crp->crp_flags
-                   , crp->crp_desc
-                   , crp->crp_callback
-               );
-       }
-       if (!TAILQ_EMPTY(&crp_ret_q)) {
-               db_printf("\n%4s %4s %4s %8s\n",
-                   "HID", "Etype", "Flags", "Callback");
-               TAILQ_FOREACH(crp, &crp_ret_q, crp_next) {
-                       db_printf("%4u %4u %04x %8p\n"
-                           , (int) CRYPTO_SESID2HID(crp->crp_sid)
-                           , crp->crp_etype
-                           , crp->crp_flags
-                           , crp->crp_callback
-                       );
-               }
-       }
-}
-
-DB_SHOW_COMMAND(kcrypto, db_show_kcrypto)
-{
-       struct cryptkop *krp;
-
-       db_show_drivers();
-       db_printf("\n");
-
-       db_printf("%4s %5s %4s %4s %8s %4s %8s\n",
-           "Op", "Status", "#IP", "#OP", "CRID", "HID", "Callback");
-       TAILQ_FOREACH(krp, &crp_kq, krp_next) {
-               db_printf("%4u %5u %4u %4u %08x %4u %8p\n"
-                   , krp->krp_op
-                   , krp->krp_status
-                   , krp->krp_iparams, krp->krp_oparams
-                   , krp->krp_crid, krp->krp_hid
-                   , krp->krp_callback
-               );
-       }
-       if (!TAILQ_EMPTY(&crp_ret_q)) {
-               db_printf("%4s %5s %8s %4s %8s\n",
-                   "Op", "Status", "CRID", "HID", "Callback");
-               TAILQ_FOREACH(krp, &crp_ret_kq, krp_next) {
-                       db_printf("%4u %5u %08x %4u %8p\n"
-                           , krp->krp_op
-                           , krp->krp_status
-                           , krp->krp_crid, krp->krp_hid
-                           , krp->krp_callback
-                       );
-               }
-       }
-}
-#endif
-
-
-static int
-crypto_init(void)
-{
-       int error;
-
-       dprintk("%s(%p)\n", __FUNCTION__, (void *) crypto_init);
-
-       if (crypto_initted)
-               return 0;
-       crypto_initted = 1;
-
-       spin_lock_init(&crypto_drivers_lock);
-       spin_lock_init(&crypto_q_lock);
-       spin_lock_init(&crypto_ret_q_lock);
-
-       cryptop_zone = kmem_cache_create("cryptop", sizeof(struct cryptop),
-                                      0, SLAB_HWCACHE_ALIGN, NULL
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
-                                      , NULL
-#endif
-                                       );
-
-       cryptodesc_zone = kmem_cache_create("cryptodesc", sizeof(struct cryptodesc),
-                                      0, SLAB_HWCACHE_ALIGN, NULL
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
-                                      , NULL
-#endif
-                                       );
-
-       if (cryptodesc_zone == NULL || cryptop_zone == NULL) {
-               printk("crypto: crypto_init cannot setup crypto zones\n");
-               error = ENOMEM;
-               goto bad;
-       }
-
-       crypto_drivers_num = CRYPTO_DRIVERS_INITIAL;
-       crypto_drivers = kmalloc(crypto_drivers_num * sizeof(struct cryptocap),
-                       GFP_KERNEL);
-       if (crypto_drivers == NULL) {
-               printk("crypto: crypto_init cannot setup crypto drivers\n");
-               error = ENOMEM;
-               goto bad;
-       }
-
-       memset(crypto_drivers, 0, crypto_drivers_num * sizeof(struct cryptocap));
-
-       init_completion(&cryptoproc_exited);
-       init_completion(&cryptoretproc_exited);
-
-       cryptoproc = 0; /* to avoid race condition where proc runs first */
-       cryptoproc = kernel_thread(crypto_proc, NULL, CLONE_FS|CLONE_FILES);
-       if (cryptoproc < 0) {
-               error = cryptoproc;
-               printk("crypto: crypto_init cannot start crypto thread; error %d",
-                       error);
-               goto bad;
-       }
-
-       cryptoretproc = 0; /* to avoid race condition where proc runs first */
-       cryptoretproc = kernel_thread(crypto_ret_proc, NULL, CLONE_FS|CLONE_FILES);
-       if (cryptoretproc < 0) {
-               error = cryptoretproc;
-               printk("crypto: crypto_init cannot start cryptoret thread; error %d",
-                               error);
-               goto bad;
-       }
-
-       return 0;
-bad:
-       crypto_exit();
-       return error;
-}
-
-
-static void
-crypto_exit(void)
-{
-       pid_t p;
-       unsigned long d_flags;
-
-       dprintk("%s()\n", __FUNCTION__);
-
-       /*
-        * Terminate any crypto threads.
-        */
-
-       CRYPTO_DRIVER_LOCK();
-       p = cryptoproc;
-       cryptoproc = (pid_t) -1;
-       kill_proc(p, SIGTERM, 1);
-       wake_up_interruptible(&cryptoproc_wait);
-       CRYPTO_DRIVER_UNLOCK();
-
-       wait_for_completion(&cryptoproc_exited);
-
-       CRYPTO_DRIVER_LOCK();
-       p = cryptoretproc;
-       cryptoretproc = (pid_t) -1;
-       kill_proc(p, SIGTERM, 1);
-       wake_up_interruptible(&cryptoretproc_wait);
-       CRYPTO_DRIVER_UNLOCK();
-
-       wait_for_completion(&cryptoretproc_exited);
-
-       /* XXX flush queues??? */
-
-       /* 
-        * Reclaim dynamically allocated resources.
-        */
-       if (crypto_drivers != NULL)
-               kfree(crypto_drivers);
-
-       if (cryptodesc_zone != NULL)
-               kmem_cache_destroy(cryptodesc_zone);
-       if (cryptop_zone != NULL)
-               kmem_cache_destroy(cryptop_zone);
-}
-
-
-EXPORT_SYMBOL(crypto_newsession);
-EXPORT_SYMBOL(crypto_freesession);
-EXPORT_SYMBOL(crypto_get_driverid);
-EXPORT_SYMBOL(crypto_kregister);
-EXPORT_SYMBOL(crypto_register);
-EXPORT_SYMBOL(crypto_unregister);
-EXPORT_SYMBOL(crypto_unregister_all);
-EXPORT_SYMBOL(crypto_unblock);
-EXPORT_SYMBOL(crypto_dispatch);
-EXPORT_SYMBOL(crypto_kdispatch);
-EXPORT_SYMBOL(crypto_freereq);
-EXPORT_SYMBOL(crypto_getreq);
-EXPORT_SYMBOL(crypto_done);
-EXPORT_SYMBOL(crypto_kdone);
-EXPORT_SYMBOL(crypto_getfeat);
-EXPORT_SYMBOL(crypto_userasymcrypto);
-EXPORT_SYMBOL(crypto_getcaps);
-EXPORT_SYMBOL(crypto_find_driver);
-EXPORT_SYMBOL(crypto_find_device_byhid);
-
-module_init(crypto_init);
-module_exit(crypto_exit);
-
-MODULE_LICENSE("BSD");
-MODULE_AUTHOR("David McCullough <david_mccullough@mcafee.com>");
-MODULE_DESCRIPTION("OCF (OpenBSD Cryptographic Framework)");
diff --git a/target/linux/generic-2.4/files/crypto/ocf/cryptocteon/Makefile b/target/linux/generic-2.4/files/crypto/ocf/cryptocteon/Makefile
deleted file mode 100644 (file)
index eeed0d6..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-# for SGlinux builds
--include $(ROOTDIR)/modules/.config
-
-obj-$(CONFIG_OCF_CRYPTOCTEON) += cryptocteon.o
-
-obj ?= .
-EXTRA_CFLAGS += -I$(obj)/.. -I$(obj)/
-
-ifdef CONFIG_OCF_CRYPTOCTEON
-# you need the cavium crypto component installed
-EXTRA_CFLAGS += -I$(ROOTDIR)/prop/include
-endif
-
-ifdef TOPDIR
--include $(TOPDIR)/Rules.make
-endif
-
diff --git a/target/linux/generic-2.4/files/crypto/ocf/cryptocteon/cavium_crypto.c b/target/linux/generic-2.4/files/crypto/ocf/cryptocteon/cavium_crypto.c
deleted file mode 100644 (file)
index ceaf77c..0000000
+++ /dev/null
@@ -1,2283 +0,0 @@
-/*
- * Copyright (c) 2009 David McCullough <david.mccullough@securecomputing.com>
- *
- * Copyright (c) 2003-2007 Cavium Networks (support@cavium.com). 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.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Cavium Networks
- * 4. Cavium Networks' name may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- * 
- * This Software, including technical data, may be subject to U.S. export
- * control laws, including the U.S. Export Administration Act and its
- * associated regulations, and may be subject to export or import regulations
- * in other countries. You warrant that You will comply strictly in all
- * respects with all such regulations and acknowledge that you have the
- * responsibility to obtain licenses to export, re-export or import the
- * Software.
- * 
- * TO THE MAXIMUM EXTENT PERMITTED BY LAW, THE SOFTWARE IS PROVIDED "AS IS" AND
- * WITH ALL FAULTS AND CAVIUM MAKES NO PROMISES, REPRESENTATIONS OR WARRANTIES,
- * EITHER EXPRESS, IMPLIED, STATUTORY, OR OTHERWISE, WITH RESPECT TO THE
- * SOFTWARE, INCLUDING ITS CONDITION, ITS CONFORMITY TO ANY REPRESENTATION OR
- * DESCRIPTION, OR THE EXISTENCE OF ANY LATENT OR PATENT DEFECTS, AND CAVIUM
- * SPECIFICALLY DISCLAIMS ALL IMPLIED (IF ANY) WARRANTIES OF TITLE,
- * MERCHANTABILITY, NONINFRINGEMENT, FITNESS FOR A PARTICULAR PURPOSE, LACK OF
- * VIRUSES, ACCURACY OR COMPLETENESS, QUIET ENJOYMENT, QUIET POSSESSION OR
- * CORRESPONDENCE TO DESCRIPTION. THE ENTIRE RISK ARISING OUT OF USE OR
- * PERFORMANCE OF THE SOFTWARE LIES WITH YOU.
-*/
-/****************************************************************************/
-
-#include <linux/scatterlist.h>
-#include <asm/octeon/octeon.h>
-#include "octeon-asm.h"
-
-/****************************************************************************/
-
-extern unsigned long octeon_crypto_enable(struct octeon_cop2_state *);
-extern void octeon_crypto_disable(struct octeon_cop2_state *, unsigned long);
-
-#define SG_INIT(s, p, i, l) \
-       { \
-           (i) = 0; \
-           (l) = (s)[0].length; \
-           (p) = (typeof(p)) sg_virt((s)); \
-               CVMX_PREFETCH0((p)); \
-       }
-
-#define SG_CONSUME(s, p, i, l) \
-       { \
-               (p)++; \
-               (l) -= sizeof(*(p)); \
-               if ((l) < 0) { \
-                       dprintk("%s, %d: l = %d\n", __FILE__, __LINE__, l); \
-               } else if ((l) == 0) { \
-                   (i)++; \
-                   (l) = (s)[0].length; \
-                   (p) = (typeof(p)) sg_virt(s); \
-                       CVMX_PREFETCH0((p)); \
-               } \
-       }
-
-#define ESP_HEADER_LENGTH     8
-#define DES_CBC_IV_LENGTH     8
-#define AES_CBC_IV_LENGTH     16
-#define ESP_HMAC_LEN          12
-
-#define ESP_HEADER_LENGTH 8
-#define DES_CBC_IV_LENGTH 8
-
-/****************************************************************************/
-
-#define CVM_LOAD_SHA_UNIT(dat, next)  { \
-   if (next == 0) {                     \
-      next = 1;                         \
-      CVMX_MT_HSH_DAT (dat, 0);         \
-   } else if (next == 1) {              \
-      next = 2;                         \
-      CVMX_MT_HSH_DAT (dat, 1);         \
-   } else if (next == 2) {              \
-      next = 3;                    \
-      CVMX_MT_HSH_DAT (dat, 2);         \
-   } else if (next == 3) {              \
-      next = 4;                         \
-      CVMX_MT_HSH_DAT (dat, 3);         \
-   } else if (next == 4) {              \
-      next = 5;                           \
-      CVMX_MT_HSH_DAT (dat, 4);         \
-   } else if (next == 5) {              \
-      next = 6;                         \
-      CVMX_MT_HSH_DAT (dat, 5);         \
-   } else if (next == 6) {              \
-      next = 7;                         \
-      CVMX_MT_HSH_DAT (dat, 6);         \
-   } else {                             \
-     CVMX_MT_HSH_STARTSHA (dat);        \
-     next = 0;                          \
-   }                                    \
-}
-
-#define CVM_LOAD2_SHA_UNIT(dat1, dat2, next)  { \
-   if (next == 0) {                      \
-      CVMX_MT_HSH_DAT (dat1, 0);         \
-      CVMX_MT_HSH_DAT (dat2, 1);         \
-      next = 2;                          \
-   } else if (next == 1) {               \
-      CVMX_MT_HSH_DAT (dat1, 1);         \
-      CVMX_MT_HSH_DAT (dat2, 2);         \
-      next = 3;                          \
-   } else if (next == 2) {               \
-      CVMX_MT_HSH_DAT (dat1, 2);         \
-      CVMX_MT_HSH_DAT (dat2, 3);         \
-      next = 4;                          \
-   } else if (next == 3) {               \
-      CVMX_MT_HSH_DAT (dat1, 3);         \
-      CVMX_MT_HSH_DAT (dat2, 4);         \
-      next = 5;                          \
-   } else if (next == 4) {               \
-      CVMX_MT_HSH_DAT (dat1, 4);         \
-      CVMX_MT_HSH_DAT (dat2, 5);         \
-      next = 6;                          \
-   } else if (next == 5) {               \
-      CVMX_MT_HSH_DAT (dat1, 5);         \
-      CVMX_MT_HSH_DAT (dat2, 6);         \
-      next = 7;                          \
-   } else if (next == 6) {               \
-      CVMX_MT_HSH_DAT (dat1, 6);         \
-      CVMX_MT_HSH_STARTSHA (dat2);       \
-      next = 0;                          \
-   } else {                              \
-     CVMX_MT_HSH_STARTSHA (dat1);        \
-     CVMX_MT_HSH_DAT (dat2, 0);          \
-     next = 1;                           \
-   }                                     \
-}
-
-/****************************************************************************/
-
-#define CVM_LOAD_MD5_UNIT(dat, next)  { \
-   if (next == 0) {                     \
-      next = 1;                         \
-      CVMX_MT_HSH_DAT (dat, 0);         \
-   } else if (next == 1) {              \
-      next = 2;                         \
-      CVMX_MT_HSH_DAT (dat, 1);         \
-   } else if (next == 2) {              \
-      next = 3;                    \
-      CVMX_MT_HSH_DAT (dat, 2);         \
-   } else if (next == 3) {              \
-      next = 4;                         \
-      CVMX_MT_HSH_DAT (dat, 3);         \
-   } else if (next == 4) {              \
-      next = 5;                           \
-      CVMX_MT_HSH_DAT (dat, 4);         \
-   } else if (next == 5) {              \
-      next = 6;                         \
-      CVMX_MT_HSH_DAT (dat, 5);         \
-   } else if (next == 6) {              \
-      next = 7;                         \
-      CVMX_MT_HSH_DAT (dat, 6);         \
-   } else {                             \
-     CVMX_MT_HSH_STARTMD5 (dat);        \
-     next = 0;                          \
-   }                                    \
-}
-
-#define CVM_LOAD2_MD5_UNIT(dat1, dat2, next)  { \
-   if (next == 0) {                      \
-      CVMX_MT_HSH_DAT (dat1, 0);         \
-      CVMX_MT_HSH_DAT (dat2, 1);         \
-      next = 2;                          \
-   } else if (next == 1) {               \
-      CVMX_MT_HSH_DAT (dat1, 1);         \
-      CVMX_MT_HSH_DAT (dat2, 2);         \
-      next = 3;                          \
-   } else if (next == 2) {               \
-      CVMX_MT_HSH_DAT (dat1, 2);         \
-      CVMX_MT_HSH_DAT (dat2, 3);         \
-      next = 4;                          \
-   } else if (next == 3) {               \
-      CVMX_MT_HSH_DAT (dat1, 3);         \
-      CVMX_MT_HSH_DAT (dat2, 4);         \
-      next = 5;                          \
-   } else if (next == 4) {               \
-      CVMX_MT_HSH_DAT (dat1, 4);         \
-      CVMX_MT_HSH_DAT (dat2, 5);         \
-      next = 6;                          \
-   } else if (next == 5) {               \
-      CVMX_MT_HSH_DAT (dat1, 5);         \
-      CVMX_MT_HSH_DAT (dat2, 6);         \
-      next = 7;                          \
-   } else if (next == 6) {               \
-      CVMX_MT_HSH_DAT (dat1, 6);         \
-      CVMX_MT_HSH_STARTMD5 (dat2);       \
-      next = 0;                          \
-   } else {                              \
-     CVMX_MT_HSH_STARTMD5 (dat1);        \
-     CVMX_MT_HSH_DAT (dat2, 0);          \
-     next = 1;                           \
-   }                                     \
-}
-
-/****************************************************************************/
-
-static inline uint64_t
-swap64(uint64_t a)
-{
-    return ((a >> 56) |
-       (((a >> 48) & 0xfful) << 8) |
-       (((a >> 40) & 0xfful) << 16) |
-       (((a >> 32) & 0xfful) << 24) |
-       (((a >> 24) & 0xfful) << 32) |
-       (((a >> 16) & 0xfful) << 40) |
-       (((a >> 8) & 0xfful) << 48) | (((a >> 0) & 0xfful) << 56));
-}
-
-/****************************************************************************/
-
-void
-octo_calc_hash(__u8 auth, unsigned char *key, uint64_t *inner, uint64_t *outer)
-{
-    uint8_t hash_key[64];
-    uint64_t *key1;
-    register uint64_t xor1 = 0x3636363636363636ULL;
-    register uint64_t xor2 = 0x5c5c5c5c5c5c5c5cULL;
-    struct octeon_cop2_state state;
-    unsigned long flags;
-
-    dprintk("%s()\n", __FUNCTION__);
-
-    memset(hash_key, 0, sizeof(hash_key));
-    memcpy(hash_key, (uint8_t *) key, (auth ? 20 : 16));
-    key1 = (uint64_t *) hash_key;
-    flags = octeon_crypto_enable(&state);
-    if (auth) {
-       CVMX_MT_HSH_IV(0x67452301EFCDAB89ULL, 0);
-       CVMX_MT_HSH_IV(0x98BADCFE10325476ULL, 1);
-       CVMX_MT_HSH_IV(0xC3D2E1F000000000ULL, 2);
-    } else {
-       CVMX_MT_HSH_IV(0x0123456789ABCDEFULL, 0);
-       CVMX_MT_HSH_IV(0xFEDCBA9876543210ULL, 1);
-    }
-
-    CVMX_MT_HSH_DAT((*key1 ^ xor1), 0);
-    key1++;
-    CVMX_MT_HSH_DAT((*key1 ^ xor1), 1);
-    key1++;
-    CVMX_MT_HSH_DAT((*key1 ^ xor1), 2);
-    key1++;
-    CVMX_MT_HSH_DAT((*key1 ^ xor1), 3);
-    key1++;
-    CVMX_MT_HSH_DAT((*key1 ^ xor1), 4);
-    key1++;
-    CVMX_MT_HSH_DAT((*key1 ^ xor1), 5);
-    key1++;
-    CVMX_MT_HSH_DAT((*key1 ^ xor1), 6);
-    key1++;
-    if (auth)
-       CVMX_MT_HSH_STARTSHA((*key1 ^ xor1));
-    else
-       CVMX_MT_HSH_STARTMD5((*key1 ^ xor1));
-
-    CVMX_MF_HSH_IV(inner[0], 0);
-    CVMX_MF_HSH_IV(inner[1], 1);
-    if (auth) {
-       inner[2] = 0;
-       CVMX_MF_HSH_IV(((uint64_t *) inner)[2], 2);
-    }
-
-    memset(hash_key, 0, sizeof(hash_key));
-    memcpy(hash_key, (uint8_t *) key, (auth ? 20 : 16));
-    key1 = (uint64_t *) hash_key;
-    if (auth) {
-      CVMX_MT_HSH_IV(0x67452301EFCDAB89ULL, 0);
-      CVMX_MT_HSH_IV(0x98BADCFE10325476ULL, 1);
-      CVMX_MT_HSH_IV(0xC3D2E1F000000000ULL, 2);
-    } else {
-      CVMX_MT_HSH_IV(0x0123456789ABCDEFULL, 0);
-      CVMX_MT_HSH_IV(0xFEDCBA9876543210ULL, 1);
-    }
-
-    CVMX_MT_HSH_DAT((*key1 ^ xor2), 0);
-    key1++;
-    CVMX_MT_HSH_DAT((*key1 ^ xor2), 1);
-    key1++;
-    CVMX_MT_HSH_DAT((*key1 ^ xor2), 2);
-    key1++;
-    CVMX_MT_HSH_DAT((*key1 ^ xor2), 3);
-    key1++;
-    CVMX_MT_HSH_DAT((*key1 ^ xor2), 4);
-    key1++;
-    CVMX_MT_HSH_DAT((*key1 ^ xor2), 5);
-    key1++;
-    CVMX_MT_HSH_DAT((*key1 ^ xor2), 6);
-    key1++;
-    if (auth)
-       CVMX_MT_HSH_STARTSHA((*key1 ^ xor2));
-    else 
-       CVMX_MT_HSH_STARTMD5((*key1 ^ xor2));
-
-    CVMX_MF_HSH_IV(outer[0], 0);
-    CVMX_MF_HSH_IV(outer[1], 1);
-    if (auth) {
-      outer[2] = 0;
-      CVMX_MF_HSH_IV(outer[2], 2);
-    }
-    octeon_crypto_disable(&state, flags);
-    return;
-}
-
-/****************************************************************************/
-/* DES functions */
-
-int
-octo_des_cbc_encrypt(
-    struct octo_sess *od,
-    struct scatterlist *sg, int sg_len,
-    int auth_off, int auth_len,
-    int crypt_off, int crypt_len,
-    int icv_off, uint8_t *ivp)
-{
-    uint64_t *data;
-    int data_i, data_l;
-    struct octeon_cop2_state state;
-    unsigned long flags;
-
-    dprintk("%s()\n", __FUNCTION__);
-
-    if (unlikely(od == NULL || sg==NULL || sg_len==0 || ivp==NULL ||
-           (crypt_off & 0x7) || (crypt_off + crypt_len > sg_len))) {
-       dprintk("%s: Bad parameters od=%p sg=%p sg_len=%d "
-               "auth_off=%d auth_len=%d crypt_off=%d crypt_len=%d "
-               "icv_off=%d ivp=%p\n", __FUNCTION__, od, sg, sg_len,
-               auth_off, auth_len, crypt_off, crypt_len, icv_off, ivp);
-       return -EINVAL;
-    }
-
-    SG_INIT(sg, data, data_i, data_l);
-
-    CVMX_PREFETCH0(ivp);
-    CVMX_PREFETCH0(od->octo_enckey);
-
-    flags = octeon_crypto_enable(&state);
-
-    /* load 3DES Key */
-    CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 0);
-    if (od->octo_encklen == 24) {
-       CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[1], 1);
-       CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
-    } else if (od->octo_encklen == 8) {
-       CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 1);
-       CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 2);
-    } else {
-       octeon_crypto_disable(&state, flags);
-       dprintk("%s: Bad key length %d\n", __FUNCTION__, od->octo_encklen);
-       return -EINVAL;
-    }
-
-    CVMX_MT_3DES_IV(* (uint64_t *) ivp);
-
-    while (crypt_off > 0) {
-       SG_CONSUME(sg, data, data_i, data_l);
-       crypt_off -= 8;
-    }
-
-    while (crypt_len > 0) {
-       CVMX_MT_3DES_ENC_CBC(*data);
-       CVMX_MF_3DES_RESULT(*data);
-       SG_CONSUME(sg, data, data_i, data_l);
-       crypt_len -= 8;
-    }
-
-    octeon_crypto_disable(&state, flags);
-    return 0;
-}
-
-
-int
-octo_des_cbc_decrypt(
-    struct octo_sess *od,
-    struct scatterlist *sg, int sg_len,
-    int auth_off, int auth_len,
-    int crypt_off, int crypt_len,
-    int icv_off, uint8_t *ivp)
-{
-    uint64_t *data;
-    int data_i, data_l;
-    struct octeon_cop2_state state;
-    unsigned long flags;
-
-    dprintk("%s()\n", __FUNCTION__);
-
-    if (unlikely(od == NULL || sg==NULL || sg_len==0 || ivp==NULL ||
-           (crypt_off & 0x7) || (crypt_off + crypt_len > sg_len))) {
-       dprintk("%s: Bad parameters od=%p sg=%p sg_len=%d "
-               "auth_off=%d auth_len=%d crypt_off=%d crypt_len=%d "
-               "icv_off=%d ivp=%p\n", __FUNCTION__, od, sg, sg_len,
-               auth_off, auth_len, crypt_off, crypt_len, icv_off, ivp);
-       return -EINVAL;
-    }
-
-    SG_INIT(sg, data, data_i, data_l);
-
-    CVMX_PREFETCH0(ivp);
-    CVMX_PREFETCH0(od->octo_enckey);
-
-    flags = octeon_crypto_enable(&state);
-
-    /* load 3DES Key */
-    CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 0);
-    if (od->octo_encklen == 24) {
-       CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[1], 1);
-       CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
-    } else if (od->octo_encklen == 8) {
-       CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 1);
-       CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 2);
-    } else {
-       octeon_crypto_disable(&state, flags);
-       dprintk("%s: Bad key length %d\n", __FUNCTION__, od->octo_encklen);
-       return -EINVAL;
-    }
-
-    CVMX_MT_3DES_IV(* (uint64_t *) ivp);
-
-    while (crypt_off > 0) {
-       SG_CONSUME(sg, data, data_i, data_l);
-       crypt_off -= 8;
-    }
-
-    while (crypt_len > 0) {
-       CVMX_MT_3DES_DEC_CBC(*data);
-       CVMX_MF_3DES_RESULT(*data);
-       SG_CONSUME(sg, data, data_i, data_l);
-       crypt_len -= 8;
-    }
-
-    octeon_crypto_disable(&state, flags);
-    return 0;
-}
-
-/****************************************************************************/
-/* AES functions */
-
-int
-octo_aes_cbc_encrypt(
-    struct octo_sess *od,
-    struct scatterlist *sg, int sg_len,
-    int auth_off, int auth_len,
-    int crypt_off, int crypt_len,
-    int icv_off, uint8_t *ivp)
-{
-    uint64_t *data, *pdata;
-    int data_i, data_l;
-    struct octeon_cop2_state state;
-    unsigned long flags;
-
-    dprintk("%s()\n", __FUNCTION__);
-
-    if (unlikely(od == NULL || sg==NULL || sg_len==0 || ivp==NULL ||
-           (crypt_off & 0x7) || (crypt_off + crypt_len > sg_len))) {
-       dprintk("%s: Bad parameters od=%p sg=%p sg_len=%d "
-               "auth_off=%d auth_len=%d crypt_off=%d crypt_len=%d "
-               "icv_off=%d ivp=%p\n", __FUNCTION__, od, sg, sg_len,
-               auth_off, auth_len, crypt_off, crypt_len, icv_off, ivp);
-       return -EINVAL;
-    }
-
-    SG_INIT(sg, data, data_i, data_l);
-
-    CVMX_PREFETCH0(ivp);
-    CVMX_PREFETCH0(od->octo_enckey);
-
-    flags = octeon_crypto_enable(&state);
-
-    /* load AES Key */
-    CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[0], 0);
-    CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[1], 1);
-
-    if (od->octo_encklen == 16) {
-       CVMX_MT_AES_KEY(0x0, 2);
-       CVMX_MT_AES_KEY(0x0, 3);
-    } else if (od->octo_encklen == 24) {
-       CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
-       CVMX_MT_AES_KEY(0x0, 3);
-    } else if (od->octo_encklen == 32) {
-       CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
-       CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[3], 3);
-    } else {
-       octeon_crypto_disable(&state, flags);
-       dprintk("%s: Bad key length %d\n", __FUNCTION__, od->octo_encklen);
-       return -EINVAL;
-    }
-    CVMX_MT_AES_KEYLENGTH(od->octo_encklen / 8 - 1);
-
-    CVMX_MT_AES_IV(((uint64_t *) ivp)[0], 0);
-    CVMX_MT_AES_IV(((uint64_t *) ivp)[1], 1);
-
-    while (crypt_off > 0) {
-       SG_CONSUME(sg, data, data_i, data_l);
-       crypt_off -= 8;
-    }
-
-    while (crypt_len > 0) {
-       pdata = data;
-       CVMX_MT_AES_ENC_CBC0(*data);
-       SG_CONSUME(sg, data, data_i, data_l);
-       CVMX_MT_AES_ENC_CBC1(*data);
-       CVMX_MF_AES_RESULT(*pdata, 0);
-       CVMX_MF_AES_RESULT(*data, 1);
-       SG_CONSUME(sg, data, data_i, data_l);
-       crypt_len -= 16;
-    }
-
-    octeon_crypto_disable(&state, flags);
-    return 0;
-}
-
-
-int
-octo_aes_cbc_decrypt(
-    struct octo_sess *od,
-    struct scatterlist *sg, int sg_len,
-    int auth_off, int auth_len,
-    int crypt_off, int crypt_len,
-    int icv_off, uint8_t *ivp)
-{
-    uint64_t *data, *pdata;
-    int data_i, data_l;
-    struct octeon_cop2_state state;
-    unsigned long flags;
-
-    dprintk("%s()\n", __FUNCTION__);
-
-    if (unlikely(od == NULL || sg==NULL || sg_len==0 || ivp==NULL ||
-           (crypt_off & 0x7) || (crypt_off + crypt_len > sg_len))) {
-       dprintk("%s: Bad parameters od=%p sg=%p sg_len=%d "
-               "auth_off=%d auth_len=%d crypt_off=%d crypt_len=%d "
-               "icv_off=%d ivp=%p\n", __FUNCTION__, od, sg, sg_len,
-               auth_off, auth_len, crypt_off, crypt_len, icv_off, ivp);
-       return -EINVAL;
-    }
-
-    SG_INIT(sg, data, data_i, data_l);
-
-    CVMX_PREFETCH0(ivp);
-    CVMX_PREFETCH0(od->octo_enckey);
-
-    flags = octeon_crypto_enable(&state);
-
-    /* load AES Key */
-    CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[0], 0);
-    CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[1], 1);
-
-    if (od->octo_encklen == 16) {
-       CVMX_MT_AES_KEY(0x0, 2);
-       CVMX_MT_AES_KEY(0x0, 3);
-    } else if (od->octo_encklen == 24) {
-       CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
-       CVMX_MT_AES_KEY(0x0, 3);
-    } else if (od->octo_encklen == 32) {
-       CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
-       CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[3], 3);
-    } else {
-       octeon_crypto_disable(&state, flags);
-       dprintk("%s: Bad key length %d\n", __FUNCTION__, od->octo_encklen);
-       return -EINVAL;
-    }
-    CVMX_MT_AES_KEYLENGTH(od->octo_encklen / 8 - 1);
-
-    CVMX_MT_AES_IV(((uint64_t *) ivp)[0], 0);
-    CVMX_MT_AES_IV(((uint64_t *) ivp)[1], 1);
-
-    while (crypt_off > 0) {
-       SG_CONSUME(sg, data, data_i, data_l);
-       crypt_off -= 8;
-    }
-
-    while (crypt_len > 0) {
-       pdata = data;
-       CVMX_MT_AES_DEC_CBC0(*data);
-       SG_CONSUME(sg, data, data_i, data_l);
-       CVMX_MT_AES_DEC_CBC1(*data);
-       CVMX_MF_AES_RESULT(*pdata, 0);
-       CVMX_MF_AES_RESULT(*data, 1);
-       SG_CONSUME(sg, data, data_i, data_l);
-       crypt_len -= 16;
-    }
-
-    octeon_crypto_disable(&state, flags);
-    return 0;
-}
-
-/****************************************************************************/
-/* MD5 */
-
-int
-octo_null_md5_encrypt(
-    struct octo_sess *od,
-    struct scatterlist *sg, int sg_len,
-    int auth_off, int auth_len,
-    int crypt_off, int crypt_len,
-    int icv_off, uint8_t *ivp)
-{
-    register int next = 0;
-    uint64_t *data;
-    uint64_t tmp1, tmp2;
-    int data_i, data_l, alen = auth_len;
-    struct octeon_cop2_state state;
-    unsigned long flags;
-
-    dprintk("%s()\n", __FUNCTION__);
-
-    if (unlikely(od == NULL || sg==NULL || sg_len==0 ||
-           (auth_off & 0x7) || (auth_off + auth_len > sg_len))) {
-       dprintk("%s: Bad parameters od=%p sg=%p sg_len=%d "
-               "auth_off=%d auth_len=%d crypt_off=%d crypt_len=%d "
-               "icv_off=%d ivp=%p\n", __FUNCTION__, od, sg, sg_len,
-               auth_off, auth_len, crypt_off, crypt_len, icv_off, ivp);
-       return -EINVAL;
-    }
-
-    SG_INIT(sg, data, data_i, data_l);
-
-    flags = octeon_crypto_enable(&state);
-
-    /* Load MD5 IV */
-    CVMX_MT_HSH_IV(od->octo_hminner[0], 0);
-    CVMX_MT_HSH_IV(od->octo_hminner[1], 1);
-
-    while (auth_off > 0) {
-       SG_CONSUME(sg, data, data_i, data_l);
-       auth_off -= 8;
-    }
-
-    while (auth_len > 0) {
-       CVM_LOAD_MD5_UNIT(*data, next);
-       auth_len -= 8;
-       SG_CONSUME(sg, data, data_i, data_l);
-    }
-
-    /* finish the hash */
-    CVMX_PREFETCH0(od->octo_hmouter);
-#if 0
-    if (unlikely(inplen)) {
-       uint64_t tmp = 0;
-       uint8_t *p = (uint8_t *) & tmp;
-       p[inplen] = 0x80;
-       do {
-           inplen--;
-           p[inplen] = ((uint8_t *) data)[inplen];
-       } while (inplen);
-       CVM_LOAD_MD5_UNIT(tmp, next);
-    } else {
-       CVM_LOAD_MD5_UNIT(0x8000000000000000ULL, next);
-    }
-#else
-    CVM_LOAD_MD5_UNIT(0x8000000000000000ULL, next);
-#endif
-
-    /* Finish Inner hash */
-    while (next != 7) {
-       CVM_LOAD_MD5_UNIT(((uint64_t) 0x0ULL), next);
-    }
-    CVMX_ES64(tmp1, ((alen + 64) << 3));
-    CVM_LOAD_MD5_UNIT(tmp1, next);
-
-    /* Get the inner hash of HMAC */
-    CVMX_MF_HSH_IV(tmp1, 0);
-    CVMX_MF_HSH_IV(tmp2, 1);
-
-    /* Initialize hash unit */
-    CVMX_MT_HSH_IV(od->octo_hmouter[0], 0);
-    CVMX_MT_HSH_IV(od->octo_hmouter[1], 1);
-
-    CVMX_MT_HSH_DAT(tmp1, 0);
-    CVMX_MT_HSH_DAT(tmp2, 1);
-    CVMX_MT_HSH_DAT(0x8000000000000000ULL, 2);
-    CVMX_MT_HSH_DATZ(3);
-    CVMX_MT_HSH_DATZ(4);
-    CVMX_MT_HSH_DATZ(5);
-    CVMX_MT_HSH_DATZ(6);
-    CVMX_ES64(tmp1, ((64 + 16) << 3));
-    CVMX_MT_HSH_STARTMD5(tmp1);
-
-    /* save the HMAC */
-    SG_INIT(sg, data, data_i, data_l);
-    while (icv_off > 0) {
-       SG_CONSUME(sg, data, data_i, data_l);
-       icv_off -= 8;
-    }
-    CVMX_MF_HSH_IV(*data, 0);
-    SG_CONSUME(sg, data, data_i, data_l);
-    CVMX_MF_HSH_IV(tmp1, 1);
-    *(uint32_t *)data = (uint32_t) (tmp1 >> 32);
-
-    octeon_crypto_disable(&state, flags);
-    return 0;
-}
-
-/****************************************************************************/
-/* SHA1 */
-
-int
-octo_null_sha1_encrypt(
-    struct octo_sess *od,
-    struct scatterlist *sg, int sg_len,
-    int auth_off, int auth_len,
-    int crypt_off, int crypt_len,
-    int icv_off, uint8_t *ivp)
-{
-    register int next = 0;
-    uint64_t *data;
-    uint64_t tmp1, tmp2, tmp3;
-    int data_i, data_l, alen = auth_len;
-    struct octeon_cop2_state state;
-    unsigned long flags;
-
-    dprintk("%s()\n", __FUNCTION__);
-
-    if (unlikely(od == NULL || sg==NULL || sg_len==0 ||
-           (auth_off & 0x7) || (auth_off + auth_len > sg_len))) {
-       dprintk("%s: Bad parameters od=%p sg=%p sg_len=%d "
-               "auth_off=%d auth_len=%d crypt_off=%d crypt_len=%d "
-               "icv_off=%d ivp=%p\n", __FUNCTION__, od, sg, sg_len,
-               auth_off, auth_len, crypt_off, crypt_len, icv_off, ivp);
-       return -EINVAL;
-    }
-
-    SG_INIT(sg, data, data_i, data_l);
-
-    flags = octeon_crypto_enable(&state);
-
-    /* Load SHA1 IV */
-    CVMX_MT_HSH_IV(od->octo_hminner[0], 0);
-    CVMX_MT_HSH_IV(od->octo_hminner[1], 1);
-    CVMX_MT_HSH_IV(od->octo_hminner[2], 2);
-
-    while (auth_off > 0) {
-       SG_CONSUME(sg, data, data_i, data_l);
-       auth_off -= 8;
-    }
-
-    while (auth_len > 0) {
-       CVM_LOAD_SHA_UNIT(*data, next);
-       auth_len -= 8;
-       SG_CONSUME(sg, data, data_i, data_l);
-    }
-
-    /* finish the hash */
-    CVMX_PREFETCH0(od->octo_hmouter);
-#if 0
-    if (unlikely(inplen)) {
-       uint64_t tmp = 0;
-       uint8_t *p = (uint8_t *) & tmp;
-       p[inplen] = 0x80;
-       do {
-           inplen--;
-           p[inplen] = ((uint8_t *) data)[inplen];
-       } while (inplen);
-       CVM_LOAD_MD5_UNIT(tmp, next);
-    } else {
-       CVM_LOAD_MD5_UNIT(0x8000000000000000ULL, next);
-    }
-#else
-    CVM_LOAD_SHA_UNIT(0x8000000000000000ULL, next);
-#endif
-
-    /* Finish Inner hash */
-    while (next != 7) {
-       CVM_LOAD_SHA_UNIT(((uint64_t) 0x0ULL), next);
-    }
-    CVM_LOAD_SHA_UNIT((uint64_t) ((alen + 64) << 3), next);
-
-    /* Get the inner hash of HMAC */
-    CVMX_MF_HSH_IV(tmp1, 0);
-    CVMX_MF_HSH_IV(tmp2, 1);
-    tmp3 = 0;
-    CVMX_MF_HSH_IV(tmp3, 2);
-
-    /* Initialize hash unit */
-    CVMX_MT_HSH_IV(od->octo_hmouter[0], 0);
-    CVMX_MT_HSH_IV(od->octo_hmouter[1], 1);
-    CVMX_MT_HSH_IV(od->octo_hmouter[2], 2);
-
-    CVMX_MT_HSH_DAT(tmp1, 0);
-    CVMX_MT_HSH_DAT(tmp2, 1);
-    tmp3 |= 0x0000000080000000;
-    CVMX_MT_HSH_DAT(tmp3, 2);
-    CVMX_MT_HSH_DATZ(3);
-    CVMX_MT_HSH_DATZ(4);
-    CVMX_MT_HSH_DATZ(5);
-    CVMX_MT_HSH_DATZ(6);
-    CVMX_MT_HSH_STARTSHA((uint64_t) ((64 + 20) << 3));
-
-    /* save the HMAC */
-    SG_INIT(sg, data, data_i, data_l);
-    while (icv_off > 0) {
-       SG_CONSUME(sg, data, data_i, data_l);
-       icv_off -= 8;
-    }
-    CVMX_MF_HSH_IV(*data, 0);
-    SG_CONSUME(sg, data, data_i, data_l);
-    CVMX_MF_HSH_IV(tmp1, 1);
-    *(uint32_t *)data = (uint32_t) (tmp1 >> 32);
-
-    octeon_crypto_disable(&state, flags);
-    return 0;
-}
-
-/****************************************************************************/
-/* DES MD5 */
-
-int
-octo_des_cbc_md5_encrypt(
-    struct octo_sess *od,
-    struct scatterlist *sg, int sg_len,
-    int auth_off, int auth_len,
-    int crypt_off, int crypt_len,
-    int icv_off, uint8_t *ivp)
-{
-    register int next = 0;
-    union {
-       uint32_t data32[2];
-       uint64_t data64[1];
-    } mydata;
-    uint64_t *data = &mydata.data64[0];
-    uint32_t *data32;
-    uint64_t tmp1, tmp2;
-    int data_i, data_l, alen = auth_len;
-    struct octeon_cop2_state state;
-    unsigned long flags;
-
-    dprintk("%s()\n", __FUNCTION__);
-
-    if (unlikely(od == NULL || sg==NULL || sg_len==0 || ivp==NULL ||
-           (crypt_off & 0x3) || (crypt_off + crypt_len > sg_len) ||
-           (crypt_len  & 0x7) ||
-           (auth_len  & 0x7) ||
-           (auth_off & 0x3) || (auth_off + auth_len > sg_len))) {
-       dprintk("%s: Bad parameters od=%p sg=%p sg_len=%d "
-               "auth_off=%d auth_len=%d crypt_off=%d crypt_len=%d "
-               "icv_off=%d ivp=%p\n", __FUNCTION__, od, sg, sg_len,
-               auth_off, auth_len, crypt_off, crypt_len, icv_off, ivp);
-       return -EINVAL;
-    }
-
-    SG_INIT(sg, data32, data_i, data_l);
-
-    CVMX_PREFETCH0(ivp);
-    CVMX_PREFETCH0(od->octo_enckey);
-
-    flags = octeon_crypto_enable(&state);
-
-    /* load 3DES Key */
-    CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 0);
-    if (od->octo_encklen == 24) {
-       CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[1], 1);
-       CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
-    } else if (od->octo_encklen == 8) {
-       CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 1);
-       CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 2);
-    } else {
-       octeon_crypto_disable(&state, flags);
-       dprintk("%s: Bad key length %d\n", __FUNCTION__, od->octo_encklen);
-       return -EINVAL;
-    }
-
-    CVMX_MT_3DES_IV(* (uint64_t *) ivp);
-
-    /* Load MD5 IV */
-    CVMX_MT_HSH_IV(od->octo_hminner[0], 0);
-    CVMX_MT_HSH_IV(od->octo_hminner[1], 1);
-
-    while (crypt_off > 0 && auth_off > 0) {
-       SG_CONSUME(sg, data32, data_i, data_l);
-       crypt_off -= 4;
-       auth_off -= 4;
-    }
-
-    while (crypt_len > 0 || auth_len > 0) {
-       uint32_t *first = data32;
-       mydata.data32[0] = *first;
-       SG_CONSUME(sg, data32, data_i, data_l);
-       mydata.data32[1] = *data32;
-       if (crypt_off <= 0) {
-           if (crypt_len > 0) {
-               CVMX_MT_3DES_ENC_CBC(*data);
-               CVMX_MF_3DES_RESULT(*data);
-               crypt_len -= 8;
-           }
-       } else
-           crypt_off -= 8;
-       if (auth_off <= 0) {
-           if (auth_len > 0) {
-               CVM_LOAD_MD5_UNIT(*data, next);
-               auth_len -= 8;
-           }
-       } else
-           auth_off -= 8;
-       *first = mydata.data32[0];
-       *data32 = mydata.data32[1];
-       SG_CONSUME(sg, data32, data_i, data_l);
-    }
-
-    /* finish the hash */
-    CVMX_PREFETCH0(od->octo_hmouter);
-#if 0
-    if (unlikely(inplen)) {
-       uint64_t tmp = 0;
-       uint8_t *p = (uint8_t *) & tmp;
-       p[inplen] = 0x80;
-       do {
-           inplen--;
-           p[inplen] = ((uint8_t *) data)[inplen];
-       } while (inplen);
-       CVM_LOAD_MD5_UNIT(tmp, next);
-    } else {
-       CVM_LOAD_MD5_UNIT(0x8000000000000000ULL, next);
-    }
-#else
-    CVM_LOAD_MD5_UNIT(0x8000000000000000ULL, next);
-#endif
-
-    /* Finish Inner hash */
-    while (next != 7) {
-       CVM_LOAD_MD5_UNIT(((uint64_t) 0x0ULL), next);
-    }
-    CVMX_ES64(tmp1, ((alen + 64) << 3));
-    CVM_LOAD_MD5_UNIT(tmp1, next);
-
-    /* Get the inner hash of HMAC */
-    CVMX_MF_HSH_IV(tmp1, 0);
-    CVMX_MF_HSH_IV(tmp2, 1);
-
-    /* Initialize hash unit */
-    CVMX_MT_HSH_IV(od->octo_hmouter[0], 0);
-    CVMX_MT_HSH_IV(od->octo_hmouter[1], 1);
-
-    CVMX_MT_HSH_DAT(tmp1, 0);
-    CVMX_MT_HSH_DAT(tmp2, 1);
-    CVMX_MT_HSH_DAT(0x8000000000000000ULL, 2);
-    CVMX_MT_HSH_DATZ(3);
-    CVMX_MT_HSH_DATZ(4);
-    CVMX_MT_HSH_DATZ(5);
-    CVMX_MT_HSH_DATZ(6);
-    CVMX_ES64(tmp1, ((64 + 16) << 3));
-    CVMX_MT_HSH_STARTMD5(tmp1);
-
-    /* save the HMAC */
-    SG_INIT(sg, data32, data_i, data_l);
-    while (icv_off > 0) {
-       SG_CONSUME(sg, data32, data_i, data_l);
-       icv_off -= 4;
-    }
-    CVMX_MF_HSH_IV(tmp1, 0);
-    *data32 = (uint32_t) (tmp1 >> 32);
-    SG_CONSUME(sg, data32, data_i, data_l);
-    *data32 = (uint32_t) tmp1;
-    SG_CONSUME(sg, data32, data_i, data_l);
-    CVMX_MF_HSH_IV(tmp1, 1);
-    *data32 = (uint32_t) (tmp1 >> 32);
-
-    octeon_crypto_disable(&state, flags);
-    return 0;
-}
-
-int
-octo_des_cbc_md5_decrypt(
-    struct octo_sess *od,
-    struct scatterlist *sg, int sg_len,
-    int auth_off, int auth_len,
-    int crypt_off, int crypt_len,
-    int icv_off, uint8_t *ivp)
-{
-    register int next = 0;
-    union {
-       uint32_t data32[2];
-       uint64_t data64[1];
-    } mydata;
-    uint64_t *data = &mydata.data64[0];
-    uint32_t *data32;
-    uint64_t tmp1, tmp2;
-    int data_i, data_l, alen = auth_len;
-    struct octeon_cop2_state state;
-    unsigned long flags;
-
-    dprintk("%s()\n", __FUNCTION__);
-
-    if (unlikely(od == NULL || sg==NULL || sg_len==0 || ivp==NULL ||
-           (crypt_off & 0x3) || (crypt_off + crypt_len > sg_len) ||
-           (crypt_len  & 0x7) ||
-           (auth_len  & 0x7) ||
-           (auth_off & 0x3) || (auth_off + auth_len > sg_len))) {
-       dprintk("%s: Bad parameters od=%p sg=%p sg_len=%d "
-               "auth_off=%d auth_len=%d crypt_off=%d crypt_len=%d "
-               "icv_off=%d ivp=%p\n", __FUNCTION__, od, sg, sg_len,
-               auth_off, auth_len, crypt_off, crypt_len, icv_off, ivp);
-       return -EINVAL;
-    }
-
-    SG_INIT(sg, data32, data_i, data_l);
-
-    CVMX_PREFETCH0(ivp);
-    CVMX_PREFETCH0(od->octo_enckey);
-
-    flags = octeon_crypto_enable(&state);
-
-    /* load 3DES Key */
-    CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 0);
-    if (od->octo_encklen == 24) {
-       CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[1], 1);
-       CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
-    } else if (od->octo_encklen == 8) {
-       CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 1);
-       CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 2);
-    } else {
-       octeon_crypto_disable(&state, flags);
-       dprintk("%s: Bad key length %d\n", __FUNCTION__, od->octo_encklen);
-       return -EINVAL;
-    }
-
-    CVMX_MT_3DES_IV(* (uint64_t *) ivp);
-
-    /* Load MD5 IV */
-    CVMX_MT_HSH_IV(od->octo_hminner[0], 0);
-    CVMX_MT_HSH_IV(od->octo_hminner[1], 1);
-
-    while (crypt_off > 0 && auth_off > 0) {
-       SG_CONSUME(sg, data32, data_i, data_l);
-       crypt_off -= 4;
-       auth_off -= 4;
-    }
-
-    while (crypt_len > 0 || auth_len > 0) {
-       uint32_t *first = data32;
-       mydata.data32[0] = *first;
-       SG_CONSUME(sg, data32, data_i, data_l);
-       mydata.data32[1] = *data32;
-       if (auth_off <= 0) {
-           if (auth_len > 0) {
-               CVM_LOAD_MD5_UNIT(*data, next);
-               auth_len -= 8;
-           }
-       } else
-           auth_off -= 8;
-       if (crypt_off <= 0) {
-           if (crypt_len > 0) {
-               CVMX_MT_3DES_DEC_CBC(*data);
-               CVMX_MF_3DES_RESULT(*data);
-               crypt_len -= 8;
-           }
-       } else
-           crypt_off -= 8;
-       *first = mydata.data32[0];
-       *data32 = mydata.data32[1];
-       SG_CONSUME(sg, data32, data_i, data_l);
-    }
-
-    /* finish the hash */
-    CVMX_PREFETCH0(od->octo_hmouter);
-#if 0
-    if (unlikely(inplen)) {
-       uint64_t tmp = 0;
-       uint8_t *p = (uint8_t *) & tmp;
-       p[inplen] = 0x80;
-       do {
-           inplen--;
-           p[inplen] = ((uint8_t *) data)[inplen];
-       } while (inplen);
-       CVM_LOAD_MD5_UNIT(tmp, next);
-    } else {
-       CVM_LOAD_MD5_UNIT(0x8000000000000000ULL, next);
-    }
-#else
-    CVM_LOAD_MD5_UNIT(0x8000000000000000ULL, next);
-#endif
-
-    /* Finish Inner hash */
-    while (next != 7) {
-       CVM_LOAD_MD5_UNIT(((uint64_t) 0x0ULL), next);
-    }
-    CVMX_ES64(tmp1, ((alen + 64) << 3));
-    CVM_LOAD_MD5_UNIT(tmp1, next);
-
-    /* Get the inner hash of HMAC */
-    CVMX_MF_HSH_IV(tmp1, 0);
-    CVMX_MF_HSH_IV(tmp2, 1);
-
-    /* Initialize hash unit */
-    CVMX_MT_HSH_IV(od->octo_hmouter[0], 0);
-    CVMX_MT_HSH_IV(od->octo_hmouter[1], 1);
-
-    CVMX_MT_HSH_DAT(tmp1, 0);
-    CVMX_MT_HSH_DAT(tmp2, 1);
-    CVMX_MT_HSH_DAT(0x8000000000000000ULL, 2);
-    CVMX_MT_HSH_DATZ(3);
-    CVMX_MT_HSH_DATZ(4);
-    CVMX_MT_HSH_DATZ(5);
-    CVMX_MT_HSH_DATZ(6);
-    CVMX_ES64(tmp1, ((64 + 16) << 3));
-    CVMX_MT_HSH_STARTMD5(tmp1);
-
-    /* save the HMAC */
-    SG_INIT(sg, data32, data_i, data_l);
-    while (icv_off > 0) {
-       SG_CONSUME(sg, data32, data_i, data_l);
-       icv_off -= 4;
-    }
-    CVMX_MF_HSH_IV(tmp1, 0);
-    *data32 = (uint32_t) (tmp1 >> 32);
-    SG_CONSUME(sg, data32, data_i, data_l);
-    *data32 = (uint32_t) tmp1;
-    SG_CONSUME(sg, data32, data_i, data_l);
-    CVMX_MF_HSH_IV(tmp1, 1);
-    *data32 = (uint32_t) (tmp1 >> 32);
-
-    octeon_crypto_disable(&state, flags);
-    return 0;
-}
-
-/****************************************************************************/
-/* DES SHA */
-
-int
-octo_des_cbc_sha1_encrypt(
-    struct octo_sess *od,
-    struct scatterlist *sg, int sg_len,
-    int auth_off, int auth_len,
-    int crypt_off, int crypt_len,
-    int icv_off, uint8_t *ivp)
-{
-    register int next = 0;
-    union {
-       uint32_t data32[2];
-       uint64_t data64[1];
-    } mydata;
-    uint64_t *data = &mydata.data64[0];
-    uint32_t *data32;
-    uint64_t tmp1, tmp2, tmp3;
-    int data_i, data_l, alen = auth_len;
-    struct octeon_cop2_state state;
-    unsigned long flags;
-
-    dprintk("%s()\n", __FUNCTION__);
-
-    if (unlikely(od == NULL || sg==NULL || sg_len==0 || ivp==NULL ||
-           (crypt_off & 0x3) || (crypt_off + crypt_len > sg_len) ||
-           (crypt_len  & 0x7) ||
-           (auth_len  & 0x7) ||
-           (auth_off & 0x3) || (auth_off + auth_len > sg_len))) {
-       dprintk("%s: Bad parameters od=%p sg=%p sg_len=%d "
-               "auth_off=%d auth_len=%d crypt_off=%d crypt_len=%d "
-               "icv_off=%d ivp=%p\n", __FUNCTION__, od, sg, sg_len,
-               auth_off, auth_len, crypt_off, crypt_len, icv_off, ivp);
-       return -EINVAL;
-    }
-
-    SG_INIT(sg, data32, data_i, data_l);
-
-    CVMX_PREFETCH0(ivp);
-    CVMX_PREFETCH0(od->octo_enckey);
-
-    flags = octeon_crypto_enable(&state);
-
-    /* load 3DES Key */
-    CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 0);
-    if (od->octo_encklen == 24) {
-       CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[1], 1);
-       CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
-    } else if (od->octo_encklen == 8) {
-       CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 1);
-       CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 2);
-    } else {
-       octeon_crypto_disable(&state, flags);
-       dprintk("%s: Bad key length %d\n", __FUNCTION__, od->octo_encklen);
-       return -EINVAL;
-    }
-
-    CVMX_MT_3DES_IV(* (uint64_t *) ivp);
-
-    /* Load SHA1 IV */
-    CVMX_MT_HSH_IV(od->octo_hminner[0], 0);
-    CVMX_MT_HSH_IV(od->octo_hminner[1], 1);
-    CVMX_MT_HSH_IV(od->octo_hminner[2], 2);
-
-    while (crypt_off > 0 && auth_off > 0) {
-       SG_CONSUME(sg, data32, data_i, data_l);
-       crypt_off -= 4;
-       auth_off -= 4;
-    }
-
-    while (crypt_len > 0 || auth_len > 0) {
-       uint32_t *first = data32;
-       mydata.data32[0] = *first;
-       SG_CONSUME(sg, data32, data_i, data_l);
-       mydata.data32[1] = *data32;
-       if (crypt_off <= 0) {
-           if (crypt_len > 0) {
-               CVMX_MT_3DES_ENC_CBC(*data);
-               CVMX_MF_3DES_RESULT(*data);
-               crypt_len -= 8;
-           }
-       } else
-           crypt_off -= 8;
-       if (auth_off <= 0) {
-           if (auth_len > 0) {
-               CVM_LOAD_SHA_UNIT(*data, next);
-               auth_len -= 8;
-           }
-       } else
-           auth_off -= 8;
-       *first = mydata.data32[0];
-       *data32 = mydata.data32[1];
-       SG_CONSUME(sg, data32, data_i, data_l);
-    }
-
-    /* finish the hash */
-    CVMX_PREFETCH0(od->octo_hmouter);
-#if 0
-    if (unlikely(inplen)) {
-       uint64_t tmp = 0;
-       uint8_t *p = (uint8_t *) & tmp;
-       p[inplen] = 0x80;
-       do {
-           inplen--;
-           p[inplen] = ((uint8_t *) data)[inplen];
-       } while (inplen);
-       CVM_LOAD_SHA_UNIT(tmp, next);
-    } else {
-       CVM_LOAD_SHA_UNIT(0x8000000000000000ULL, next);
-    }
-#else
-    CVM_LOAD_SHA_UNIT(0x8000000000000000ULL, next);
-#endif
-
-    /* Finish Inner hash */
-    while (next != 7) {
-       CVM_LOAD_SHA_UNIT(((uint64_t) 0x0ULL), next);
-    }
-       CVM_LOAD_SHA_UNIT((uint64_t) ((alen + 64) << 3), next);
-
-    /* Get the inner hash of HMAC */
-    CVMX_MF_HSH_IV(tmp1, 0);
-    CVMX_MF_HSH_IV(tmp2, 1);
-    tmp3 = 0;
-    CVMX_MF_HSH_IV(tmp3, 2);
-
-    /* Initialize hash unit */
-    CVMX_MT_HSH_IV(od->octo_hmouter[0], 0);
-    CVMX_MT_HSH_IV(od->octo_hmouter[1], 1);
-    CVMX_MT_HSH_IV(od->octo_hmouter[2], 2);
-
-    CVMX_MT_HSH_DAT(tmp1, 0);
-    CVMX_MT_HSH_DAT(tmp2, 1);
-    tmp3 |= 0x0000000080000000;
-    CVMX_MT_HSH_DAT(tmp3, 2);
-    CVMX_MT_HSH_DATZ(3);
-    CVMX_MT_HSH_DATZ(4);
-    CVMX_MT_HSH_DATZ(5);
-    CVMX_MT_HSH_DATZ(6);
-    CVMX_MT_HSH_STARTSHA((uint64_t) ((64 + 20) << 3));
-
-    /* save the HMAC */
-    SG_INIT(sg, data32, data_i, data_l);
-    while (icv_off > 0) {
-       SG_CONSUME(sg, data32, data_i, data_l);
-       icv_off -= 4;
-    }
-    CVMX_MF_HSH_IV(tmp1, 0);
-    *data32 = (uint32_t) (tmp1 >> 32);
-    SG_CONSUME(sg, data32, data_i, data_l);
-    *data32 = (uint32_t) tmp1;
-    SG_CONSUME(sg, data32, data_i, data_l);
-    CVMX_MF_HSH_IV(tmp1, 1);
-    *data32 = (uint32_t) (tmp1 >> 32);
-
-    octeon_crypto_disable(&state, flags);
-    return 0;
-}
-
-int
-octo_des_cbc_sha1_decrypt(
-    struct octo_sess *od,
-    struct scatterlist *sg, int sg_len,
-    int auth_off, int auth_len,
-    int crypt_off, int crypt_len,
-    int icv_off, uint8_t *ivp)
-{
-    register int next = 0;
-    union {
-       uint32_t data32[2];
-       uint64_t data64[1];
-    } mydata;
-    uint64_t *data = &mydata.data64[0];
-    uint32_t *data32;
-    uint64_t tmp1, tmp2, tmp3;
-    int data_i, data_l, alen = auth_len;
-    struct octeon_cop2_state state;
-    unsigned long flags;
-
-    dprintk("%s()\n", __FUNCTION__);
-
-    if (unlikely(od == NULL || sg==NULL || sg_len==0 || ivp==NULL ||
-           (crypt_off & 0x3) || (crypt_off + crypt_len > sg_len) ||
-           (crypt_len  & 0x7) ||
-           (auth_len  & 0x7) ||
-           (auth_off & 0x3) || (auth_off + auth_len > sg_len))) {
-       dprintk("%s: Bad parameters od=%p sg=%p sg_len=%d "
-               "auth_off=%d auth_len=%d crypt_off=%d crypt_len=%d "
-               "icv_off=%d ivp=%p\n", __FUNCTION__, od, sg, sg_len,
-               auth_off, auth_len, crypt_off, crypt_len, icv_off, ivp);
-       return -EINVAL;
-    }
-
-    SG_INIT(sg, data32, data_i, data_l);
-
-    CVMX_PREFETCH0(ivp);
-    CVMX_PREFETCH0(od->octo_enckey);
-
-    flags = octeon_crypto_enable(&state);
-
-    /* load 3DES Key */
-    CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 0);
-    if (od->octo_encklen == 24) {
-       CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[1], 1);
-       CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
-    } else if (od->octo_encklen == 8) {
-       CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 1);
-       CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 2);
-    } else {
-       octeon_crypto_disable(&state, flags);
-       dprintk("%s: Bad key length %d\n", __FUNCTION__, od->octo_encklen);
-       return -EINVAL;
-    }
-
-    CVMX_MT_3DES_IV(* (uint64_t *) ivp);
-
-    /* Load SHA1 IV */
-    CVMX_MT_HSH_IV(od->octo_hminner[0], 0);
-    CVMX_MT_HSH_IV(od->octo_hminner[1], 1);
-    CVMX_MT_HSH_IV(od->octo_hminner[2], 2);
-
-    while (crypt_off > 0 && auth_off > 0) {
-       SG_CONSUME(sg, data32, data_i, data_l);
-       crypt_off -= 4;
-       auth_off -= 4;
-    }
-
-    while (crypt_len > 0 || auth_len > 0) {
-       uint32_t *first = data32;
-       mydata.data32[0] = *first;
-       SG_CONSUME(sg, data32, data_i, data_l);
-       mydata.data32[1] = *data32;
-       if (auth_off <= 0) {
-           if (auth_len > 0) {
-               CVM_LOAD_SHA_UNIT(*data, next);
-               auth_len -= 8;
-           }
-       } else
-           auth_off -= 8;
-       if (crypt_off <= 0) {
-           if (crypt_len > 0) {
-               CVMX_MT_3DES_DEC_CBC(*data);
-               CVMX_MF_3DES_RESULT(*data);
-               crypt_len -= 8;
-           }
-       } else
-           crypt_off -= 8;
-       *first = mydata.data32[0];
-       *data32 = mydata.data32[1];
-       SG_CONSUME(sg, data32, data_i, data_l);
-    }
-
-    /* finish the hash */
-    CVMX_PREFETCH0(od->octo_hmouter);
-#if 0
-    if (unlikely(inplen)) {
-       uint64_t tmp = 0;
-       uint8_t *p = (uint8_t *) & tmp;
-       p[inplen] = 0x80;
-       do {
-           inplen--;
-           p[inplen] = ((uint8_t *) data)[inplen];
-       } while (inplen);
-       CVM_LOAD_SHA_UNIT(tmp, next);
-    } else {
-       CVM_LOAD_SHA_UNIT(0x8000000000000000ULL, next);
-    }
-#else
-    CVM_LOAD_SHA_UNIT(0x8000000000000000ULL, next);
-#endif
-
-    /* Finish Inner hash */
-    while (next != 7) {
-       CVM_LOAD_SHA_UNIT(((uint64_t) 0x0ULL), next);
-    }
-    CVM_LOAD_SHA_UNIT((uint64_t) ((alen + 64) << 3), next);
-
-    /* Get the inner hash of HMAC */
-    CVMX_MF_HSH_IV(tmp1, 0);
-    CVMX_MF_HSH_IV(tmp2, 1);
-    tmp3 = 0;
-    CVMX_MF_HSH_IV(tmp3, 2);
-
-    /* Initialize hash unit */
-    CVMX_MT_HSH_IV(od->octo_hmouter[0], 0);
-    CVMX_MT_HSH_IV(od->octo_hmouter[1], 1);
-    CVMX_MT_HSH_IV(od->octo_hmouter[2], 2);
-
-    CVMX_MT_HSH_DAT(tmp1, 0);
-    CVMX_MT_HSH_DAT(tmp2, 1);
-    tmp3 |= 0x0000000080000000;
-    CVMX_MT_HSH_DAT(tmp3, 2);
-    CVMX_MT_HSH_DATZ(3);
-    CVMX_MT_HSH_DATZ(4);
-    CVMX_MT_HSH_DATZ(5);
-    CVMX_MT_HSH_DATZ(6);
-    CVMX_MT_HSH_STARTSHA((uint64_t) ((64 + 20) << 3));
-    /* save the HMAC */
-    SG_INIT(sg, data32, data_i, data_l);
-    while (icv_off > 0) {
-       SG_CONSUME(sg, data32, data_i, data_l);
-       icv_off -= 4;
-    }
-    CVMX_MF_HSH_IV(tmp1, 0);
-    *data32 = (uint32_t) (tmp1 >> 32);
-    SG_CONSUME(sg, data32, data_i, data_l);
-    *data32 = (uint32_t) tmp1;
-    SG_CONSUME(sg, data32, data_i, data_l);
-    CVMX_MF_HSH_IV(tmp1, 1);
-    *data32 = (uint32_t) (tmp1 >> 32);
-
-    octeon_crypto_disable(&state, flags);
-    return 0;
-}
-
-/****************************************************************************/
-/* AES MD5 */
-
-int
-octo_aes_cbc_md5_encrypt(
-    struct octo_sess *od,
-    struct scatterlist *sg, int sg_len,
-    int auth_off, int auth_len,
-    int crypt_off, int crypt_len,
-    int icv_off, uint8_t *ivp)
-{
-    register int next = 0;
-    union {
-       uint32_t data32[2];
-       uint64_t data64[1];
-    } mydata[2];
-    uint64_t *pdata = &mydata[0].data64[0];
-    uint64_t *data =  &mydata[1].data64[0];
-    uint32_t *data32;
-    uint64_t tmp1, tmp2;
-    int data_i, data_l, alen = auth_len;
-    struct octeon_cop2_state state;
-    unsigned long flags;
-
-    dprintk("%s()\n", __FUNCTION__);
-
-    if (unlikely(od == NULL || sg==NULL || sg_len==0 || ivp==NULL ||
-           (crypt_off & 0x3) || (crypt_off + crypt_len > sg_len) ||
-           (crypt_len  & 0x7) ||
-           (auth_len  & 0x7) ||
-           (auth_off & 0x3) || (auth_off + auth_len > sg_len))) {
-       dprintk("%s: Bad parameters od=%p sg=%p sg_len=%d "
-               "auth_off=%d auth_len=%d crypt_off=%d crypt_len=%d "
-               "icv_off=%d ivp=%p\n", __FUNCTION__, od, sg, sg_len,
-               auth_off, auth_len, crypt_off, crypt_len, icv_off, ivp);
-       return -EINVAL;
-    }
-
-    SG_INIT(sg, data32, data_i, data_l);
-
-    CVMX_PREFETCH0(ivp);
-    CVMX_PREFETCH0(od->octo_enckey);
-
-    flags = octeon_crypto_enable(&state);
-
-    /* load AES Key */
-    CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[0], 0);
-    CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[1], 1);
-
-    if (od->octo_encklen == 16) {
-       CVMX_MT_AES_KEY(0x0, 2);
-       CVMX_MT_AES_KEY(0x0, 3);
-    } else if (od->octo_encklen == 24) {
-       CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
-       CVMX_MT_AES_KEY(0x0, 3);
-    } else if (od->octo_encklen == 32) {
-       CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
-       CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[3], 3);
-    } else {
-       octeon_crypto_disable(&state, flags);
-       dprintk("%s: Bad key length %d\n", __FUNCTION__, od->octo_encklen);
-       return -EINVAL;
-    }
-    CVMX_MT_AES_KEYLENGTH(od->octo_encklen / 8 - 1);
-
-    CVMX_MT_AES_IV(((uint64_t *) ivp)[0], 0);
-    CVMX_MT_AES_IV(((uint64_t *) ivp)[1], 1);
-
-    /* Load MD5 IV */
-    CVMX_MT_HSH_IV(od->octo_hminner[0], 0);
-    CVMX_MT_HSH_IV(od->octo_hminner[1], 1);
-
-    while (crypt_off > 0 && auth_off > 0) {
-       SG_CONSUME(sg, data32, data_i, data_l);
-       crypt_off -= 4;
-       auth_off -= 4;
-    }
-
-    /* align auth and crypt */
-    while (crypt_off > 0 && auth_len > 0) {
-       mydata[0].data32[0] = *data32;
-       SG_CONSUME(sg, data32, data_i, data_l);
-       mydata[0].data32[1] = *data32;
-       SG_CONSUME(sg, data32, data_i, data_l);
-       CVM_LOAD_MD5_UNIT(*pdata, next);
-       crypt_off -= 8;
-       auth_len -= 8;
-    }
-
-    while (crypt_len > 0) {
-       uint32_t *pdata32[3];
-
-       pdata32[0] = data32;
-       mydata[0].data32[0] = *data32;
-       SG_CONSUME(sg, data32, data_i, data_l);
-
-       pdata32[1] = data32;
-       mydata[0].data32[1] = *data32;
-       SG_CONSUME(sg, data32, data_i, data_l);
-
-       pdata32[2] = data32;
-       mydata[1].data32[0] = *data32;
-       SG_CONSUME(sg, data32, data_i, data_l);
-
-       mydata[1].data32[1] = *data32;
-
-       CVMX_MT_AES_ENC_CBC0(*pdata);
-       CVMX_MT_AES_ENC_CBC1(*data);
-       CVMX_MF_AES_RESULT(*pdata, 0);
-       CVMX_MF_AES_RESULT(*data, 1);
-       crypt_len -= 16;
-
-       if (auth_len > 0) {
-           CVM_LOAD_MD5_UNIT(*pdata, next);
-           auth_len -= 8;
-       }
-       if (auth_len > 0) {
-           CVM_LOAD_MD5_UNIT(*data, next);
-           auth_len -= 8;
-       }
-
-       *pdata32[0] = mydata[0].data32[0];
-       *pdata32[1] = mydata[0].data32[1];
-       *pdata32[2] = mydata[1].data32[0];
-       *data32     = mydata[1].data32[1];
-
-       SG_CONSUME(sg, data32, data_i, data_l);
-    }
-
-    /* finish any left over hashing */
-    while (auth_len > 0) {
-       mydata[0].data32[0] = *data32;
-       SG_CONSUME(sg, data32, data_i, data_l);
-       mydata[0].data32[1] = *data32;
-       SG_CONSUME(sg, data32, data_i, data_l);
-       CVM_LOAD_MD5_UNIT(*pdata, next);
-       auth_len -= 8;
-    }
-
-    /* finish the hash */
-    CVMX_PREFETCH0(od->octo_hmouter);
-#if 0
-    if (unlikely(inplen)) {
-       uint64_t tmp = 0;
-       uint8_t *p = (uint8_t *) & tmp;
-       p[inplen] = 0x80;
-       do {
-           inplen--;
-           p[inplen] = ((uint8_t *) data)[inplen];
-       } while (inplen);
-       CVM_LOAD_MD5_UNIT(tmp, next);
-    } else {
-       CVM_LOAD_MD5_UNIT(0x8000000000000000ULL, next);
-    }
-#else
-    CVM_LOAD_MD5_UNIT(0x8000000000000000ULL, next);
-#endif
-
-    /* Finish Inner hash */
-    while (next != 7) {
-       CVM_LOAD_MD5_UNIT(((uint64_t) 0x0ULL), next);
-    }
-    CVMX_ES64(tmp1, ((alen + 64) << 3));
-    CVM_LOAD_MD5_UNIT(tmp1, next);
-
-    /* Get the inner hash of HMAC */
-    CVMX_MF_HSH_IV(tmp1, 0);
-    CVMX_MF_HSH_IV(tmp2, 1);
-
-    /* Initialize hash unit */
-    CVMX_MT_HSH_IV(od->octo_hmouter[0], 0);
-    CVMX_MT_HSH_IV(od->octo_hmouter[1], 1);
-
-    CVMX_MT_HSH_DAT(tmp1, 0);
-    CVMX_MT_HSH_DAT(tmp2, 1);
-    CVMX_MT_HSH_DAT(0x8000000000000000ULL, 2);
-    CVMX_MT_HSH_DATZ(3);
-    CVMX_MT_HSH_DATZ(4);
-    CVMX_MT_HSH_DATZ(5);
-    CVMX_MT_HSH_DATZ(6);
-    CVMX_ES64(tmp1, ((64 + 16) << 3));
-    CVMX_MT_HSH_STARTMD5(tmp1);
-
-    /* save the HMAC */
-    SG_INIT(sg, data32, data_i, data_l);
-    while (icv_off > 0) {
-       SG_CONSUME(sg, data32, data_i, data_l);
-       icv_off -= 4;
-    }
-    CVMX_MF_HSH_IV(tmp1, 0);
-    *data32 = (uint32_t) (tmp1 >> 32);
-    SG_CONSUME(sg, data32, data_i, data_l);
-    *data32 = (uint32_t) tmp1;
-    SG_CONSUME(sg, data32, data_i, data_l);
-    CVMX_MF_HSH_IV(tmp1, 1);
-    *data32 = (uint32_t) (tmp1 >> 32);
-
-    octeon_crypto_disable(&state, flags);
-    return 0;
-}
-
-int
-octo_aes_cbc_md5_decrypt(
-    struct octo_sess *od,
-    struct scatterlist *sg, int sg_len,
-    int auth_off, int auth_len,
-    int crypt_off, int crypt_len,
-    int icv_off, uint8_t *ivp)
-{
-    register int next = 0;
-    union {
-       uint32_t data32[2];
-       uint64_t data64[1];
-    } mydata[2];
-    uint64_t *pdata = &mydata[0].data64[0];
-    uint64_t *data =  &mydata[1].data64[0];
-    uint32_t *data32;
-    uint64_t tmp1, tmp2;
-    int data_i, data_l, alen = auth_len;
-    struct octeon_cop2_state state;
-    unsigned long flags;
-
-    dprintk("%s()\n", __FUNCTION__);
-
-    if (unlikely(od == NULL || sg==NULL || sg_len==0 || ivp==NULL ||
-           (crypt_off & 0x3) || (crypt_off + crypt_len > sg_len) ||
-           (crypt_len  & 0x7) ||
-           (auth_len  & 0x7) ||
-           (auth_off & 0x3) || (auth_off + auth_len > sg_len))) {
-       dprintk("%s: Bad parameters od=%p sg=%p sg_len=%d "
-               "auth_off=%d auth_len=%d crypt_off=%d crypt_len=%d "
-               "icv_off=%d ivp=%p\n", __FUNCTION__, od, sg, sg_len,
-               auth_off, auth_len, crypt_off, crypt_len, icv_off, ivp);
-       return -EINVAL;
-    }
-
-    SG_INIT(sg, data32, data_i, data_l);
-
-    CVMX_PREFETCH0(ivp);
-    CVMX_PREFETCH0(od->octo_enckey);
-
-    flags = octeon_crypto_enable(&state);
-
-    /* load AES Key */
-    CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[0], 0);
-    CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[1], 1);
-
-    if (od->octo_encklen == 16) {
-       CVMX_MT_AES_KEY(0x0, 2);
-       CVMX_MT_AES_KEY(0x0, 3);
-    } else if (od->octo_encklen == 24) {
-       CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
-       CVMX_MT_AES_KEY(0x0, 3);
-    } else if (od->octo_encklen == 32) {
-       CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
-       CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[3], 3);
-    } else {
-       octeon_crypto_disable(&state, flags);
-       dprintk("%s: Bad key length %d\n", __FUNCTION__, od->octo_encklen);
-       return -EINVAL;
-    }
-    CVMX_MT_AES_KEYLENGTH(od->octo_encklen / 8 - 1);
-
-    CVMX_MT_AES_IV(((uint64_t *) ivp)[0], 0);
-    CVMX_MT_AES_IV(((uint64_t *) ivp)[1], 1);
-
-    /* Load MD5 IV */
-    CVMX_MT_HSH_IV(od->octo_hminner[0], 0);
-    CVMX_MT_HSH_IV(od->octo_hminner[1], 1);
-
-    while (crypt_off > 0 && auth_off > 0) {
-       SG_CONSUME(sg, data32, data_i, data_l);
-       crypt_off -= 4;
-       auth_off -= 4;
-    }
-
-    /* align auth and crypt */
-    while (crypt_off > 0 && auth_len > 0) {
-       mydata[0].data32[0] = *data32;
-       SG_CONSUME(sg, data32, data_i, data_l);
-       mydata[0].data32[1] = *data32;
-       SG_CONSUME(sg, data32, data_i, data_l);
-       CVM_LOAD_MD5_UNIT(*pdata, next);
-       crypt_off -= 8;
-       auth_len -= 8;
-    }
-
-    while (crypt_len > 0) {
-       uint32_t *pdata32[3];
-
-       pdata32[0] = data32;
-       mydata[0].data32[0] = *data32;
-       SG_CONSUME(sg, data32, data_i, data_l);
-       pdata32[1] = data32;
-       mydata[0].data32[1] = *data32;
-       SG_CONSUME(sg, data32, data_i, data_l);
-       pdata32[2] = data32;
-       mydata[1].data32[0] = *data32;
-       SG_CONSUME(sg, data32, data_i, data_l);
-       mydata[1].data32[1] = *data32;
-
-       if (auth_len > 0) {
-           CVM_LOAD_MD5_UNIT(*pdata, next);
-           auth_len -= 8;
-       }
-
-       if (auth_len > 0) {
-           CVM_LOAD_MD5_UNIT(*data, next);
-           auth_len -= 8;
-       }
-
-       CVMX_MT_AES_DEC_CBC0(*pdata);
-       CVMX_MT_AES_DEC_CBC1(*data);
-       CVMX_MF_AES_RESULT(*pdata, 0);
-       CVMX_MF_AES_RESULT(*data, 1);
-       crypt_len -= 16;
-
-       *pdata32[0] = mydata[0].data32[0];
-       *pdata32[1] = mydata[0].data32[1];
-       *pdata32[2] = mydata[1].data32[0];
-       *data32     = mydata[1].data32[1];
-
-       SG_CONSUME(sg, data32, data_i, data_l);
-    }
-
-    /* finish left over hash if any */
-    while (auth_len > 0) {
-       mydata[0].data32[0] = *data32;
-       SG_CONSUME(sg, data32, data_i, data_l);
-       mydata[0].data32[1] = *data32;
-       SG_CONSUME(sg, data32, data_i, data_l);
-       CVM_LOAD_MD5_UNIT(*pdata, next);
-       auth_len -= 8;
-    }
-
-
-    /* finish the hash */
-    CVMX_PREFETCH0(od->octo_hmouter);
-#if 0
-    if (unlikely(inplen)) {
-       uint64_t tmp = 0;
-       uint8_t *p = (uint8_t *) & tmp;
-       p[inplen] = 0x80;
-       do {
-           inplen--;
-           p[inplen] = ((uint8_t *) data)[inplen];
-       } while (inplen);
-       CVM_LOAD_MD5_UNIT(tmp, next);
-    } else {
-       CVM_LOAD_MD5_UNIT(0x8000000000000000ULL, next);
-    }
-#else
-    CVM_LOAD_MD5_UNIT(0x8000000000000000ULL, next);
-#endif
-
-    /* Finish Inner hash */
-    while (next != 7) {
-       CVM_LOAD_MD5_UNIT(((uint64_t) 0x0ULL), next);
-    }
-    CVMX_ES64(tmp1, ((alen + 64) << 3));
-    CVM_LOAD_MD5_UNIT(tmp1, next);
-
-    /* Get the inner hash of HMAC */
-    CVMX_MF_HSH_IV(tmp1, 0);
-    CVMX_MF_HSH_IV(tmp2, 1);
-
-    /* Initialize hash unit */
-    CVMX_MT_HSH_IV(od->octo_hmouter[0], 0);
-    CVMX_MT_HSH_IV(od->octo_hmouter[1], 1);
-
-    CVMX_MT_HSH_DAT(tmp1, 0);
-    CVMX_MT_HSH_DAT(tmp2, 1);
-    CVMX_MT_HSH_DAT(0x8000000000000000ULL, 2);
-    CVMX_MT_HSH_DATZ(3);
-    CVMX_MT_HSH_DATZ(4);
-    CVMX_MT_HSH_DATZ(5);
-    CVMX_MT_HSH_DATZ(6);
-    CVMX_ES64(tmp1, ((64 + 16) << 3));
-    CVMX_MT_HSH_STARTMD5(tmp1);
-
-    /* save the HMAC */
-    SG_INIT(sg, data32, data_i, data_l);
-    while (icv_off > 0) {
-       SG_CONSUME(sg, data32, data_i, data_l);
-       icv_off -= 4;
-    }
-    CVMX_MF_HSH_IV(tmp1, 0);
-    *data32 = (uint32_t) (tmp1 >> 32);
-    SG_CONSUME(sg, data32, data_i, data_l);
-    *data32 = (uint32_t) tmp1;
-    SG_CONSUME(sg, data32, data_i, data_l);
-    CVMX_MF_HSH_IV(tmp1, 1);
-    *data32 = (uint32_t) (tmp1 >> 32);
-
-    octeon_crypto_disable(&state, flags);
-    return 0;
-}
-
-/****************************************************************************/
-/* AES SHA1 */
-
-int
-octo_aes_cbc_sha1_encrypt(
-    struct octo_sess *od,
-    struct scatterlist *sg, int sg_len,
-    int auth_off, int auth_len,
-    int crypt_off, int crypt_len,
-    int icv_off, uint8_t *ivp)
-{
-    register int next = 0;
-    union {
-       uint32_t data32[2];
-       uint64_t data64[1];
-    } mydata[2];
-    uint64_t *pdata = &mydata[0].data64[0];
-    uint64_t *data =  &mydata[1].data64[0];
-    uint32_t *data32;
-    uint64_t tmp1, tmp2, tmp3;
-    int data_i, data_l, alen = auth_len;
-    struct octeon_cop2_state state;
-    unsigned long flags;
-
-    dprintk("%s(a_off=%d a_len=%d c_off=%d c_len=%d icv_off=%d)\n",
-                       __FUNCTION__, auth_off, auth_len, crypt_off, crypt_len, icv_off);
-
-    if (unlikely(od == NULL || sg==NULL || sg_len==0 || ivp==NULL ||
-           (crypt_off & 0x3) || (crypt_off + crypt_len > sg_len) ||
-           (crypt_len  & 0x7) ||
-           (auth_len  & 0x7) ||
-           (auth_off & 0x3) || (auth_off + auth_len > sg_len))) {
-       dprintk("%s: Bad parameters od=%p sg=%p sg_len=%d "
-               "auth_off=%d auth_len=%d crypt_off=%d crypt_len=%d "
-               "icv_off=%d ivp=%p\n", __FUNCTION__, od, sg, sg_len,
-               auth_off, auth_len, crypt_off, crypt_len, icv_off, ivp);
-       return -EINVAL;
-    }
-
-    SG_INIT(sg, data32, data_i, data_l);
-
-    CVMX_PREFETCH0(ivp);
-    CVMX_PREFETCH0(od->octo_enckey);
-
-    flags = octeon_crypto_enable(&state);
-
-    /* load AES Key */
-    CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[0], 0);
-    CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[1], 1);
-
-    if (od->octo_encklen == 16) {
-       CVMX_MT_AES_KEY(0x0, 2);
-       CVMX_MT_AES_KEY(0x0, 3);
-    } else if (od->octo_encklen == 24) {
-       CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
-       CVMX_MT_AES_KEY(0x0, 3);
-    } else if (od->octo_encklen == 32) {
-       CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
-       CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[3], 3);
-    } else {
-       octeon_crypto_disable(&state, flags);
-       dprintk("%s: Bad key length %d\n", __FUNCTION__, od->octo_encklen);
-       return -EINVAL;
-    }
-    CVMX_MT_AES_KEYLENGTH(od->octo_encklen / 8 - 1);
-
-    CVMX_MT_AES_IV(((uint64_t *) ivp)[0], 0);
-    CVMX_MT_AES_IV(((uint64_t *) ivp)[1], 1);
-
-    /* Load SHA IV */
-    CVMX_MT_HSH_IV(od->octo_hminner[0], 0);
-    CVMX_MT_HSH_IV(od->octo_hminner[1], 1);
-    CVMX_MT_HSH_IV(od->octo_hminner[2], 2);
-
-    while (crypt_off > 0 && auth_off > 0) {
-       SG_CONSUME(sg, data32, data_i, data_l);
-       crypt_off -= 4;
-       auth_off -= 4;
-    }
-
-    /* align auth and crypt */
-    while (crypt_off > 0 && auth_len > 0) {
-       mydata[0].data32[0] = *data32;
-       SG_CONSUME(sg, data32, data_i, data_l);
-       mydata[0].data32[1] = *data32;
-       SG_CONSUME(sg, data32, data_i, data_l);
-       CVM_LOAD_SHA_UNIT(*pdata, next);
-       crypt_off -= 8;
-       auth_len -= 8;
-    }
-
-    while (crypt_len > 0) {
-       uint32_t *pdata32[3];
-
-       pdata32[0] = data32;
-       mydata[0].data32[0] = *data32;
-       SG_CONSUME(sg, data32, data_i, data_l);
-       pdata32[1] = data32;
-       mydata[0].data32[1] = *data32;
-       SG_CONSUME(sg, data32, data_i, data_l);
-       pdata32[2] = data32;
-       mydata[1].data32[0] = *data32;
-       SG_CONSUME(sg, data32, data_i, data_l);
-       mydata[1].data32[1] = *data32;
-
-       CVMX_MT_AES_ENC_CBC0(*pdata);
-       CVMX_MT_AES_ENC_CBC1(*data);
-       CVMX_MF_AES_RESULT(*pdata, 0);
-       CVMX_MF_AES_RESULT(*data, 1);
-       crypt_len -= 16;
-
-       if (auth_len > 0) {
-           CVM_LOAD_SHA_UNIT(*pdata, next);
-           auth_len -= 8;
-       }
-       if (auth_len > 0) {
-           CVM_LOAD_SHA_UNIT(*data, next);
-           auth_len -= 8;
-       }
-
-       *pdata32[0] = mydata[0].data32[0];
-       *pdata32[1] = mydata[0].data32[1];
-       *pdata32[2] = mydata[1].data32[0];
-       *data32     = mydata[1].data32[1];
-
-       SG_CONSUME(sg, data32, data_i, data_l);
-    }
-
-    /* finish and hashing */
-    while (auth_len > 0) {
-       mydata[0].data32[0] = *data32;
-       SG_CONSUME(sg, data32, data_i, data_l);
-       mydata[0].data32[1] = *data32;
-       SG_CONSUME(sg, data32, data_i, data_l);
-       CVM_LOAD_SHA_UNIT(*pdata, next);
-       auth_len -= 8;
-    }
-
-    /* finish the hash */
-    CVMX_PREFETCH0(od->octo_hmouter);
-#if 0
-    if (unlikely(inplen)) {
-       uint64_t tmp = 0;
-       uint8_t *p = (uint8_t *) & tmp;
-       p[inplen] = 0x80;
-       do {
-           inplen--;
-           p[inplen] = ((uint8_t *) data)[inplen];
-       } while (inplen);
-       CVM_LOAD_SHA_UNIT(tmp, next);
-    } else {
-       CVM_LOAD_SHA_UNIT(0x8000000000000000ULL, next);
-    }
-#else
-    CVM_LOAD_SHA_UNIT(0x8000000000000000ULL, next);
-#endif
-
-    /* Finish Inner hash */
-    while (next != 7) {
-       CVM_LOAD_SHA_UNIT(((uint64_t) 0x0ULL), next);
-    }
-    CVM_LOAD_SHA_UNIT((uint64_t) ((alen + 64) << 3), next);
-
-    /* Get the inner hash of HMAC */
-    CVMX_MF_HSH_IV(tmp1, 0);
-    CVMX_MF_HSH_IV(tmp2, 1);
-    tmp3 = 0;
-    CVMX_MF_HSH_IV(tmp3, 2);
-
-    /* Initialize hash unit */
-    CVMX_MT_HSH_IV(od->octo_hmouter[0], 0);
-    CVMX_MT_HSH_IV(od->octo_hmouter[1], 1);
-    CVMX_MT_HSH_IV(od->octo_hmouter[2], 2);
-
-    CVMX_MT_HSH_DAT(tmp1, 0);
-    CVMX_MT_HSH_DAT(tmp2, 1);
-    tmp3 |= 0x0000000080000000;
-    CVMX_MT_HSH_DAT(tmp3, 2);
-    CVMX_MT_HSH_DATZ(3);
-    CVMX_MT_HSH_DATZ(4);
-    CVMX_MT_HSH_DATZ(5);
-    CVMX_MT_HSH_DATZ(6);
-    CVMX_MT_HSH_STARTSHA((uint64_t) ((64 + 20) << 3));
-
-    /* finish the hash */
-    CVMX_PREFETCH0(od->octo_hmouter);
-#if 0
-    if (unlikely(inplen)) {
-       uint64_t tmp = 0;
-       uint8_t *p = (uint8_t *) & tmp;
-       p[inplen] = 0x80;
-       do {
-           inplen--;
-           p[inplen] = ((uint8_t *) data)[inplen];
-       } while (inplen);
-       CVM_LOAD_MD5_UNIT(tmp, next);
-    } else {
-       CVM_LOAD_MD5_UNIT(0x8000000000000000ULL, next);
-    }
-#else
-    CVM_LOAD_MD5_UNIT(0x8000000000000000ULL, next);
-#endif
-
-    /* save the HMAC */
-    SG_INIT(sg, data32, data_i, data_l);
-    while (icv_off > 0) {
-       SG_CONSUME(sg, data32, data_i, data_l);
-       icv_off -= 4;
-    }
-    CVMX_MF_HSH_IV(tmp1, 0);
-    *data32 = (uint32_t) (tmp1 >> 32);
-    SG_CONSUME(sg, data32, data_i, data_l);
-    *data32 = (uint32_t) tmp1;
-    SG_CONSUME(sg, data32, data_i, data_l);
-    CVMX_MF_HSH_IV(tmp1, 1);
-    *data32 = (uint32_t) (tmp1 >> 32);
-
-    octeon_crypto_disable(&state, flags);
-    return 0;
-}
-
-int
-octo_aes_cbc_sha1_decrypt(
-    struct octo_sess *od,
-    struct scatterlist *sg, int sg_len,
-    int auth_off, int auth_len,
-    int crypt_off, int crypt_len,
-    int icv_off, uint8_t *ivp)
-{
-    register int next = 0;
-    union {
-       uint32_t data32[2];
-       uint64_t data64[1];
-    } mydata[2];
-    uint64_t *pdata = &mydata[0].data64[0];
-    uint64_t *data =  &mydata[1].data64[0];
-    uint32_t *data32;
-    uint64_t tmp1, tmp2, tmp3;
-    int data_i, data_l, alen = auth_len;
-    struct octeon_cop2_state state;
-    unsigned long flags;
-
-    dprintk("%s(a_off=%d a_len=%d c_off=%d c_len=%d icv_off=%d)\n",
-                       __FUNCTION__, auth_off, auth_len, crypt_off, crypt_len, icv_off);
-
-    if (unlikely(od == NULL || sg==NULL || sg_len==0 || ivp==NULL ||
-           (crypt_off & 0x3) || (crypt_off + crypt_len > sg_len) ||
-           (crypt_len  & 0x7) ||
-           (auth_len  & 0x7) ||
-           (auth_off & 0x3) || (auth_off + auth_len > sg_len))) {
-       dprintk("%s: Bad parameters od=%p sg=%p sg_len=%d "
-               "auth_off=%d auth_len=%d crypt_off=%d crypt_len=%d "
-               "icv_off=%d ivp=%p\n", __FUNCTION__, od, sg, sg_len,
-               auth_off, auth_len, crypt_off, crypt_len, icv_off, ivp);
-       return -EINVAL;
-    }
-
-    SG_INIT(sg, data32, data_i, data_l);
-
-    CVMX_PREFETCH0(ivp);
-    CVMX_PREFETCH0(od->octo_enckey);
-
-    flags = octeon_crypto_enable(&state);
-
-    /* load AES Key */
-    CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[0], 0);
-    CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[1], 1);
-
-    if (od->octo_encklen == 16) {
-       CVMX_MT_AES_KEY(0x0, 2);
-       CVMX_MT_AES_KEY(0x0, 3);
-    } else if (od->octo_encklen == 24) {
-       CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
-       CVMX_MT_AES_KEY(0x0, 3);
-    } else if (od->octo_encklen == 32) {
-       CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
-       CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[3], 3);
-    } else {
-       octeon_crypto_disable(&state, flags);
-       dprintk("%s: Bad key length %d\n", __FUNCTION__, od->octo_encklen);
-       return -EINVAL;
-    }
-    CVMX_MT_AES_KEYLENGTH(od->octo_encklen / 8 - 1);
-
-    CVMX_MT_AES_IV(((uint64_t *) ivp)[0], 0);
-    CVMX_MT_AES_IV(((uint64_t *) ivp)[1], 1);
-
-    /* Load SHA1 IV */
-    CVMX_MT_HSH_IV(od->octo_hminner[0], 0);
-    CVMX_MT_HSH_IV(od->octo_hminner[1], 1);
-    CVMX_MT_HSH_IV(od->octo_hminner[2], 2);
-
-    while (crypt_off > 0 && auth_off > 0) {
-       SG_CONSUME(sg, data32, data_i, data_l);
-       crypt_off -= 4;
-       auth_off -= 4;
-    }
-
-    /* align auth and crypt */
-    while (crypt_off > 0 && auth_len > 0) {
-       mydata[0].data32[0] = *data32;
-       SG_CONSUME(sg, data32, data_i, data_l);
-       mydata[0].data32[1] = *data32;
-       SG_CONSUME(sg, data32, data_i, data_l);
-       CVM_LOAD_SHA_UNIT(*pdata, next);
-       crypt_off -= 8;
-       auth_len -= 8;
-    }
-
-    while (crypt_len > 0) {
-       uint32_t *pdata32[3];
-
-       pdata32[0] = data32;
-       mydata[0].data32[0] = *data32;
-       SG_CONSUME(sg, data32, data_i, data_l);
-       pdata32[1] = data32;
-       mydata[0].data32[1] = *data32;
-       SG_CONSUME(sg, data32, data_i, data_l);
-       pdata32[2] = data32;
-       mydata[1].data32[0] = *data32;
-       SG_CONSUME(sg, data32, data_i, data_l);
-       mydata[1].data32[1] = *data32;
-
-       if (auth_len > 0) {
-           CVM_LOAD_SHA_UNIT(*pdata, next);
-           auth_len -= 8;
-       }
-       if (auth_len > 0) {
-           CVM_LOAD_SHA_UNIT(*data, next);
-           auth_len -= 8;
-       }
-
-       CVMX_MT_AES_DEC_CBC0(*pdata);
-       CVMX_MT_AES_DEC_CBC1(*data);
-       CVMX_MF_AES_RESULT(*pdata, 0);
-       CVMX_MF_AES_RESULT(*data, 1);
-       crypt_len -= 16;
-
-       *pdata32[0] = mydata[0].data32[0];
-       *pdata32[1] = mydata[0].data32[1];
-       *pdata32[2] = mydata[1].data32[0];
-       *data32     = mydata[1].data32[1];
-
-       SG_CONSUME(sg, data32, data_i, data_l);
-    }
-
-    /* finish and leftover hashing */
-    while (auth_len > 0) {
-       mydata[0].data32[0] = *data32;
-       SG_CONSUME(sg, data32, data_i, data_l);
-       mydata[0].data32[1] = *data32;
-       SG_CONSUME(sg, data32, data_i, data_l);
-       CVM_LOAD_SHA_UNIT(*pdata, next);
-       auth_len -= 8;
-    }
-
-    /* finish the hash */
-    CVMX_PREFETCH0(od->octo_hmouter);
-#if 0
-    if (unlikely(inplen)) {
-       uint64_t tmp = 0;
-       uint8_t *p = (uint8_t *) & tmp;
-       p[inplen] = 0x80;
-       do {
-           inplen--;
-           p[inplen] = ((uint8_t *) data)[inplen];
-       } while (inplen);
-       CVM_LOAD_SHA_UNIT(tmp, next);
-    } else {
-       CVM_LOAD_SHA_UNIT(0x8000000000000000ULL, next);
-    }
-#else
-    CVM_LOAD_SHA_UNIT(0x8000000000000000ULL, next);
-#endif
-
-    /* Finish Inner hash */
-    while (next != 7) {
-       CVM_LOAD_SHA_UNIT(((uint64_t) 0x0ULL), next);
-    }
-       CVM_LOAD_SHA_UNIT((uint64_t) ((alen + 64) << 3), next);
-
-    /* Get the inner hash of HMAC */
-    CVMX_MF_HSH_IV(tmp1, 0);
-    CVMX_MF_HSH_IV(tmp2, 1);
-    tmp3 = 0;
-    CVMX_MF_HSH_IV(tmp3, 2);
-
-    /* Initialize hash unit */
-    CVMX_MT_HSH_IV(od->octo_hmouter[0], 0);
-    CVMX_MT_HSH_IV(od->octo_hmouter[1], 1);
-    CVMX_MT_HSH_IV(od->octo_hmouter[2], 2);
-
-    CVMX_MT_HSH_DAT(tmp1, 0);
-    CVMX_MT_HSH_DAT(tmp2, 1);
-    tmp3 |= 0x0000000080000000;
-    CVMX_MT_HSH_DAT(tmp3, 2);
-    CVMX_MT_HSH_DATZ(3);
-    CVMX_MT_HSH_DATZ(4);
-    CVMX_MT_HSH_DATZ(5);
-    CVMX_MT_HSH_DATZ(6);
-    CVMX_MT_HSH_STARTSHA((uint64_t) ((64 + 20) << 3));
-
-    /* finish the hash */
-    CVMX_PREFETCH0(od->octo_hmouter);
-#if 0
-    if (unlikely(inplen)) {
-       uint64_t tmp = 0;
-       uint8_t *p = (uint8_t *) & tmp;
-       p[inplen] = 0x80;
-       do {
-           inplen--;
-           p[inplen] = ((uint8_t *) data)[inplen];
-       } while (inplen);
-       CVM_LOAD_MD5_UNIT(tmp, next);
-    } else {
-       CVM_LOAD_MD5_UNIT(0x8000000000000000ULL, next);
-    }
-#else
-    CVM_LOAD_MD5_UNIT(0x8000000000000000ULL, next);
-#endif
-
-    /* save the HMAC */
-    SG_INIT(sg, data32, data_i, data_l);
-    while (icv_off > 0) {
-       SG_CONSUME(sg, data32, data_i, data_l);
-       icv_off -= 4;
-    }
-    CVMX_MF_HSH_IV(tmp1, 0);
-    *data32 = (uint32_t) (tmp1 >> 32);
-    SG_CONSUME(sg, data32, data_i, data_l);
-    *data32 = (uint32_t) tmp1;
-    SG_CONSUME(sg, data32, data_i, data_l);
-    CVMX_MF_HSH_IV(tmp1, 1);
-    *data32 = (uint32_t) (tmp1 >> 32);
-
-    octeon_crypto_disable(&state, flags);
-    return 0;
-}
-
-/****************************************************************************/
diff --git a/target/linux/generic-2.4/files/crypto/ocf/cryptocteon/cryptocteon.c b/target/linux/generic-2.4/files/crypto/ocf/cryptocteon/cryptocteon.c
deleted file mode 100644 (file)
index 9940f59..0000000
+++ /dev/null
@@ -1,574 +0,0 @@
-/*
- * Octeon Crypto for OCF
- *
- * Written by David McCullough <david_mccullough@mcafee.com>
- * Copyright (C) 2009-2010 David McCullough
- *
- * LICENSE TERMS
- *
- * The free distribution and use of this software in both source and binary
- * form is allowed (with or without changes) provided that:
- *
- *   1. distributions of this source code include the above copyright
- *      notice, this list of conditions and the following disclaimer;
- *
- *   2. distributions in binary form include the above copyright
- *      notice, this list of conditions and the following disclaimer
- *      in the documentation and/or other associated materials;
- *
- *   3. the copyright holder's name is not used to endorse products
- *      built using this software without specific written permission.
- *
- * DISCLAIMER
- *
- * This software is provided 'as is' with no explicit or implied warranties
- * in respect of its properties, including, but not limited to, correctness
- * and/or fitness for purpose.
- * ---------------------------------------------------------------------------
- */
-
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/list.h>
-#include <linux/slab.h>
-#include <linux/sched.h>
-#include <linux/wait.h>
-#include <linux/crypto.h>
-#include <linux/mm.h>
-#include <linux/skbuff.h>
-#include <linux/random.h>
-#include <linux/scatterlist.h>
-
-#include <cryptodev.h>
-#include <uio.h>
-
-struct {
-       softc_device_decl       sc_dev;
-} octo_softc;
-
-#define offset_in_page(p) ((unsigned long)(p) & ~PAGE_MASK)
-
-struct octo_sess {
-       int                                      octo_encalg;
-       #define MAX_CIPHER_KEYLEN       64
-       char                             octo_enckey[MAX_CIPHER_KEYLEN];
-       int                                      octo_encklen;
-
-       int                                      octo_macalg;
-       #define MAX_HASH_KEYLEN 64
-       char                             octo_mackey[MAX_HASH_KEYLEN];
-       int                                      octo_macklen;
-       int                                      octo_mackey_set;
-
-       int                                      octo_mlen;
-       int                                      octo_ivsize;
-
-#if 0
-       int                                     (*octo_decrypt)(struct scatterlist *sg, int sg_len,
-                                                       uint8_t *key, int key_len, uint8_t * iv,
-                                                       uint64_t *hminner, uint64_t *hmouter);
-
-       int                                     (*octo_encrypt)(struct scatterlist *sg, int sg_len,
-                                                       uint8_t *key, int key_len, uint8_t * iv,
-                                                       uint64_t *hminner, uint64_t *hmouter);
-#else
-       int                                     (*octo_encrypt)(struct octo_sess *od,
-                             struct scatterlist *sg, int sg_len,
-                                                 int auth_off, int auth_len,
-                                                 int crypt_off, int crypt_len,
-                                                 int icv_off, uint8_t *ivp);
-       int                                     (*octo_decrypt)(struct octo_sess *od,
-                             struct scatterlist *sg, int sg_len,
-                                                 int auth_off, int auth_len,
-                                                 int crypt_off, int crypt_len,
-                                                 int icv_off, uint8_t *ivp);
-#endif
-
-       uint64_t                         octo_hminner[3];
-       uint64_t                         octo_hmouter[3];
-};
-
-int32_t octo_id = -1;
-module_param(octo_id, int, 0444);
-MODULE_PARM_DESC(octo_id, "Read-Only OCF ID for cryptocteon driver");
-
-static struct octo_sess **octo_sessions = NULL;
-static u_int32_t octo_sesnum = 0;
-
-static int octo_process(device_t, struct cryptop *, int);
-static int octo_newsession(device_t, u_int32_t *, struct cryptoini *);
-static int octo_freesession(device_t, u_int64_t);
-
-static device_method_t octo_methods = {
-       /* crypto device methods */
-       DEVMETHOD(cryptodev_newsession, octo_newsession),
-       DEVMETHOD(cryptodev_freesession,octo_freesession),
-       DEVMETHOD(cryptodev_process,    octo_process),
-};
-
-#define debug octo_debug
-int octo_debug = 0;
-module_param(octo_debug, int, 0644);
-MODULE_PARM_DESC(octo_debug, "Enable debug");
-
-
-#include "cavium_crypto.c"
-
-
-/*
- * Generate a new octo session.  We artifically limit it to a single
- * hash/cipher or hash-cipher combo just to make it easier, most callers
- * do not expect more than this anyway.
- */
-static int
-octo_newsession(device_t dev, u_int32_t *sid, struct cryptoini *cri)
-{
-       struct cryptoini *c, *encini = NULL, *macini = NULL;
-       struct octo_sess **ocd;
-       int i;
-
-       dprintk("%s()\n", __FUNCTION__);
-       if (sid == NULL || cri == NULL) {
-               dprintk("%s,%d - EINVAL\n", __FILE__, __LINE__);
-               return EINVAL;
-       }
-
-       /*
-        * To keep it simple, we only handle hash, cipher or hash/cipher in a
-        * session,  you cannot currently do multiple ciphers/hashes in one
-        * session even though it would be possibel to code this driver to
-        * handle it.
-        */
-       for (i = 0, c = cri; c && i < 2; i++) {
-               if (c->cri_alg == CRYPTO_MD5_HMAC ||
-                               c->cri_alg == CRYPTO_SHA1_HMAC ||
-                               c->cri_alg == CRYPTO_NULL_HMAC) {
-                       if (macini) {
-                               break;
-                       }
-                       macini = c;
-               }
-               if (c->cri_alg == CRYPTO_DES_CBC ||
-                               c->cri_alg == CRYPTO_3DES_CBC ||
-                               c->cri_alg == CRYPTO_AES_CBC ||
-                               c->cri_alg == CRYPTO_NULL_CBC) {
-                       if (encini) {
-                               break;
-                       }
-                       encini = c;
-               }
-               c = c->cri_next;
-       }
-       if (!macini && !encini) {
-               dprintk("%s,%d - EINVAL bad cipher/hash or combination\n",
-                               __FILE__, __LINE__);
-               return EINVAL;
-       }
-       if (c) {
-               dprintk("%s,%d - EINVAL cannot handle chained cipher/hash combos\n",
-                               __FILE__, __LINE__);
-               return EINVAL;
-       }
-
-       /*
-        * So we have something we can do, lets setup the session
-        */
-
-       if (octo_sessions) {
-               for (i = 1; i < octo_sesnum; i++)
-                       if (octo_sessions[i] == NULL)
-                               break;
-       } else
-               i = 1;          /* NB: to silence compiler warning */
-
-       if (octo_sessions == NULL || i == octo_sesnum) {
-               if (octo_sessions == NULL) {
-                       i = 1; /* We leave octo_sessions[0] empty */
-                       octo_sesnum = CRYPTO_SW_SESSIONS;
-               } else
-                       octo_sesnum *= 2;
-
-               ocd = kmalloc(octo_sesnum * sizeof(struct octo_sess *), SLAB_ATOMIC);
-               if (ocd == NULL) {
-                       /* Reset session number */
-                       if (octo_sesnum == CRYPTO_SW_SESSIONS)
-                               octo_sesnum = 0;
-                       else
-                               octo_sesnum /= 2;
-                       dprintk("%s,%d: ENOBUFS\n", __FILE__, __LINE__);
-                       return ENOBUFS;
-               }
-               memset(ocd, 0, octo_sesnum * sizeof(struct octo_sess *));
-
-               /* Copy existing sessions */
-               if (octo_sessions) {
-                       memcpy(ocd, octo_sessions,
-                           (octo_sesnum / 2) * sizeof(struct octo_sess *));
-                       kfree(octo_sessions);
-               }
-
-               octo_sessions = ocd;
-       }
-
-       ocd = &octo_sessions[i];
-       *sid = i;
-
-
-       *ocd = (struct octo_sess *) kmalloc(sizeof(struct octo_sess), SLAB_ATOMIC);
-       if (*ocd == NULL) {
-               octo_freesession(NULL, i);
-               dprintk("%s,%d: ENOBUFS\n", __FILE__, __LINE__);
-               return ENOBUFS;
-       }
-       memset(*ocd, 0, sizeof(struct octo_sess));
-
-       if (encini && encini->cri_key) {
-               (*ocd)->octo_encklen = (encini->cri_klen + 7) / 8;
-               memcpy((*ocd)->octo_enckey, encini->cri_key, (*ocd)->octo_encklen);
-       }
-
-       if (macini && macini->cri_key) {
-               (*ocd)->octo_macklen = (macini->cri_klen + 7) / 8;
-               memcpy((*ocd)->octo_mackey, macini->cri_key, (*ocd)->octo_macklen);
-       }
-
-       (*ocd)->octo_mlen = 0;
-       if (encini && encini->cri_mlen)
-               (*ocd)->octo_mlen = encini->cri_mlen;
-       else if (macini && macini->cri_mlen)
-               (*ocd)->octo_mlen = macini->cri_mlen;
-       else
-               (*ocd)->octo_mlen = 12;
-
-       /*
-        * point c at the enc if it exists, otherwise the mac
-        */
-       c = encini ? encini : macini;
-
-       switch (c->cri_alg) {
-       case CRYPTO_DES_CBC:
-       case CRYPTO_3DES_CBC:
-               (*ocd)->octo_ivsize  = 8;
-               switch (macini ? macini->cri_alg : -1) {
-               case CRYPTO_MD5_HMAC:
-                       (*ocd)->octo_encrypt = octo_des_cbc_md5_encrypt;
-                       (*ocd)->octo_decrypt = octo_des_cbc_md5_decrypt;
-                       octo_calc_hash(0, macini->cri_key, (*ocd)->octo_hminner,
-                                       (*ocd)->octo_hmouter);
-                       break;
-               case CRYPTO_SHA1_HMAC:
-                       (*ocd)->octo_encrypt = octo_des_cbc_sha1_encrypt;
-                       (*ocd)->octo_decrypt = octo_des_cbc_sha1_encrypt;
-                       octo_calc_hash(1, macini->cri_key, (*ocd)->octo_hminner,
-                                       (*ocd)->octo_hmouter);
-                       break;
-               case -1:
-                       (*ocd)->octo_encrypt = octo_des_cbc_encrypt;
-                       (*ocd)->octo_decrypt = octo_des_cbc_decrypt;
-                       break;
-               default:
-                       octo_freesession(NULL, i);
-                       dprintk("%s,%d: EINVALn", __FILE__, __LINE__);
-                       return EINVAL;
-               }
-               break;
-       case CRYPTO_AES_CBC:
-               (*ocd)->octo_ivsize  = 16;
-               switch (macini ? macini->cri_alg : -1) {
-               case CRYPTO_MD5_HMAC:
-                       (*ocd)->octo_encrypt = octo_aes_cbc_md5_encrypt;
-                       (*ocd)->octo_decrypt = octo_aes_cbc_md5_decrypt;
-                       octo_calc_hash(0, macini->cri_key, (*ocd)->octo_hminner,
-                                       (*ocd)->octo_hmouter);
-                       break;
-               case CRYPTO_SHA1_HMAC:
-                       (*ocd)->octo_encrypt = octo_aes_cbc_sha1_encrypt;
-                       (*ocd)->octo_decrypt = octo_aes_cbc_sha1_decrypt;
-                       octo_calc_hash(1, macini->cri_key, (*ocd)->octo_hminner,
-                                       (*ocd)->octo_hmouter);
-                       break;
-               case -1:
-                       (*ocd)->octo_encrypt = octo_aes_cbc_encrypt;
-                       (*ocd)->octo_decrypt = octo_aes_cbc_decrypt;
-                       break;
-               default:
-                       octo_freesession(NULL, i);
-                       dprintk("%s,%d: EINVALn", __FILE__, __LINE__);
-                       return EINVAL;
-               }
-               break;
-       case CRYPTO_MD5_HMAC:
-               (*ocd)->octo_encrypt = octo_null_md5_encrypt;
-               (*ocd)->octo_decrypt = octo_null_md5_encrypt;
-               octo_calc_hash(0, macini->cri_key, (*ocd)->octo_hminner,
-                               (*ocd)->octo_hmouter);
-               break;
-       case CRYPTO_SHA1_HMAC:
-               (*ocd)->octo_encrypt = octo_null_sha1_encrypt;
-               (*ocd)->octo_decrypt = octo_null_sha1_encrypt;
-               octo_calc_hash(1, macini->cri_key, (*ocd)->octo_hminner,
-                               (*ocd)->octo_hmouter);
-               break;
-       default:
-               octo_freesession(NULL, i);
-               dprintk("%s,%d: EINVALn", __FILE__, __LINE__);
-               return EINVAL;
-       }
-
-       (*ocd)->octo_encalg = encini ? encini->cri_alg : -1;
-       (*ocd)->octo_macalg = macini ? macini->cri_alg : -1;
-
-       return 0;
-}
-
-/*
- * Free a session.
- */
-static int
-octo_freesession(device_t dev, u_int64_t tid)
-{
-       u_int32_t sid = CRYPTO_SESID2LID(tid);
-
-       dprintk("%s()\n", __FUNCTION__);
-       if (sid > octo_sesnum || octo_sessions == NULL ||
-                       octo_sessions[sid] == NULL) {
-               dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
-               return(EINVAL);
-       }
-
-       /* Silently accept and return */
-       if (sid == 0)
-               return(0);
-
-       if (octo_sessions[sid])
-               kfree(octo_sessions[sid]);
-       octo_sessions[sid] = NULL;
-       return 0;
-}
-
-/*
- * Process a request.
- */
-static int
-octo_process(device_t dev, struct cryptop *crp, int hint)
-{
-       struct cryptodesc *crd;
-       struct octo_sess *od;
-       u_int32_t lid;
-#define SCATTERLIST_MAX 16
-       struct scatterlist sg[SCATTERLIST_MAX];
-       int sg_num, sg_len;
-       struct sk_buff *skb = NULL;
-       struct uio *uiop = NULL;
-       struct cryptodesc *enccrd = NULL, *maccrd = NULL;
-       unsigned char *ivp = NULL;
-       unsigned char iv_data[HASH_MAX_LEN];
-       int auth_off = 0, auth_len = 0, crypt_off = 0, crypt_len = 0, icv_off = 0;
-
-       dprintk("%s()\n", __FUNCTION__);
-       /* Sanity check */
-       if (crp == NULL) {
-               dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
-               return EINVAL;
-       }
-
-       crp->crp_etype = 0;
-
-       if (crp->crp_desc == NULL || crp->crp_buf == NULL) {
-               dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
-               crp->crp_etype = EINVAL;
-               goto done;
-       }
-
-       lid = crp->crp_sid & 0xffffffff;
-       if (lid >= octo_sesnum || lid == 0 || octo_sessions == NULL ||
-                       octo_sessions[lid] == NULL) {
-               crp->crp_etype = ENOENT;
-               dprintk("%s,%d: ENOENT\n", __FILE__, __LINE__);
-               goto done;
-       }
-       od = octo_sessions[lid];
-
-       /*
-        * do some error checking outside of the loop for SKB and IOV processing
-        * this leaves us with valid skb or uiop pointers for later
-        */
-       if (crp->crp_flags & CRYPTO_F_SKBUF) {
-               skb = (struct sk_buff *) crp->crp_buf;
-               if (skb_shinfo(skb)->nr_frags >= SCATTERLIST_MAX) {
-                       printk("%s,%d: %d nr_frags > SCATTERLIST_MAX", __FILE__, __LINE__,
-                                       skb_shinfo(skb)->nr_frags);
-                       goto done;
-               }
-       } else if (crp->crp_flags & CRYPTO_F_IOV) {
-               uiop = (struct uio *) crp->crp_buf;
-               if (uiop->uio_iovcnt > SCATTERLIST_MAX) {
-                       printk("%s,%d: %d uio_iovcnt > SCATTERLIST_MAX", __FILE__, __LINE__,
-                                       uiop->uio_iovcnt);
-                       goto done;
-               }
-       }
-
-       /* point our enccrd and maccrd appropriately */
-       crd = crp->crp_desc;
-       if (crd->crd_alg == od->octo_encalg) enccrd = crd;
-       if (crd->crd_alg == od->octo_macalg) maccrd = crd;
-       crd = crd->crd_next;
-       if (crd) {
-               if (crd->crd_alg == od->octo_encalg) enccrd = crd;
-