Commit 188e213d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: Makefile - replace the use of <module>-objs with <module>-y
  crypto: hifn_795x - use cancel_delayed_work_sync()
  crypto: talitos - sparse check endian fixes
  crypto: talitos - fix checkpatch warning
  crypto: talitos - fix warning: 'alg' may be used uninitialized in this function
  crypto: cryptd - Adding the AEAD interface type support to cryptd
  crypto: n2_crypto - Niagara2 driver needs to depend upon CRYPTO_DES
  crypto: Kconfig - update broken web addresses
  crypto: omap-sham - Adjust DMA parameters
  crypto: fips - FIPS requires algorithm self-tests
  crypto: omap-aes - OMAP2/3 AES hw accelerator driver
  crypto: updates to enable omap aes
  padata: add missing __percpu markup in include/linux/padata.h
  MAINTAINERS: Add maintainer entries for padata/pcrypt
parents 35da7a30 6d388b43

MAINTAINERS

+16 −0
Original line number Diff line number Diff line
@@ -4453,6 +4453,15 @@ L: linux-i2c@vger.kernel.org 
S:	Maintained

F:	drivers/i2c/busses/i2c-pasemi.c



PADATA PARALLEL EXECUTION MECHANISM

M:	Steffen Klassert <steffen.klassert@secunet.com>

L:	linux-kernel@vger.kernel.org

L:	linux-crypto@vger.kernel.org

S:	Maintained

F:	kernel/padata.c

F:	include/linux/padata.h

F:	Documentation/padata.txt



PANASONIC LAPTOP ACPI EXTRAS DRIVER

M:	Harald Welte <laforge@gnumonks.org>

L:	platform-driver-x86@vger.kernel.org
@@ -4580,6 +4589,13 @@ L: netdev@vger.kernel.org 
S:	Maintained

F:	drivers/net/pcnet32.c



PCRYPT PARALLEL CRYPTO ENGINE

M:	Steffen Klassert <steffen.klassert@secunet.com>

L:	linux-crypto@vger.kernel.org

S:	Maintained

F:	crypto/pcrypt.c

F:	include/crypto/pcrypt.h



PER-TASK DELAY ACCOUNTING

M:	Balbir Singh <balbir@linux.vnet.ibm.com>

S:	Maintained

arch/arm/mach-omap2/clock2420_data.c

+1 −1
Original line number Diff line number Diff line
@@ -1838,7 +1838,7 @@ static struct omap_clk omap2420_clks[] = { 
	CLK(NULL,	"des_ick",	&des_ick,	CK_242X),

	CLK("omap-sham",	"ick",	&sha_ick,	CK_242X),

	CLK("omap_rng",	"ick",		&rng_ick,	CK_242X),

	CLK(NULL,	"aes_ick",	&aes_ick,	CK_242X),

	CLK("omap-aes",	"ick",	&aes_ick,	CK_242X),

	CLK(NULL,	"pka_ick",	&pka_ick,	CK_242X),

	CLK(NULL,	"usb_fck",	&usb_fck,	CK_242X),

	CLK("musb_hdrc",	"fck",	&osc_ck,	CK_242X),

arch/arm/mach-omap2/clock2430_data.c

+1 −1
Original line number Diff line number Diff line
@@ -1926,7 +1926,7 @@ static struct omap_clk omap2430_clks[] = { 
	CLK(NULL,	"des_ick",	&des_ick,	CK_243X),

	CLK("omap-sham",	"ick",	&sha_ick,	CK_243X),

	CLK("omap_rng",	"ick",		&rng_ick,	CK_243X),

	CLK(NULL,	"aes_ick",	&aes_ick,	CK_243X),

	CLK("omap-aes",	"ick",	&aes_ick,	CK_243X),

	CLK(NULL,	"pka_ick",	&pka_ick,	CK_243X),

	CLK(NULL,	"usb_fck",	&usb_fck,	CK_243X),

	CLK("musb_hdrc",	"ick",	&usbhs_ick,	CK_243X),

arch/arm/mach-omap2/clock3xxx_data.c

+1 −1
Original line number Diff line number Diff line
@@ -3288,7 +3288,7 @@ static struct omap_clk omap3xxx_clks[] = { 
	CLK(NULL,	"usbtll_ick",	&usbtll_ick,	CK_3430ES2 | CK_AM35XX),

	CLK("mmci-omap-hs.2",	"ick",	&mmchs3_ick,	CK_3430ES2 | CK_AM35XX),

	CLK(NULL,	"icr_ick",	&icr_ick,	CK_343X),

	CLK(NULL,	"aes2_ick",	&aes2_ick,	CK_343X),

	CLK("omap-aes",	"ick",	&aes2_ick,	CK_343X),

	CLK("omap-sham",	"ick",	&sha12_ick,	CK_343X),

	CLK(NULL,	"des2_ick",	&des2_ick,	CK_343X),

	CLK("mmci-omap-hs.1",	"ick",	&mmchs2_ick,	CK_3XXX),

arch/arm/mach-omap2/devices.c

+71 −0
Original line number Diff line number Diff line
@@ -498,6 +498,76 @@ static void omap_init_sham(void) 
static inline void omap_init_sham(void) { }

#endif



#if defined(CONFIG_CRYPTO_DEV_OMAP_AES) || defined(CONFIG_CRYPTO_DEV_OMAP_AES_MODULE)



#ifdef CONFIG_ARCH_OMAP24XX

static struct resource omap2_aes_resources[] = {

	{

		.start	= OMAP24XX_SEC_AES_BASE,

		.end	= OMAP24XX_SEC_AES_BASE + 0x4C,

		.flags	= IORESOURCE_MEM,

	},

	{

		.start	= OMAP24XX_DMA_AES_TX,

		.flags	= IORESOURCE_DMA,

	},

	{

		.start	= OMAP24XX_DMA_AES_RX,

		.flags	= IORESOURCE_DMA,

	}

};

static int omap2_aes_resources_sz = ARRAY_SIZE(omap2_aes_resources);

#else

#define omap2_aes_resources		NULL

#define omap2_aes_resources_sz		0

#endif



#ifdef CONFIG_ARCH_OMAP34XX

static struct resource omap3_aes_resources[] = {

	{

		.start	= OMAP34XX_SEC_AES_BASE,

		.end	= OMAP34XX_SEC_AES_BASE + 0x4C,

		.flags	= IORESOURCE_MEM,

	},

	{

		.start	= OMAP34XX_DMA_AES2_TX,

		.flags	= IORESOURCE_DMA,

	},

	{

		.start	= OMAP34XX_DMA_AES2_RX,

		.flags	= IORESOURCE_DMA,

	}

};

static int omap3_aes_resources_sz = ARRAY_SIZE(omap3_aes_resources);

#else

#define omap3_aes_resources		NULL

#define omap3_aes_resources_sz		0

#endif



static struct platform_device aes_device = {

	.name		= "omap-aes",

	.id		= -1,

};



static void omap_init_aes(void)

{

	if (cpu_is_omap24xx()) {

		aes_device.resource = omap2_aes_resources;

		aes_device.num_resources = omap2_aes_resources_sz;

	} else if (cpu_is_omap34xx()) {

		aes_device.resource = omap3_aes_resources;

		aes_device.num_resources = omap3_aes_resources_sz;

	} else {

		pr_err("%s: platform not supported\n", __func__);

		return;

	}

	platform_device_register(&aes_device);

}



#else

static inline void omap_init_aes(void) { }

#endif



/*-------------------------------------------------------------------------*/



#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
@@ -854,6 +924,7 @@ static int __init omap2_init_devices(void) 
	omap_hdq_init();

	omap_init_sti();

	omap_init_sham();

	omap_init_aes();

	omap_init_vout();



	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE