Commit 0bd3fbd4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 

Pull crypto updates from Herbert Xu:
 - New cipher/hash driver for ARM ux500.
 - Code clean-up for aesni-intel.
 - Misc fixes.

Fixed up conflicts in arch/arm/mach-ux500/devices-common.h, where quite
frankly some of it made no sense at all (the pull brought in a
declaration for the dbx500_add_platform_device_noirq() function, which
neither exists nor is used anywhere).

Also some trivial add-add context conflicts in the Kconfig file in
drivers/{char/hw_random,crypto}/

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: aesni-intel - move more common code to ablk_init_common
  crypto: aesni-intel - use crypto_[un]register_algs
  crypto: ux500 - Cleanup hardware identification
  crypto: ux500 - Update DMA handling for 3.4
  mach-ux500: crypto - core support for CRYP/HASH module.
  crypto: ux500 - Add driver for HASH hardware
  crypto: ux500 - Add driver for CRYP hardware
  hwrng: Kconfig - modify default state for atmel-rng driver
  hwrng: omap - use devm_request_and_ioremap
  crypto: crypto4xx - move up err_request_irq label
  crypto, xor: Sanitize checksumming function selection output
  crypto: caam - add backward compatible string sec4.0
parents 0b87da68 ef45b834

arch/arm/mach-ux500/board-mop500.c

+48 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
#include <mach/setup.h>

#include <mach/devices.h>

#include <mach/irqs.h>

#include <mach/crypto-ux500.h>



#include "ste-dma40-db8500.h"

#include "devices-db8500.h"
@@ -417,6 +418,45 @@ static void mop500_prox_deactivate(struct device *dev) 
	regulator_put(prox_regulator);

}



static struct cryp_platform_data u8500_cryp1_platform_data = {

		.mem_to_engine = {

				.dir = STEDMA40_MEM_TO_PERIPH,

				.src_dev_type = STEDMA40_DEV_SRC_MEMORY,

				.dst_dev_type = DB8500_DMA_DEV48_CAC1_TX,

				.src_info.data_width = STEDMA40_WORD_WIDTH,

				.dst_info.data_width = STEDMA40_WORD_WIDTH,

				.mode = STEDMA40_MODE_LOGICAL,

				.src_info.psize = STEDMA40_PSIZE_LOG_4,

				.dst_info.psize = STEDMA40_PSIZE_LOG_4,

		},

		.engine_to_mem = {

				.dir = STEDMA40_PERIPH_TO_MEM,

				.src_dev_type = DB8500_DMA_DEV48_CAC1_RX,

				.dst_dev_type = STEDMA40_DEV_DST_MEMORY,

				.src_info.data_width = STEDMA40_WORD_WIDTH,

				.dst_info.data_width = STEDMA40_WORD_WIDTH,

				.mode = STEDMA40_MODE_LOGICAL,

				.src_info.psize = STEDMA40_PSIZE_LOG_4,

				.dst_info.psize = STEDMA40_PSIZE_LOG_4,

		}

};



static struct stedma40_chan_cfg u8500_hash_dma_cfg_tx = {

		.dir = STEDMA40_MEM_TO_PERIPH,

		.src_dev_type = STEDMA40_DEV_SRC_MEMORY,

		.dst_dev_type = DB8500_DMA_DEV50_HAC1_TX,

		.src_info.data_width = STEDMA40_WORD_WIDTH,

		.dst_info.data_width = STEDMA40_WORD_WIDTH,

		.mode = STEDMA40_MODE_LOGICAL,

		.src_info.psize = STEDMA40_PSIZE_LOG_16,

		.dst_info.psize = STEDMA40_PSIZE_LOG_16,

};



static struct hash_platform_data u8500_hash1_platform_data = {

		.mem_to_engine = &u8500_hash_dma_cfg_tx,

		.dma_filter = stedma40_filter,

};



/* add any platform devices here - TODO */

static struct platform_device *mop500_platform_devs[] __initdata = {

	&mop500_gpio_keys_device,
@@ -624,6 +664,12 @@ static void __init mop500_uart_init(struct device *parent) 
	db8500_add_uart2(parent, &uart2_plat);

}



static void __init u8500_cryp1_hash1_init(struct device *parent)

{

	db8500_add_cryp1(parent, &u8500_cryp1_platform_data);

	db8500_add_hash1(parent, &u8500_hash1_platform_data);

}



static struct platform_device *snowball_platform_devs[] __initdata = {

	&snowball_led_dev,

	&snowball_key_dev,
@@ -654,6 +700,8 @@ static void __init mop500_init_machine(void) 
	mop500_msp_init(parent);

	mop500_uart_init(parent);



	u8500_cryp1_hash1_init(parent);



	i2c0_devs = ARRAY_SIZE(mop500_i2c0_devices);



	i2c_register_board_info(0, mop500_i2c0_devices, i2c0_devs);

arch/arm/mach-ux500/clock.c

+10 −8
Original line number Diff line number Diff line
@@ -381,14 +381,15 @@ static DEFINE_PRCC_CLK(5, usb, 0, 0, NULL); 
/* Peripheral Cluster #6 */



/* MTU ID in data */

static DEFINE_PRCC_CLK_CUSTOM(6, mtu1, 8, -1, NULL, clk_mtu_get_rate, 1);

static DEFINE_PRCC_CLK_CUSTOM(6, mtu0, 7, -1, NULL, clk_mtu_get_rate, 0);

static DEFINE_PRCC_CLK(6, cfgreg,	6,  6, NULL);

static DEFINE_PRCC_CLK(6, hash1,	5, -1, NULL);

static DEFINE_PRCC_CLK(6, unipro,	4,  1, &clk_uniproclk);

static DEFINE_PRCC_CLK(6, pka,		3, -1, NULL);

static DEFINE_PRCC_CLK(6, hash0,	2, -1, NULL);

static DEFINE_PRCC_CLK(6, cryp0,	1, -1, NULL);

static DEFINE_PRCC_CLK_CUSTOM(6, mtu1, 9, -1, NULL, clk_mtu_get_rate, 1);

static DEFINE_PRCC_CLK_CUSTOM(6, mtu0, 8, -1, NULL, clk_mtu_get_rate, 0);

static DEFINE_PRCC_CLK(6, cfgreg,	7,  7, NULL);

static DEFINE_PRCC_CLK(6, hash1,	6, -1, NULL);

static DEFINE_PRCC_CLK(6, unipro,	5,  1, &clk_uniproclk);

static DEFINE_PRCC_CLK(6, pka,		4, -1, NULL);

static DEFINE_PRCC_CLK(6, hash0,	3, -1, NULL);

static DEFINE_PRCC_CLK(6, cryp0,	2, -1, NULL);

static DEFINE_PRCC_CLK(6, cryp1,    1, -1, NULL);

static DEFINE_PRCC_CLK(6, rng,	0,  0, &clk_rngclk);



static struct clk clk_dummy_apb_pclk = {
@@ -430,6 +431,7 @@ static struct clk_lookup u8500_clks[] = { 
	CLK(pka,	"pka",		NULL),

	CLK(hash0,	"hash0",	NULL),

	CLK(cryp0,	"cryp0",	NULL),

	CLK(cryp1,  "cryp1",    NULL),



	/* PRCMU level clock gating */

arch/arm/mach-ux500/devices-common.h

+50 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/sys_soc.h>

#include <linux/amba/bus.h>

#include <plat/i2c.h>

#include <mach/crypto-ux500.h>



struct spi_master_cntlr;
@@ -85,6 +86,55 @@ dbx500_add_rtc(struct device *parent, resource_size_t base, int irq) 
				0, NULL, 0);

}



struct cryp_platform_data;



static inline struct platform_device *

dbx500_add_cryp1(struct device *parent, int id, resource_size_t base, int irq,

		struct cryp_platform_data *pdata)

{

	struct resource res[] = {

			DEFINE_RES_MEM(base, SZ_4K),

			DEFINE_RES_IRQ(irq),

	};



	struct platform_device_info pdevinfo = {

			.parent = parent,

			.name = "cryp1",

			.id = id,

			.res = res,

			.num_res = ARRAY_SIZE(res),

			.data = pdata,

			.size_data = sizeof(*pdata),

			.dma_mask = DMA_BIT_MASK(32),

	};



	return platform_device_register_full(&pdevinfo);

}



struct hash_platform_data;



static inline struct platform_device *

dbx500_add_hash1(struct device *parent, int id, resource_size_t base,

		struct hash_platform_data *pdata)

{

	struct resource res[] = {

			DEFINE_RES_MEM(base, SZ_4K),

	};



	struct platform_device_info pdevinfo = {

			.parent = parent,

			.name = "hash1",

			.id = id,

			.res = res,

			.num_res = ARRAY_SIZE(res),

			.data = pdata,

			.size_data = sizeof(*pdata),

			.dma_mask = DMA_BIT_MASK(32),

	};



	return platform_device_register_full(&pdevinfo);

}



struct nmk_gpio_platform_data;



void dbx500_add_gpios(struct device *parent, resource_size_t *base, int num,

arch/arm/mach-ux500/devices-db8500.c

+3 −0
Original line number Diff line number Diff line
@@ -104,6 +104,8 @@ static const dma_addr_t dma40_tx_map[DB8500_DMA_NR_DEV] = { 
	[DB8500_DMA_DEV14_MSP2_TX] = U8500_MSP2_BASE + MSP_TX_RX_REG_OFFSET,

	[DB8500_DMA_DEV30_MSP1_TX] = U8500_MSP1_BASE + MSP_TX_RX_REG_OFFSET,

	[DB8500_DMA_DEV31_MSP0_TX_SLIM0_CH0_TX] = U8500_MSP0_BASE + MSP_TX_RX_REG_OFFSET,

	[DB8500_DMA_DEV48_CAC1_TX] = U8500_CRYP1_BASE + CRYP1_TX_REG_OFFSET,

	[DB8500_DMA_DEV50_HAC1_TX] = U8500_HASH1_BASE + HASH1_TX_REG_OFFSET,

};



/* Mapping between source event lines and physical device address */
@@ -139,6 +141,7 @@ static const dma_addr_t dma40_rx_map[DB8500_DMA_NR_DEV] = { 
	[DB8500_DMA_DEV14_MSP2_RX] = U8500_MSP2_BASE + MSP_TX_RX_REG_OFFSET,

	[DB8500_DMA_DEV30_MSP3_RX] = U8500_MSP3_BASE + MSP_TX_RX_REG_OFFSET,

	[DB8500_DMA_DEV31_MSP0_RX_SLIM0_CH0_RX] = U8500_MSP0_BASE + MSP_TX_RX_REG_OFFSET,

	[DB8500_DMA_DEV48_CAC1_RX] = U8500_CRYP1_BASE + CRYP1_RX_REG_OFFSET,

};



/* Reserved event lines for memcpy only */

arch/arm/mach-ux500/devices-db8500.h

+4 −0
Original line number Diff line number Diff line
@@ -114,4 +114,8 @@ db8500_add_ssp(struct device *parent, const char *name, resource_size_t base, 
	dbx500_add_uart(parent, "uart2", U8500_UART2_BASE, \

			IRQ_DB8500_UART2, pdata)



#define db8500_add_cryp1(parent, pdata) \

	dbx500_add_cryp1(parent, -1, U8500_CRYP1_BASE, IRQ_DB8500_CRYP1, pdata)

#define db8500_add_hash1(parent, pdata) \

	dbx500_add_hash1(parent, -1, U8500_HASH1_BASE, pdata)

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE