Zoltan Herpai
9 years ago
parent
4e3813c79d
commit
06bcc64f1f
@ -0,0 +1,300 @@ |
||||
CONFIG_ALIGNMENT_TRAP=y |
||||
# CONFIG_AMBA_PL08X is not set |
||||
# CONFIG_APM_EMULATION is not set |
||||
CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y |
||||
CONFIG_ARCH_HAS_ELF_RANDOMIZE=y |
||||
CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y |
||||
CONFIG_ARCH_HAS_SG_CHAIN=y |
||||
CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y |
||||
CONFIG_ARCH_HIBERNATION_POSSIBLE=y |
||||
CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y |
||||
CONFIG_ARCH_MULTIPLATFORM=y |
||||
CONFIG_ARCH_MULTI_CPU_AUTO=y |
||||
# CONFIG_ARCH_MULTI_V4 is not set |
||||
# CONFIG_ARCH_MULTI_V4T is not set |
||||
CONFIG_ARCH_MULTI_V4_V5=y |
||||
CONFIG_ARCH_MULTI_V5=y |
||||
CONFIG_ARCH_MXS=y |
||||
CONFIG_ARCH_NR_GPIO=0 |
||||
CONFIG_ARCH_REQUIRE_GPIOLIB=y |
||||
# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set |
||||
# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set |
||||
CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y |
||||
CONFIG_ARCH_SUPPORTS_UPROBES=y |
||||
CONFIG_ARCH_SUSPEND_POSSIBLE=y |
||||
CONFIG_ARCH_USE_BUILTIN_BSWAP=y |
||||
CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y |
||||
CONFIG_ARCH_WANT_GENERAL_HUGETLB=y |
||||
CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y |
||||
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
||||
CONFIG_ARM=y |
||||
CONFIG_ARM_AMBA=y |
||||
CONFIG_ARM_APPENDED_DTB=y |
||||
CONFIG_ARM_ATAG_DTB_COMPAT=y |
||||
# CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND is not set |
||||
CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y |
||||
CONFIG_ARM_CPU_SUSPEND=y |
||||
CONFIG_ARM_HAS_SG_CHAIN=y |
||||
CONFIG_ARM_L1_CACHE_SHIFT=5 |
||||
CONFIG_ARM_PATCH_PHYS_VIRT=y |
||||
# CONFIG_ARM_SP805_WATCHDOG is not set |
||||
CONFIG_ARM_THUMB=y |
||||
CONFIG_ATAGS=y |
||||
CONFIG_AUTO_ZRELADDR=y |
||||
# CONFIG_CACHE_L2X0 is not set |
||||
CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
||||
CONFIG_CLKDEV_LOOKUP=y |
||||
CONFIG_CLKSRC_MMIO=y |
||||
CONFIG_CLKSRC_OF=y |
||||
CONFIG_CLKSRC_PROBE=y |
||||
CONFIG_CLONE_BACKWARDS=y |
||||
CONFIG_CMDLINE="console=ttyAMA0,115200 root=/dev/mmcblk0p2 rw rootwait" |
||||
CONFIG_CMDLINE_FROM_BOOTLOADER=y |
||||
CONFIG_COMMON_CLK=y |
||||
CONFIG_COREDUMP=y |
||||
CONFIG_CPU_32v5=y |
||||
CONFIG_CPU_ABRT_EV5TJ=y |
||||
CONFIG_CPU_ARM926T=y |
||||
# CONFIG_CPU_CACHE_ROUND_ROBIN is not set |
||||
CONFIG_CPU_CACHE_VIVT=y |
||||
CONFIG_CPU_COPY_V4WB=y |
||||
CONFIG_CPU_CP15=y |
||||
CONFIG_CPU_CP15_MMU=y |
||||
# CONFIG_CPU_DCACHE_WRITETHROUGH is not set |
||||
# CONFIG_CPU_ICACHE_DISABLE is not set |
||||
CONFIG_CPU_IDLE=y |
||||
CONFIG_CPU_IDLE_GOV_LADDER=y |
||||
CONFIG_CPU_IDLE_GOV_MENU=y |
||||
CONFIG_CPU_PABRT_LEGACY=y |
||||
CONFIG_CPU_PM=y |
||||
CONFIG_CPU_TLB_V4WBI=y |
||||
CONFIG_CPU_USE_DOMAINS=y |
||||
CONFIG_CRC16=y |
||||
CONFIG_CROSS_MEMORY_ATTACH=y |
||||
CONFIG_CRYPTO_CRC32C=y |
||||
# CONFIG_CRYPTO_DEV_MXS_DCP is not set |
||||
CONFIG_CRYPTO_HASH=y |
||||
CONFIG_CRYPTO_HASH2=y |
||||
CONFIG_CRYPTO_HW=y |
||||
CONFIG_CRYPTO_RNG2=y |
||||
CONFIG_CRYPTO_WORKQUEUE=y |
||||
CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" |
||||
# CONFIG_DEBUG_UART_8250 is not set |
||||
# CONFIG_DEBUG_USER is not set |
||||
CONFIG_DMADEVICES=y |
||||
CONFIG_DMA_ENGINE=y |
||||
CONFIG_DMA_OF=y |
||||
CONFIG_DTC=y |
||||
CONFIG_EDAC_ATOMIC_SCRUB=y |
||||
CONFIG_EDAC_SUPPORT=y |
||||
CONFIG_EXT4_FS=y |
||||
CONFIG_EXTCON=y |
||||
CONFIG_FEC=y |
||||
CONFIG_FIX_EARLYCON_MEM=y |
||||
CONFIG_FRAME_POINTER=y |
||||
CONFIG_FS_MBCACHE=y |
||||
CONFIG_GENERIC_ALLOCATOR=y |
||||
CONFIG_GENERIC_ATOMIC64=y |
||||
CONFIG_GENERIC_BUG=y |
||||
CONFIG_GENERIC_CLOCKEVENTS=y |
||||
CONFIG_GENERIC_IDLE_POLL_SETUP=y |
||||
CONFIG_GENERIC_IO=y |
||||
CONFIG_GENERIC_IRQ_CHIP=y |
||||
CONFIG_GENERIC_IRQ_SHOW=y |
||||
CONFIG_GENERIC_IRQ_SHOW_LEVEL=y |
||||
CONFIG_GENERIC_PCI_IOMAP=y |
||||
CONFIG_GENERIC_SCHED_CLOCK=y |
||||
CONFIG_GENERIC_SMP_IDLE_THREAD=y |
||||
CONFIG_GENERIC_STRNCPY_FROM_USER=y |
||||
CONFIG_GENERIC_STRNLEN_USER=y |
||||
# CONFIG_GIANFAR is not set |
||||
CONFIG_GPIOLIB=y |
||||
CONFIG_GPIO_DEVRES=y |
||||
CONFIG_GPIO_GENERIC=y |
||||
CONFIG_GPIO_GENERIC_PLATFORM=y |
||||
CONFIG_GPIO_MXS=y |
||||
CONFIG_GPIO_SYSFS=y |
||||
CONFIG_HANDLE_DOMAIN_IRQ=y |
||||
CONFIG_HARDIRQS_SW_RESEND=y |
||||
CONFIG_HAS_DMA=y |
||||
CONFIG_HAS_IOMEM=y |
||||
CONFIG_HAS_IOPORT_MAP=y |
||||
# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set |
||||
CONFIG_HAVE_ARCH_AUDITSYSCALL=y |
||||
# CONFIG_HAVE_ARCH_BITREVERSE is not set |
||||
CONFIG_HAVE_ARCH_JUMP_LABEL=y |
||||
CONFIG_HAVE_ARCH_KGDB=y |
||||
CONFIG_HAVE_ARCH_PFN_VALID=y |
||||
CONFIG_HAVE_ARCH_SECCOMP_FILTER=y |
||||
CONFIG_HAVE_ARCH_TRACEHOOK=y |
||||
# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set |
||||
CONFIG_HAVE_BPF_JIT=y |
||||
CONFIG_HAVE_CC_STACKPROTECTOR=y |
||||
CONFIG_HAVE_CLK=y |
||||
CONFIG_HAVE_CLK_PREPARE=y |
||||
CONFIG_HAVE_CONTEXT_TRACKING=y |
||||
CONFIG_HAVE_C_RECORDMCOUNT=y |
||||
CONFIG_HAVE_DEBUG_KMEMLEAK=y |
||||
CONFIG_HAVE_DMA_API_DEBUG=y |
||||
CONFIG_HAVE_DMA_ATTRS=y |
||||
CONFIG_HAVE_DMA_CONTIGUOUS=y |
||||
CONFIG_HAVE_DYNAMIC_FTRACE=y |
||||
CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
||||
CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y |
||||
CONFIG_HAVE_FUNCTION_TRACER=y |
||||
CONFIG_HAVE_GENERIC_DMA_COHERENT=y |
||||
CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y |
||||
CONFIG_HAVE_KERNEL_GZIP=y |
||||
CONFIG_HAVE_KERNEL_LZ4=y |
||||
CONFIG_HAVE_KERNEL_LZMA=y |
||||
CONFIG_HAVE_KERNEL_LZO=y |
||||
CONFIG_HAVE_KERNEL_XZ=y |
||||
CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
||||
CONFIG_HAVE_MEMBLOCK=y |
||||
CONFIG_HAVE_MOD_ARCH_SPECIFIC=y |
||||
CONFIG_HAVE_NET_DSA=y |
||||
CONFIG_HAVE_OPROFILE=y |
||||
CONFIG_HAVE_OPTPROBES=y |
||||
CONFIG_HAVE_PERF_EVENTS=y |
||||
CONFIG_HAVE_PERF_REGS=y |
||||
CONFIG_HAVE_PERF_USER_STACK_DUMP=y |
||||
CONFIG_HAVE_PROC_CPU=y |
||||
CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y |
||||
CONFIG_HAVE_SYSCALL_TRACEPOINTS=y |
||||
CONFIG_HAVE_UID16=y |
||||
CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y |
||||
CONFIG_HZ_FIXED=0 |
||||
CONFIG_HZ_PERIODIC=y |
||||
CONFIG_I2C=y |
||||
CONFIG_I2C_ALGOBIT=y |
||||
CONFIG_I2C_ALGOPCA=y |
||||
CONFIG_I2C_ALGOPCF=y |
||||
CONFIG_I2C_BOARDINFO=y |
||||
CONFIG_I2C_CHARDEV=y |
||||
CONFIG_I2C_COMPAT=y |
||||
CONFIG_I2C_MUX=y |
||||
CONFIG_I2C_MUX_PINCTRL=y |
||||
# CONFIG_I2C_MXS is not set |
||||
CONFIG_IIO=y |
||||
CONFIG_IIO_BUFFER=y |
||||
CONFIG_IIO_KFIFO_BUF=y |
||||
CONFIG_IIO_PERIODIC_RTC_TRIGGER=y |
||||
CONFIG_IIO_SYSFS_TRIGGER=y |
||||
CONFIG_IIO_TRIGGER=y |
||||
CONFIG_INITRAMFS_SOURCE="" |
||||
CONFIG_INPUT=y |
||||
CONFIG_IOMMU_HELPER=y |
||||
CONFIG_IRQCHIP=y |
||||
CONFIG_IRQ_DOMAIN=y |
||||
CONFIG_IRQ_FORCED_THREADING=y |
||||
CONFIG_IRQ_MXS=y |
||||
CONFIG_IRQ_WORK=y |
||||
# CONFIG_ISDN is not set |
||||
CONFIG_JBD2=y |
||||
CONFIG_LIBFDT=y |
||||
CONFIG_LZO_COMPRESS=y |
||||
CONFIG_LZO_DECOMPRESS=y |
||||
CONFIG_MDIO_BOARDINFO=y |
||||
CONFIG_MFD_SYSCON=y |
||||
CONFIG_MIGHT_HAVE_PCI=y |
||||
CONFIG_MMC=y |
||||
CONFIG_MMC_BLOCK=y |
||||
CONFIG_MMC_MXS=y |
||||
CONFIG_MODULES_USE_ELF_REL=y |
||||
# CONFIG_MTD_PHYSMAP_OF is not set |
||||
CONFIG_MULTI_IRQ_HANDLER=y |
||||
CONFIG_MXS_DMA=y |
||||
# CONFIG_MXS_LRADC is not set |
||||
CONFIG_NEED_DMA_MAP_STATE=y |
||||
CONFIG_NEED_KUSER_HELPERS=y |
||||
CONFIG_NEED_PER_CPU_KM=y |
||||
CONFIG_NET_PTP_CLASSIFY=y |
||||
CONFIG_NLS=y |
||||
CONFIG_NO_BOOTMEM=y |
||||
CONFIG_OF=y |
||||
CONFIG_OF_ADDRESS=y |
||||
CONFIG_OF_EARLY_FLATTREE=y |
||||
CONFIG_OF_FLATTREE=y |
||||
CONFIG_OF_GPIO=y |
||||
CONFIG_OF_IRQ=y |
||||
CONFIG_OF_MDIO=y |
||||
CONFIG_OF_MTD=y |
||||
CONFIG_OF_NET=y |
||||
CONFIG_OF_RESERVED_MEM=y |
||||
CONFIG_OLD_SIGACTION=y |
||||
CONFIG_OLD_SIGSUSPEND3=y |
||||
CONFIG_PAGE_OFFSET=0xC0000000 |
||||
# CONFIG_PCI is not set |
||||
# CONFIG_PCI_DOMAINS_GENERIC is not set |
||||
# CONFIG_PCI_SYSCALL is not set |
||||
CONFIG_PERF_USE_VMALLOC=y |
||||
CONFIG_PGTABLE_LEVELS=2 |
||||
CONFIG_PHYLIB=y |
||||
CONFIG_PINCTRL=y |
||||
CONFIG_PINCTRL_IMX23=y |
||||
CONFIG_PINCTRL_IMX28=y |
||||
CONFIG_PINCTRL_MXS=y |
||||
# CONFIG_PINCTRL_SINGLE is not set |
||||
# CONFIG_PL330_DMA is not set |
||||
CONFIG_PM=y |
||||
CONFIG_PM_CLK=y |
||||
# CONFIG_PM_DEBUG is not set |
||||
CONFIG_POWER_SUPPLY=y |
||||
CONFIG_PPS=y |
||||
CONFIG_PTP_1588_CLOCK=y |
||||
CONFIG_RATIONAL=y |
||||
# CONFIG_RCU_STALL_COMMON is not set |
||||
CONFIG_REGMAP=y |
||||
CONFIG_REGMAP_I2C=y |
||||
CONFIG_REGMAP_MMIO=y |
||||
CONFIG_REGMAP_SPI=y |
||||
CONFIG_REGULATOR=y |
||||
CONFIG_REGULATOR_FIXED_VOLTAGE=y |
||||
CONFIG_REGULATOR_GPIO=y |
||||
CONFIG_RTC_CLASS=y |
||||
# CONFIG_RTC_DRV_STMP is not set |
||||
CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
||||
CONFIG_SCHED_HRTICK=y |
||||
# CONFIG_SCHED_INFO is not set |
||||
# CONFIG_SCSI_DMA is not set |
||||
CONFIG_SERIAL_8250_FSL=y |
||||
CONFIG_SERIAL_AMBA_PL010=y |
||||
CONFIG_SERIAL_AMBA_PL010_CONSOLE=y |
||||
CONFIG_SERIAL_AMBA_PL011=y |
||||
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y |
||||
CONFIG_SERIAL_MCTRL_GPIO=y |
||||
CONFIG_SERIAL_MXS_AUART=y |
||||
CONFIG_SERIAL_MXS_AUART_CONSOLE=y |
||||
# CONFIG_SG_SPLIT is not set |
||||
CONFIG_SMSC_PHY=y |
||||
CONFIG_SOC_BUS=y |
||||
CONFIG_SOC_IMX23=y |
||||
CONFIG_SOC_IMX28=y |
||||
CONFIG_SPARSE_IRQ=y |
||||
CONFIG_SPI=y |
||||
CONFIG_SPI_MASTER=y |
||||
# CONFIG_SPI_MXS is not set |
||||
CONFIG_SPLIT_PTLOCK_CPUS=999999 |
||||
CONFIG_SRCU=y |
||||
CONFIG_STMP_DEVICE=y |
||||
# CONFIG_SUNXI_SRAM is not set |
||||
CONFIG_SWIOTLB=y |
||||
CONFIG_SYS_SUPPORTS_APM_EMULATION=y |
||||
CONFIG_TICK_CPU_ACCOUNTING=y |
||||
CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" |
||||
CONFIG_USB=y |
||||
CONFIG_USB_COMMON=y |
||||
CONFIG_USB_EHCI_HCD=y |
||||
# CONFIG_USB_EHCI_HCD_PLATFORM is not set |
||||
# CONFIG_USB_MXS_PHY is not set |
||||
CONFIG_USB_OTG=y |
||||
CONFIG_USB_SUPPORT=y |
||||
CONFIG_USE_OF=y |
||||
CONFIG_VECTORS_BASE=0xffff0000 |
||||
# CONFIG_VFP is not set |
||||
CONFIG_WATCHDOG_CORE=y |
||||
CONFIG_XZ_DEC_ARM=y |
||||
CONFIG_XZ_DEC_BCJ=y |
||||
CONFIG_ZBOOT_ROM_BSS=0 |
||||
CONFIG_ZBOOT_ROM_TEXT=0 |
||||
CONFIG_ZONE_DMA_FLAG=0 |
||||
@ -0,0 +1,80 @@ |
||||
From: Fabio Estevam <fabio.estevam@nxp.com>
|
||||
|
||||
Currently the mxs-dcp driver fails to probe:
|
||||
|
||||
mxs-dcp 80028000.dcp: Failed to register sha1 hash!
|
||||
mxs-dcp: probe of 80028000.dcp failed with error -22
|
||||
|
||||
This happens since commit 8996eafdcbad ("crypto: ahash - ensure statesize
|
||||
is non-zero"), which requires statesize to be filled.
|
||||
|
||||
Other than filling statesize, we also need to provide the import/export
|
||||
functions.
|
||||
|
||||
Based on the implementation of the sahara and caam drivers.
|
||||
|
||||
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
|
||||
---
|
||||
Changes since v2:
|
||||
- Newly introduced in this series
|
||||
|
||||
drivers/crypto/mxs-dcp.c | 24 ++++++++++++++++++++++++
|
||||
1 file changed, 24 insertions(+)
|
||||
|
||||
diff --git a/drivers/crypto/mxs-dcp.c b/drivers/crypto/mxs-dcp.c
|
||||
index 59ed54e..1e2017f 100644
|
||||
--- a/drivers/crypto/mxs-dcp.c
|
||||
+++ b/drivers/crypto/mxs-dcp.c
|
||||
@@ -775,6 +775,24 @@ static void dcp_sha_cra_exit(struct crypto_tfm *tfm)
|
||||
{
|
||||
}
|
||||
|
||||
+static int dcp_sha_export(struct ahash_request *req, void *out)
|
||||
+{
|
||||
+ struct dcp_sha_req_ctx *rctx = ahash_request_ctx(req);
|
||||
+
|
||||
+ memcpy(out, rctx, sizeof(struct dcp_sha_req_ctx));
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int dcp_sha_import(struct ahash_request *req, const void *in)
|
||||
+{
|
||||
+ struct dcp_sha_req_ctx *rctx = ahash_request_ctx(req);
|
||||
+
|
||||
+ memcpy(rctx, in, sizeof(struct dcp_sha_req_ctx));
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
/* AES 128 ECB and AES 128 CBC */
|
||||
static struct crypto_alg dcp_aes_algs[] = {
|
||||
{
|
||||
@@ -834,8 +852,11 @@ static struct ahash_alg dcp_sha1_alg = {
|
||||
.final = dcp_sha_final,
|
||||
.finup = dcp_sha_finup,
|
||||
.digest = dcp_sha_digest,
|
||||
+ .import = dcp_sha_import,
|
||||
+ .export = dcp_sha_export,
|
||||
.halg = {
|
||||
.digestsize = SHA1_DIGEST_SIZE,
|
||||
+ .statesize = sizeof(struct dcp_sha_req_ctx),
|
||||
.base = {
|
||||
.cra_name = "sha1",
|
||||
.cra_driver_name = "sha1-dcp",
|
||||
@@ -858,8 +879,11 @@ static struct ahash_alg dcp_sha256_alg = {
|
||||
.final = dcp_sha_final,
|
||||
.finup = dcp_sha_finup,
|
||||
.digest = dcp_sha_digest,
|
||||
+ .import = dcp_sha_import,
|
||||
+ .export = dcp_sha_export,
|
||||
.halg = {
|
||||
.digestsize = SHA256_DIGEST_SIZE,
|
||||
+ .statesize = sizeof(struct dcp_sha_req_ctx),
|
||||
.base = {
|
||||
.cra_name = "sha256",
|
||||
.cra_driver_name = "sha256-dcp",
|
||||
--
|
||||
1.9.1
|
||||
|
||||
--
|
||||
Loading…
Reference in new issue