linux-kernel - linux-next: manual merge of the crypto tree with the arm tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20120516151441.59baed915e31738642fd52dd@canb.auug.org.au>
Date:	Wed, 16 May 2012 15:14:41 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Herbert Xu <herbert@...dor.apana.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Linus Walleij <linus.walleij@...aro.org>,
	Russell King <rmk@....linux.org.uk>,
	Andreas Westin <andreas.westin@...ricsson.com>
Subject: linux-next: manual merge of the crypto tree with the arm tree

Hi Herbert,

Today's linux-next merge of the crypto tree got a conflict in
arch/arm/mach-ux500/devices-common.h between commit 08956a0e8a69 ("ARM:
7372/1: ux500: factor out dynamic amba device allocator") from the  tree
and commit 585d188f8072 ("mach-ux500: crypto - core support for CRYP/HASH
module") from the crypto tree.

Just context changes (maybe).  I fixed it up (see below) and can carry
the fix as necessary.

I suspect that there may be something deeper here, though.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc arch/arm/mach-ux500/devices-common.h
index f75bcb2,89c5a59..0000000
--- a/arch/arm/mach-ux500/devices-common.h
+++ b/arch/arm/mach-ux500/devices-common.h
@@@ -11,8 -11,17 +11,13 @@@
  #include <linux/platform_device.h>
  #include <linux/dma-mapping.h>
  #include <linux/sys_soc.h>
 +#include <linux/amba/bus.h>
  #include <plat/i2c.h>
+ #include <mach/crypto-ux500.h>
+ 
 -extern struct amba_device *
 -dbx500_add_amba_device(struct device *parent, const char *name,
 -		       resource_size_t base, int irq, void *pdata,
 -		       unsigned int periphid);
 -
+ extern struct platform_device *
+ dbx500_add_platform_device_noirq(const char *name, int id,
+ 		resource_size_t base, void *pdata);
  
  struct spi_master_cntlr;
  
@@@ -81,10 -90,58 +86,59 @@@ dbx500_add_i2c(struct device *parent, i
  static inline struct amba_device *
  dbx500_add_rtc(struct device *parent, resource_size_t base, int irq)
  {
 -	return dbx500_add_amba_device(parent, "rtc-pl031", base, irq, NULL, 0);
 +	return amba_apb_device_add(parent, "rtc-pl031", base, SZ_4K, 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,

Content of type "application/pgp-signature" skipped