Skip to contentSkip to conversation

OMAP3 ROM Random Number Generator support

PATCH In review Pali Rohár 7 participants 33 messages Feb 28, 2013 – Nov 23, 2013

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 OMAP3 ROM Random Number Generator support

This driver provides kernel-side support for the Random Number Generator hardware found on OMAP34xx processors.

This driver is included in Maemo 2.6.28 kernel used on Nokia N900.

I fixed driver to work with 3.8 kernel and added platform_driver code to autoload it on omap3 devices.

arch/arm/mach-omap2/devices.c +13 -0
index 626f3ea..48e40f3 100644
@@ -446,6 +446,18 @@ static void omap_init_mcspi(void)
 static inline void omap_init_mcspi(void) {}
 #endif
 
+static struct platform_device omap3_rom_rng_device = {
+	.name		= "omap3-rom-rng",
+	.id		= -1,
+};
+
+static void omap_init_rom_rng(void)
+{
+	if (!cpu_is_omap34xx() || omap_type() == OMAP2_DEVICE_TYPE_GP)
+		return;
+	platform_device_register(&omap3_rom_rng_device);
+}
+
 /**
  * omap_init_rng - bind the RNG hwmod to the RNG omap_device
  *
@@ -727,6 +739,7 @@ static int __init omap2_init_devices(void)
 	}
 	omap_init_sti();
 	omap_init_rng();
+	omap_init_rom_rng();
 	omap_init_sham();
 	omap_init_aes();
 	omap_init_vout();
drivers/char/hw_random/Kconfig +13 -0
index c5a0262..2d51db6 100644
@@ -153,6 +153,19 @@ config HW_RANDOM_OMAP
 
  	  If unsure, say Y.
 
+config HW_RANDOM_OMAP3_ROM
+	tristate "OMAP3 ROM Random Number Generator support"
+	depends on HW_RANDOM && ARCH_OMAP3
+	default HW_RANDOM
+	---help---
+	  This driver provides kernel-side support for the Random Number
+	  Generator hardware found on OMAP34xx processors.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called omap3-rom-rng.
+
+	  If unsure, say Y.
+
 config HW_RANDOM_OCTEON
 	tristate "Octeon Random Number Generator support"
 	depends on HW_RANDOM && CPU_CAVIUM_OCTEON
drivers/char/hw_random/Makefile +2 -0
index 1fd7eec..d227cd6 100644
@@ -15,6 +15,8 @@ n2-rng-y := n2-drv.o n2-asm.o
 obj-$(CONFIG_HW_RANDOM_VIA) += via-rng.o
 obj-$(CONFIG_HW_RANDOM_IXP4XX) += ixp4xx-rng.o
 obj-$(CONFIG_HW_RANDOM_OMAP) += omap-rng.o
+obj-$(CONFIG_HW_RANDOM_OMAP3_ROM) += omap3-rom-rng.o
+omap3-rom-rng-y := omap3-rom-drv.o omap3-rom-asm.o
 obj-$(CONFIG_HW_RANDOM_PASEMI) += pasemi-rng.o
 obj-$(CONFIG_HW_RANDOM_VIRTIO) += virtio-rng.o
 obj-$(CONFIG_HW_RANDOM_TX4939) += tx4939-rng.o
drivers/char/hw_random/omap3-rom-asm.S new file +27 -0
new file mode 100644
index 0000000..ce82e16
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2009 Nokia Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+
+#include <linux/linkage.h>
+#include <asm/assembler.h>
+
+ENTRY(omap3_rng_call_rom_asm)
+	.arch_extension sec
+	stmfd	sp!, {r4-r12, lr}
+	stmfd	sp!, {r0-r3}
+	bl	v7_flush_dcache_all
+	ldmfd	sp!, {r0-r3}
+	mov	r6, #0xff
+	mov	r12, r0
+	smc	#1
+	mov	r12, r0
+	bl	v7_flush_dcache_all
+	mov	r0, #0
+	mcr	p15, 0, r0, c7, c5, 0
+	mov	r0, r12
+	ldmfd	sp!, {r4-r12, pc}
drivers/char/hw_random/omap3-rom-drv.c new file +167 -0

167 lines not on this page · raw message

Signature · 2 lines
Pali Rohár
[email protected]
#1 lore raw
Quoted 9 lines · On Thursday 28 February 2013 19:05:47 Pali Rohár wrote:

This driver provides kernel-side support for the Random Number Generator hardware found on OMAP34xx processors.

This driver is included in Maemo 2.6.28 kernel used on Nokia N900.

I fixed driver to work with 3.8 kernel and added platform_driver code to autoload it on omap3 devices.

Hello, can somebody look at this driver?

Signature · 2 lines
Pali Rohár
[email protected]
maintainer
#2 lore raw
In reply to Pali Rohár
Quoted 20 lines · Pali Rohár
drivers/char/hw_random/omap3-rom-asm.S new file +17 -0
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2009 Nokia Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+
+#include <linux/linkage.h>
+#include <asm/assembler.h>
+
+ENTRY(omap3_rng_call_rom_asm)
+	.arch_extension sec
+	stmfd	sp!, {r4-r12, lr}
+	stmfd	sp!, {r0-r3}
+	bl	v7_flush_dcache_all

drivers/char/hw_random/omap3-rom-asm.S line 27

Quoted 10 lines
drivers/char/hw_random/omap3-rom-asm.S new file +10 -0
+	ldmfd	sp!, {r0-r3}
+	mov	r6, #0xff
+	mov	r12, r0
+	smc	#1
+	mov	r12, r0
+	bl	v7_flush_dcache_all
+	mov	r0, #0
+	mcr	p15, 0, r0, c7, c5, 0
+	mov	r0, r12
+	ldmfd	sp!, {r4-r12, pc}

This part should be in arch/arm/mach-omap2 because of the direct calls to v7_flush_dcache_all. Then you can pass a pointer to this function in platform_data for now, and set it up based on the compatible flag with device tree from driver later on.

Quoted 14 lines
drivers/char/hw_random/omap3-rom-drv.c new file +11 -0
@@ -0,0 +1,167 @@
+/*
+ * omap3-rom-drv.c - RNG driver for TI OMAP3 CPU family
+ *
+ * Copyright (C) 2009 Nokia Corporation
+ * Author: Juha Yrjola <[email protected]>
+ *
+ * This file is licensed under  the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+

drivers/char/hw_random/omap3-rom-drv.c line 21

Quoted 10 lines
drivers/char/hw_random/omap3-rom-drv.c new file +10 -0
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/random.h>
+#include <linux/hw_random.h>
+#include <linux/timer.h>
+#include <linux/clk.h>
+#include <linux/err.h>
+#include <linux/platform_device.h>
+
+#include "../../../arch/arm/mach-omap2/soc.h"

NAK for this, this must be private to arch/arm/mach-omap2.

Instead, just create a minimal include/linux/platform_data/omap3-rom.h, and pass the function pointer in the pdata if passed.

Quoted 18 lines
drivers/char/hw_random/omap3-rom-drv.c new file +18 -0
+static int omap3_rom_rng_probe(struct platform_device *pdev)
+{
+	printk(KERN_INFO "%s: initializing\n", omap3_rom_rng_name);
+	if (!cpu_is_omap34xx()) {
+		printk(KERN_ERR "%s: currently supports only OMAP34xx CPUs\n",
+		       omap3_rom_rng_name);
+		return -ENODEV;
+	}
+	if (omap_type() == OMAP2_DEVICE_TYPE_GP) {
+		printk(KERN_ERR "%s: GP OMAPs not supported\n",
+		       omap3_rom_rng_name);
+		return -ENODEV;
+	}
+
+	setup_timer(&idle_timer, omap3_rom_idle_rng, 0);
+	rng_clk = clk_get_sys("omap_rng", "ick");
+	if (IS_ERR(rng_clk)) {
+		printk(KERN_ERR "%s: unable to get RNG clock\n",

drivers/char/hw_random/omap3-rom-drv.c line 146

Quoted 10 lines
drivers/char/hw_random/omap3-rom-drv.c new file +10 -0
+		       omap3_rom_rng_name);
+		return IS_ERR(rng_clk);
+	}
+
+	/* Leave the RNG in reset state. */
+	clk_prepare_enable(rng_clk);
+	omap3_rom_idle_rng(0);
+
+	return hwrng_register(&omap3_rom_rng_ops);
+}

You should replace the cpu_is_omap34xx() and omap_type() with some flags that you pass in the pdata. These too can be then deciphered based on the DT compatible flag later on. And then you don't need to include soc.h.

Regards,

Tony

#3 lore raw
Quoted 30 lines · On Wednesday 27 March 2013 22:09:18 Tony Lindgren wrote:
Quoted 29 lines · Pali Rohár
drivers/char/hw_random/omap3-rom-asm.S new file +4 -0
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2009 Nokia Corporation
+ *
+ * This program is free software; you can redistribute it

and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation.
+ *
+ */

drivers/char/hw_random/omap3-rom-asm.S new file +17 -0
+
+#include <linux/linkage.h>
+#include <asm/assembler.h>
+
+ENTRY(omap3_rng_call_rom_asm)
+	.arch_extension sec
+	stmfd	sp!, {r4-r12, lr}
+	stmfd	sp!, {r0-r3}
+	bl	v7_flush_dcache_all
+	ldmfd	sp!, {r0-r3}
+	mov	r6, #0xff
+	mov	r12, r0
+	smc	#1
+	mov	r12, r0
+	bl	v7_flush_dcache_all
+	mov	r0, #0
+	mcr	p15, 0, r0, c7, c5, 0
Quoted 9 lines

drivers/char/hw_random/omap3-rom-asm.S line 27

Quoted 2 lines
drivers/char/hw_random/omap3-rom-asm.S new file +2 -0
+	mov	r0, r12
+	ldmfd	sp!, {r4-r12, pc}

This part should be in arch/arm/mach-omap2 because of the direct calls to v7_flush_dcache_all. Then you can pass a pointer to this function in platform_data for now, and set it up based on the compatible flag with device tree from driver later on.

Ok, I will move this file to arch/arm/mach-omap2/omap3-rom-rng.S and pass function via platform_data to driver.

Quoted 65 lines
Quoted 14 lines
drivers/char/hw_random/omap3-rom-drv.c new file +7 -0
@@ -0,0 +1,167 @@
+/*
+ * omap3-rom-drv.c - RNG driver for TI OMAP3 CPU family
+ *
+ * Copyright (C) 2009 Nokia Corporation
+ * Author: Juha Yrjola <[email protected]>
+ *
+ * This file is licensed under  the terms of the GNU

General Public + * License version 2. This program is licensed "as is" without any + * warranty of any kind, whether express or implied. + */

drivers/char/hw_random/omap3-rom-drv.c new file +1 -0
+

drivers/char/hw_random/omap3-rom-drv.c line 21

Quoted 10 lines
drivers/char/hw_random/omap3-rom-drv.c new file +10 -0
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/random.h>
+#include <linux/hw_random.h>
+#include <linux/timer.h>
+#include <linux/clk.h>
+#include <linux/err.h>
+#include <linux/platform_device.h>
+
+#include "../../../arch/arm/mach-omap2/soc.h"

NAK for this, this must be private to arch/arm/mach-omap2.

Instead, just create a minimal include/linux/platform_data/omap3-rom.h, and pass the function pointer in the pdata if passed.

Quoted 18 lines

+static int omap3_rom_rng_probe(struct platform_device *pdev) +{

drivers/char/hw_random/omap3-rom-drv.c new file +1 -0
+	printk(KERN_INFO "%s: initializing\n",

omap3_rom_rng_name); + if (!cpu_is_omap34xx()) {

drivers/char/hw_random/omap3-rom-drv.c new file +1 -0
+		printk(KERN_ERR "%s: currently supports only OMAP34xx

CPUs\n", + omap3_rom_rng_name);

drivers/char/hw_random/omap3-rom-drv.c new file +12 -0
+		return -ENODEV;
+	}
+	if (omap_type() == OMAP2_DEVICE_TYPE_GP) {
+		printk(KERN_ERR "%s: GP OMAPs not supported\n",
+		       omap3_rom_rng_name);
+		return -ENODEV;
+	}
+
+	setup_timer(&idle_timer, omap3_rom_idle_rng, 0);
+	rng_clk = clk_get_sys("omap_rng", "ick");
+	if (IS_ERR(rng_clk)) {
+		printk(KERN_ERR "%s: unable to get RNG clock\n",

drivers/char/hw_random/omap3-rom-drv.c line 146

Quoted 10 lines
drivers/char/hw_random/omap3-rom-drv.c new file +10 -0
+		       omap3_rom_rng_name);
+		return IS_ERR(rng_clk);
+	}
+
+	/* Leave the RNG in reset state. */
+	clk_prepare_enable(rng_clk);
+	omap3_rom_idle_rng(0);
+
+	return hwrng_register(&omap3_rom_rng_ops);
+}

You should replace the cpu_is_omap34xx() and omap_type() with some flags that you pass in the pdata. These too can be then deciphered based on the DT compatible flag later on. And then you don't need to include soc.h.

Quoted 3 lines

Regards,

Tony

I will remove above code for checking omap type from hw rand driver, because same code is in omap part which creating platform_device for this driver. So soc.h is not needed.

Signature · 2 lines
Pali Rohár
[email protected]
maintainer
#4 lore raw
Quoted 4 lines · Pali Rohár

I will remove above code for checking omap type from hw rand driver, because same code is in omap part which creating platform_device for this driver. So soc.h is not needed.

OK thanks,

Tony

#31 lore raw
In reply to Tony Lindgren
Quoted 2 lines · Tony Lindgren

drivers/char/hw_random/omap3-rom-drv.c line 134

Quoted 2 lines
drivers/char/hw_random/omap3-rom-drv.c new file +2 -0
+	setup_timer(&idle_timer, omap3_rom_idle_rng, 0);
+	rng_clk = clk_get_sys("omap_rng", "ick");

Why is this using clk_get_sys when it should be using clk_get() with the platform device?

#32 lore raw
Quoted 6 lines · On Thursday 28 March 2013 10:52:28 Russell King - ARM Linux wrote:
Quoted 2 lines · Tony Lindgren

drivers/char/hw_random/omap3-rom-drv.c line 134

Quoted 2 lines
drivers/char/hw_random/omap3-rom-drv.c new file +2 -0
+	setup_timer(&idle_timer, omap3_rom_idle_rng, 0);
+	rng_clk = clk_get_sys("omap_rng", "ick");

Why is this using clk_get_sys when it should be using clk_get() with the platform device?

Funcion clk_get() needs struct device* instead clk device name. And I do not know how to get that pointer to device. With clk_get_sys driver working.

Signature · 2 lines
Pali Rohár
[email protected]
#5 lore raw
In reply to Tony Lindgren
Quoted 8 lines · On Wednesday 27 March 2013 23:25:24 Tony Lindgren wrote:
Quoted 3 lines · Pali Rohár

I will remove above code for checking omap type from hw rand driver, because same code is in omap part which creating platform_device for this driver. So soc.h is not needed.

OK thanks,

Tony

Here is new version of patch:

arch/arm/mach-omap2/Makefile +1 -1
index 5423456..37c4e09 100644
@@ -82,7 +82,7 @@ obj-$(CONFIG_OMAP_PM_NOOP)		+= omap-pm-noop.o
 ifeq ($(CONFIG_PM),y)
 obj-$(CONFIG_ARCH_OMAP2)		+= pm24xx.o
 obj-$(CONFIG_ARCH_OMAP2)		+= sleep24xx.o
-obj-$(CONFIG_ARCH_OMAP3)		+= pm34xx.o sleep34xx.o
+obj-$(CONFIG_ARCH_OMAP3)		+= pm34xx.o sleep34xx.o omap3-rom-rng.o
 obj-$(CONFIG_ARCH_OMAP4)		+= pm44xx.o omap-mpuss-lowpower.o
 obj-$(CONFIG_SOC_OMAP5)			+= omap-mpuss-lowpower.o
 obj-$(CONFIG_PM_DEBUG)			+= pm-debug.o
arch/arm/mach-omap2/devices.c +18 -0
index 1ec7f05..0b6260a1 100644
@@ -486,6 +486,23 @@ static void omap_init_mcspi(void)
 static inline void omap_init_mcspi(void) {}
 #endif
 
+extern u32 *omap3_rom_rng_call(u32 id, u32 proc, u32 flags, u32 va_ptr);
+
+static struct platform_device omap3_rom_rng_device = {
+	.name		= "omap3-rom-rng",
+	.id		= -1,
+	.dev	= {
+		.platform_data	= omap3_rom_rng_call,
+	},
+};
+
+static void omap_init_rom_rng(void)
+{
+	if (!cpu_is_omap34xx() || omap_type() == OMAP2_DEVICE_TYPE_GP)
+		return;
+	platform_device_register(&omap3_rom_rng_device);
+}
+
 /**
  * omap_init_rng - bind the RNG hwmod to the RNG omap_device
  *
@@ -767,6 +784,7 @@ static int __init omap2_init_devices(void)
 	}
 	omap_init_sti();
 	omap_init_rng();
+	omap_init_rom_rng();
 	omap_init_sham();
 	omap_init_aes();
 	omap_init_vout();
arch/arm/mach-omap2/omap3-rom-rng.S new file +28 -0
new file mode 100644
index 0000000..5d7d886
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2009 Nokia Corporation
+ * Copyright (C) 2013 Pali Rohár <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+
+#include <linux/linkage.h>
+#include <asm/assembler.h>
+
+ENTRY(omap3_rom_rng_call)
+	.arch_extension sec
+	stmfd	sp!, {r4-r12, lr}
+	stmfd	sp!, {r0-r3}
+	bl	v7_flush_dcache_all
+	ldmfd	sp!, {r0-r3}
+	mov	r6, #0xff
+	mov	r12, r0
+	smc	#1
+	mov	r12, r0
+	bl	v7_flush_dcache_all
+	mov	r0, #0
+	mcr	p15, 0, r0, c7, c5, 0
+	mov	r0, r12
+	ldmfd	sp!, {r4-r12, pc}
drivers/char/hw_random/Kconfig +13 -0
index c5a0262..2d51db6 100644
@@ -153,6 +153,19 @@ config HW_RANDOM_OMAP
 
  	  If unsure, say Y.
 
+config HW_RANDOM_OMAP3_ROM
+	tristate "OMAP3 ROM Random Number Generator support"
+	depends on HW_RANDOM && ARCH_OMAP3
+	default HW_RANDOM
+	---help---
+	  This driver provides kernel-side support for the Random Number
+	  Generator hardware found on OMAP34xx processors.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called omap3-rom-rng.
+
+	  If unsure, say Y.
+
 config HW_RANDOM_OCTEON
 	tristate "Octeon Random Number Generator support"
 	depends on HW_RANDOM && CPU_CAVIUM_OCTEON
drivers/char/hw_random/Makefile +1 -0
index 1fd7eec..c53e018 100644
@@ -15,6 +15,7 @@ n2-rng-y := n2-drv.o n2-asm.o
 obj-$(CONFIG_HW_RANDOM_VIA) += via-rng.o
 obj-$(CONFIG_HW_RANDOM_IXP4XX) += ixp4xx-rng.o
 obj-$(CONFIG_HW_RANDOM_OMAP) += omap-rng.o
+obj-$(CONFIG_HW_RANDOM_OMAP3_ROM) += omap3-rom-rng.o
 obj-$(CONFIG_HW_RANDOM_PASEMI) += pasemi-rng.o
 obj-$(CONFIG_HW_RANDOM_VIRTIO) += virtio-rng.o
 obj-$(CONFIG_HW_RANDOM_TX4939) += tx4939-rng.o
drivers/char/hw_random/omap3-rom-rng.c new file +165 -0

165 lines not on this page · raw message

Signature · 2 lines
Pali Rohár
[email protected]
maintainer
#6 lore raw
Quoted 19 lines · Pali Rohár

Here is new version of patch:

arch/arm/mach-omap2/devices.c +10 -0
@@ -486,6 +486,23 @@ static void omap_init_mcspi(void)
 static inline void omap_init_mcspi(void) {}
 #endif
 
+extern u32 *omap3_rom_rng_call(u32 id, u32 proc, u32 flags, u32 va_ptr);
+
+static struct platform_device omap3_rom_rng_device = {
+	.name		= "omap3-rom-rng",
+	.id		= -1,
+	.dev	= {
+		.platform_data	= omap3_rom_rng_call,
+	},
+};
+

arch/arm/mach-omap2/devices.c static void omap_init_mcspi(void) · line 508

Quoted 10 lines
arch/arm/mach-omap2/devices.c +7 -0
+static void omap_init_rom_rng(void)
+{
+	if (!cpu_is_omap34xx() || omap_type() == OMAP2_DEVICE_TYPE_GP)
+		return;
+	platform_device_register(&omap3_rom_rng_device);
+}
+
 /**
  * omap_init_rng - bind the RNG hwmod to the RNG omap_device
  *

This driver probably only works on Nokia boards because of the different SMC call numbering. Until it's been verified on some other HS omap34xx, I'd probably register this only from the Nokia board-*.c file.

Quoted 10 lines
drivers/char/hw_random/omap3-rom-rng.c new file +8 -0
+static int omap3_rom_rng_probe(struct platform_device *pdev)
+{
+	printk(KERN_INFO "%s: initializing\n", omap3_rom_rng_name);
+
+	omap3_rom_rng_call = pdev->dev.platform_data;
+	if (!omap3_rom_rng_call) {
+		printk(KERN_ERR "%s: omap3_rom_rng_call is NULL\n",
+		       omap3_rom_rng_name);

drivers/char/hw_random/omap3-rom-rng.c line 136

Quoted 10 lines
drivers/char/hw_random/omap3-rom-rng.c new file +10 -0
+		return -EINVAL;
+	}
+
+	setup_timer(&idle_timer, omap3_rom_idle_rng, 0);
+	rng_clk = clk_get_sys("omap_rng", "ick");
+	if (IS_ERR(rng_clk)) {
+		printk(KERN_ERR "%s: unable to get RNG clock\n",
+		       omap3_rom_rng_name);
+		return IS_ERR(rng_clk);
+	}

You can use regular clk_get if you add the alias to struct omap_clk omap3xxx_clks table.

Regards,

Tony

#7 lore raw
Quoted 30 lines · On Thursday 28 March 2013 22:44:11 Tony Lindgren wrote:
Quoted 29 lines · Pali Rohár

Here is new version of patch:

arch/arm/mach-omap2/devices.c +1 -0
@@ -486,6 +486,23 @@ static void omap_init_mcspi(void)
 
 static inline void omap_init_mcspi(void) {}
 #endif
 
+extern u32 *omap3_rom_rng_call(u32 id, u32 proc, u32 flags,

u32 va_ptr); +

arch/arm/mach-omap2/devices.c +11 -0
+static struct platform_device omap3_rom_rng_device = {
+	.name		= "omap3-rom-rng",
+	.id		= -1,
+	.dev	= {
+		.platform_data	= omap3_rom_rng_call,
+	},
+};
+
+static void omap_init_rom_rng(void)
+{
+	if (!cpu_is_omap34xx() || omap_type() ==

OMAP2_DEVICE_TYPE_GP) + return;

arch/arm/mach-omap2/devices.c +3 -0
+	platform_device_register(&omap3_rom_rng_device);
+}
+
 
 /**
Quoted 8 lines
Quoted 2 lines

* omap_init_rng - bind the RNG hwmod to the RNG
omap_device *

This driver probably only works on Nokia boards because of the different SMC call numbering. Until it's been verified on some other HS omap34xx, I'd probably register this only from the Nokia board-*.c file.

Freemangordon, can you look at this smc and errara 430973 code if they could be merged? Really omap3_rom_rng_call function looks like n900 specific.

Quoted 24 lines
Quoted 10 lines
drivers/char/hw_random/omap3-rom-rng.c new file +1 -0
+static int omap3_rom_rng_probe(struct platform_device

*pdev) +{

drivers/char/hw_random/omap3-rom-rng.c new file +1 -0
+	printk(KERN_INFO "%s: initializing\n",

omap3_rom_rng_name); +

drivers/char/hw_random/omap3-rom-rng.c new file +4 -0
+	omap3_rom_rng_call = pdev->dev.platform_data;
+	if (!omap3_rom_rng_call) {
+		printk(KERN_ERR "%s: omap3_rom_rng_call is NULL\n",
+		       omap3_rom_rng_name);

drivers/char/hw_random/omap3-rom-rng.c line 136

Quoted 10 lines
drivers/char/hw_random/omap3-rom-rng.c new file +10 -0
+		return -EINVAL;
+	}
+
+	setup_timer(&idle_timer, omap3_rom_idle_rng, 0);
+	rng_clk = clk_get_sys("omap_rng", "ick");
+	if (IS_ERR(rng_clk)) {
+		printk(KERN_ERR "%s: unable to get RNG clock\n",
+		       omap3_rom_rng_name);
+		return IS_ERR(rng_clk);
+	}

You can use regular clk_get if you add the alias to struct omap_clk omap3xxx_clks table.

Quoted 3 lines

Regards,

Tony

Tony, can you show me how?

Signature · 2 lines
Pali Rohár
[email protected]
maintainer
#8 lore raw
Quoted 6 lines · Pali Rohár
Quoted 3 lines · On Thursday 28 March 2013 22:44:11 Tony Lindgren wrote:

You can use regular clk_get if you add the alias to struct omap_clk omap3xxx_clks table.

Tony, can you show me how?

Take a look at the omap3xxx_clks in cclock3xxx_data.c. Note how some entries have things like "omap_hsmmc.0" and "ick". By adding those your driver can request the clock with clk_get(&pdev->dev, "ick").

Regards,

Tony

#9 lore raw

cover OMAP3 ROM Random Number Generator support

In reply to Pali Rohár

This two patches adding support for OMAP3 ROM Random Number Generator on Nokia N900.

Pali Rohár (2):
hwrng: OMAP3 ROM Random Number Generator support
RX-51: Add support for OMAP3 ROM Random Number Generator

 arch/arm/mach-omap2/board-rx51.c       |   10 +++
 arch/arm/mach-omap2/omap-secure.c      |   11 +++
 arch/arm/mach-omap2/omap-secure.h      |    1 +
 drivers/char/hw_random/Kconfig         |   13 +++
 drivers/char/hw_random/Makefile        |    1 +
 drivers/char/hw_random/omap3-rom-rng.c |  145 ++++++++++++++++++++++++++++++++
 6 files changed, 181 insertions(+)
 create mode 100644 drivers/char/hw_random/omap3-rom-rng.c
Signature · 1 line
1.7.10.4
#13 lore raw

PATCH 2/2 RX-51: Add support for OMAP3 ROM Random Number Generator

---
 arch/arm/mach-omap2/board-rx51.c  |   10 ++++++++++
 arch/arm/mach-omap2/omap-secure.c |   11 +++++++++++
 arch/arm/mach-omap2/omap-secure.h |    1 +
 3 files changed, 22 insertions(+)
arch/arm/mach-omap2/board-rx51.c +10 -0
index db168c9..c2a3e39 100644
@@ -93,6 +93,14 @@ static struct omap_musb_board_data musb_board_data = {
 	.power			= 0,
 };
 
+static struct platform_device omap3_rom_rng_device = {
+	.name		= "omap_rng",
+	.id		= -1,
+	.dev	= {
+		.platform_data	= rx51_secure_rng_call,
+	},
+};
+
 static void __init rx51_init(void)
 {
 	struct omap_sdrc_params *sdrc_params;
@@ -113,6 +121,8 @@ static void __init rx51_init(void)
 		/* set IBE to 1 */
 		rx51_secure_update_aux_cr(BIT(6), 0);
 #endif
+		pr_info("RX-51: Registring OMAP3 HWRNG device\n");
+		platform_device_register(&omap3_rom_rng_device);
 	}
 
 	/* Ensure SDRC pins are mux'd for self-refresh */
arch/arm/mach-omap2/omap-secure.c +11 -0
index 146a7c4..5ac122e 100644
@@ -135,3 +135,14 @@ u32 rx51_secure_update_aux_cr(u32 set_bits, u32 clear_bits)
 				      FLAG_START_CRITICAL,
 				      1, acr, 0, 0, 0);
 }
+
+/**
+ * rx51_secure_rng_call: Routine for HW random generator
+ */
+u32 rx51_secure_rng_call(u32 ptr, u32 count, u32 flag)
+{
+	return rx51_secure_dispatcher(RX51_PPA_HWRNG,
+				      0,
+				      NO_FLAG,
+				      3, ptr, count, flag, 0);
+}
arch/arm/mach-omap2/omap-secure.h +1 -0
index 51b59c6..f6cabb0 100644
@@ -65,6 +65,7 @@ extern int omap_secure_ram_reserve_memblock(void);
 extern u32 rx51_secure_dispatcher(u32 idx, u32 process, u32 flag, u32 nargs,
 				  u32 arg1, u32 arg2, u32 arg3, u32 arg4);
 extern u32 rx51_secure_update_aux_cr(u32 set_bits, u32 clear_bits);
+extern u32 rx51_secure_rng_call(u32 ptr, u32 count, u32 flag);
 
 #ifdef CONFIG_OMAP4_ERRATA_I688
 extern int omap_barrier_reserve_memblock(void);
Signature · 1 line
1.7.10.4
#10 lore raw

PATCH 1/2 hwrng: OMAP3 ROM Random Number Generator support

In reply to Pali Rohár

This driver provides kernel-side support for the Random Number Generator hardware found on OMAP34xx processors.

---
 drivers/char/hw_random/Kconfig         |   13 +++
 drivers/char/hw_random/Makefile        |    1 +
 drivers/char/hw_random/omap3-rom-rng.c |  145 ++++++++++++++++++++++++++++++++
 3 files changed, 159 insertions(+)
 create mode 100644 drivers/char/hw_random/omap3-rom-rng.c
drivers/char/hw_random/Kconfig +13 -0
index 0aa9d91..0a331c3 100644
@@ -165,6 +165,19 @@ config HW_RANDOM_OMAP
 
  	  If unsure, say Y.
 
+config HW_RANDOM_OMAP3_ROM
+	tristate "OMAP3 ROM Random Number Generator support"
+	depends on HW_RANDOM && ARCH_OMAP3
+	default HW_RANDOM
+	---help---
+	  This driver provides kernel-side support for the Random Number
+	  Generator hardware found on OMAP34xx processors.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called omap3-rom-rng.
+
+	  If unsure, say Y.
+
 config HW_RANDOM_OCTEON
 	tristate "Octeon Random Number Generator support"
 	depends on HW_RANDOM && CAVIUM_OCTEON_SOC
drivers/char/hw_random/Makefile +1 -0
index bed467c..7c8aa80 100644
@@ -15,6 +15,7 @@ n2-rng-y := n2-drv.o n2-asm.o
 obj-$(CONFIG_HW_RANDOM_VIA) += via-rng.o
 obj-$(CONFIG_HW_RANDOM_IXP4XX) += ixp4xx-rng.o
 obj-$(CONFIG_HW_RANDOM_OMAP) += omap-rng.o
+obj-$(CONFIG_HW_RANDOM_OMAP3_ROM) += omap3-rom-rng.o
 obj-$(CONFIG_HW_RANDOM_PASEMI) += pasemi-rng.o
 obj-$(CONFIG_HW_RANDOM_VIRTIO) += virtio-rng.o
 obj-$(CONFIG_HW_RANDOM_TX4939) += tx4939-rng.o
drivers/char/hw_random/omap3-rom-rng.c new file +145 -0

145 lines not on this page · raw message

Signature · 6 lines
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#11 lore raw

Re: [PATCH 1/2] hwrng: OMAP3 ROM Random Number Generator support

Quoted 2 lines · Pali Rohár

This driver provides kernel-side support for the Random Number Generator hardware found on OMAP34xx processors.

[]

drivers/char/hw_random/omap3-rom-rng.c

Quoted 1 line
drivers/char/hw_random/omap3-rom-rng.c +0 -0

trivial note:

It produces smaller overall code to add
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
before any #include and use

drivers/char/hw_random/omap3-rom-rng.c line 43

Quoted 8 lines
drivers/char/hw_random/omap3-rom-rng.c +8 -0
+static void omap3_rom_rng_idle(unsigned long data)
+{
+	int r;
+
+	r = omap3_rom_rng_call(0, 0, RNG_RESET);
+	if (r != 0) {
+		printk(KERN_ERR "%s: reset failed: %d\n",
+		       omap3_rom_rng_name, r);
		pr_err("reset failed: %d\n", r);

drivers/char/hw_random/omap3-rom-rng.c

Quoted 2 lines
drivers/char/hw_random/omap3-rom-rng.c +2 -0
+static int omap3_rom_rng_get_random(void *buf, unsigned int count)
+{

[]

drivers/char/hw_random/omap3-rom-rng.c line 62

Quoted 4 lines
drivers/char/hw_random/omap3-rom-rng.c +4 -0
+		if (r != 0) {
+			clk_disable_unprepare(rng_clk);
+			printk(KERN_ERR "%s: HW init failed: %d\n",
+			       omap3_rom_rng_name, r);
			pr_err("HW init failed: %d\n", r);

etc...

maintainer
#14 lore raw

Re: [PATCH 2/2] RX-51: Add support for OMAP3 ROM Random Number Generator

In reply to Pali Rohár
Quoted 1 line · Pali Rohár

Description please, then also add a note that this makes sense to do as a platform device at least until we have some ARM generic way to deal with SMC calls.

Quoted 25 lines
 arch/arm/mach-omap2/board-rx51.c  |   10 ++++++++++
 arch/arm/mach-omap2/omap-secure.c |   11 +++++++++++
 arch/arm/mach-omap2/omap-secure.h |    1 +
 3 files changed, 22 insertions(+)
arch/arm/mach-omap2/board-rx51.c +8 -0
index db168c9..c2a3e39 100644
@@ -93,6 +93,14 @@ static struct omap_musb_board_data musb_board_data = {
 	.power			= 0,
 };
 
+static struct platform_device omap3_rom_rng_device = {
+	.name		= "omap_rng",
+	.id		= -1,
+	.dev	= {
+		.platform_data	= rx51_secure_rng_call,
+	},
+};
+
 static void __init rx51_init(void)
 {
 	struct omap_sdrc_params *sdrc_params;

arch/arm/mach-omap2/board-rx51.c static void __init rx51_init(void) · line 128

Quoted 8 lines
arch/arm/mach-omap2/board-rx51.c +2 -0
@@ -113,6 +121,8 @@ static void __init rx51_init(void)
 		/* set IBE to 1 */
 		rx51_secure_update_aux_cr(BIT(6), 0);
 #endif
+		pr_info("RX-51: Registring OMAP3 HWRNG device\n");
+		platform_device_register(&omap3_rom_rng_device);
 	}
 
 	/* Ensure SDRC pins are mux'd for self-refresh */

Maybe this should be in board-rx51-peripherals.c instead?

That way we can initialize the legacy platform devices from there for DT based booting too and don't have to move code around when moving to DT based booting.

Regards,

Tony

maintainer
#12 lore raw

Re: [PATCH 1/2] hwrng: OMAP3 ROM Random Number Generator support

In reply to Pali Rohár

Hi,

drivers/char/hw_random/omap3-rom-rng.c line 113

Quoted 4 lines · Pali Rohár
drivers/char/hw_random/omap3-rom-rng.c new file +4 -0
+	if (IS_ERR(rng_clk)) {
+		printk(KERN_ERR "%s: unable to get RNG clock\n",
+		       omap3_rom_rng_name);
+		return IS_ERR(rng_clk);

This should be PTR_ERR().

A.

#15 lore raw

v2 cover OMAP3 ROM Random Number Generator support

In reply to Pali Rohár

This patch series adding support for OMAP3 ROM Random Number Generator on Nokia N900. In previous version I forgot to send patch which changing clk dev id to new driver name.

Pali Rohár (3):
omap2: Change clk dev id for rng to omap3-rom-rng
hwrng: OMAP3 ROM Random Number Generator support
RX-51: Add support for OMAP3 ROM Random Number Generator

 arch/arm/mach-omap2/board-rx51-peripherals.c |   19 ++++
 arch/arm/mach-omap2/cclock3xxx_data.c        |    2 +-
 arch/arm/mach-omap2/omap-secure.c            |   11 ++
 arch/arm/mach-omap2/omap-secure.h            |    1 +
 drivers/char/hw_random/Kconfig               |   13 +++
 drivers/char/hw_random/Makefile              |    1 +
 drivers/char/hw_random/omap3-rom-rng.c       |  141 ++++++++++++++++++++++++++
 7 files changed, 187 insertions(+), 1 deletion(-)
 create mode 100644 drivers/char/hw_random/omap3-rom-rng.c
Signature · 1 line
1.7.10.4
#16 lore raw

PATCH v2 1/3 omap2: Change clk dev id for rng to omap3-rom-rng

Name omap_rng is already used by omap_rng driver which is for omap2 and omap4. For omap3 HS devices there is new driver omap3-rom-rng which needs that clk. And because there cannot be two drivers with same name, rename omap3 clk dev id.

---
 arch/arm/mach-omap2/cclock3xxx_data.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap2/cclock3xxx_data.c +1 -1
index 334b767..5059338 100644
@@ -3274,7 +3274,7 @@ static struct omap_clk omap36xx_clks[] = {
  */
 static struct omap_clk omap34xx_omap36xx_clks[] = {
 	CLK(NULL,	"aes1_ick",	&aes1_ick),
-	CLK("omap_rng",	"ick",		&rng_ick),
+	CLK("omap3-rom-rng",	"ick",		&rng_ick),
 	CLK(NULL,	"sha11_ick",	&sha11_ick),
 	CLK(NULL,	"des1_ick",	&des1_ick),
 	CLK(NULL,	"cam_mclk",	&cam_mclk),
Signature · 1 line
1.7.10.4
#22 lore raw

PATCH v2 2/3 hwrng: OMAP3 ROM Random Number Generator support

In reply to Pali Rohár

This driver provides kernel-side support for the Random Number Generator hardware found on OMAP34xx processors.

This driver comes from Maemo 2.6.28 kernel and was tested on Nokia RX-51. It is platform device because it needs board specific function for smc calls.

---
 drivers/char/hw_random/Kconfig         |   13 +++
 drivers/char/hw_random/Makefile        |    1 +
 drivers/char/hw_random/omap3-rom-rng.c |  141 ++++++++++++++++++++++++++++++++
 3 files changed, 155 insertions(+)
 create mode 100644 drivers/char/hw_random/omap3-rom-rng.c
drivers/char/hw_random/Kconfig +13 -0
index 0aa9d91..0a331c3 100644
@@ -165,6 +165,19 @@ config HW_RANDOM_OMAP
 
  	  If unsure, say Y.
 
+config HW_RANDOM_OMAP3_ROM
+	tristate "OMAP3 ROM Random Number Generator support"
+	depends on HW_RANDOM && ARCH_OMAP3
+	default HW_RANDOM
+	---help---
+	  This driver provides kernel-side support for the Random Number
+	  Generator hardware found on OMAP34xx processors.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called omap3-rom-rng.
+
+	  If unsure, say Y.
+
 config HW_RANDOM_OCTEON
 	tristate "Octeon Random Number Generator support"
 	depends on HW_RANDOM && CAVIUM_OCTEON_SOC
drivers/char/hw_random/Makefile +1 -0
index bed467c..7c8aa80 100644
@@ -15,6 +15,7 @@ n2-rng-y := n2-drv.o n2-asm.o
 obj-$(CONFIG_HW_RANDOM_VIA) += via-rng.o
 obj-$(CONFIG_HW_RANDOM_IXP4XX) += ixp4xx-rng.o
 obj-$(CONFIG_HW_RANDOM_OMAP) += omap-rng.o
+obj-$(CONFIG_HW_RANDOM_OMAP3_ROM) += omap3-rom-rng.o
 obj-$(CONFIG_HW_RANDOM_PASEMI) += pasemi-rng.o
 obj-$(CONFIG_HW_RANDOM_VIRTIO) += virtio-rng.o
 obj-$(CONFIG_HW_RANDOM_TX4939) += tx4939-rng.o
drivers/char/hw_random/omap3-rom-rng.c new file +141 -0

141 lines not on this page · raw message

Signature · 1 line
1.7.10.4
#29 lore raw

PATCH v2 3/3 RX-51: Add support for OMAP3 ROM Random Number Generator

In reply to Pali Rohár

Adding this driver as platform device and only for RX-51 until somebody test if it working also on other OMAP3 HS devices and until there will be generic ARM way to deal with SMC calls.

---
 arch/arm/mach-omap2/board-rx51-peripherals.c |   19 +++++++++++++++++++
 arch/arm/mach-omap2/omap-secure.c            |   11 +++++++++++
 arch/arm/mach-omap2/omap-secure.h            |    1 +
 3 files changed, 31 insertions(+)
arch/arm/mach-omap2/board-rx51-peripherals.c +19 -0
index c3270c0..497d260 100644
@@ -57,6 +57,8 @@
 #include "common-board-devices.h"
 #include "gpmc.h"
 #include "gpmc-onenand.h"
+#include "soc.h"
+#include "omap-secure.h"
 
 #define SYSTEM_REV_B_USES_VAUX3	0x1699
 #define SYSTEM_REV_S_USES_VAUX3 0x8
@@ -1289,6 +1291,22 @@ static void __init rx51_init_twl4030_hwmon(void)
 	platform_device_register(&madc_hwmon);
 }
 
+static struct platform_device omap3_rom_rng_device = {
+	.name		= "omap3-rom-rng",
+	.id		= -1,
+	.dev	= {
+		.platform_data	= rx51_secure_rng_call,
+	},
+};
+
+static void __init rx51_init_omap3_rom_rng(void)
+{
+	if (omap_type() == OMAP2_DEVICE_TYPE_SEC) {
+		pr_info("RX-51: Registring OMAP3 HWRNG device\n");
+		platform_device_register(&omap3_rom_rng_device);
+	}
+}
+
 void __init rx51_peripherals_init(void)
 {
 	rx51_i2c_init();
@@ -1309,5 +1327,6 @@ void __init rx51_peripherals_init(void)
 
 	rx51_charger_init();
 	rx51_init_twl4030_hwmon();
+	rx51_init_omap3_rom_rng();
 }
 
arch/arm/mach-omap2/omap-secure.c +11 -0
index 146a7c4..5ac122e 100644
@@ -135,3 +135,14 @@ u32 rx51_secure_update_aux_cr(u32 set_bits, u32 clear_bits)
 				      FLAG_START_CRITICAL,
 				      1, acr, 0, 0, 0);
 }
+
+/**
+ * rx51_secure_rng_call: Routine for HW random generator
+ */
+u32 rx51_secure_rng_call(u32 ptr, u32 count, u32 flag)
+{
+	return rx51_secure_dispatcher(RX51_PPA_HWRNG,
+				      0,
+				      NO_FLAG,
+				      3, ptr, count, flag, 0);
+}
arch/arm/mach-omap2/omap-secure.h +1 -0
index 51b59c6..f6cabb0 100644
@@ -65,6 +65,7 @@ extern int omap_secure_ram_reserve_memblock(void);
 extern u32 rx51_secure_dispatcher(u32 idx, u32 process, u32 flag, u32 nargs,
 				  u32 arg1, u32 arg2, u32 arg3, u32 arg4);
 extern u32 rx51_secure_update_aux_cr(u32 set_bits, u32 clear_bits);
+extern u32 rx51_secure_rng_call(u32 ptr, u32 count, u32 flag);
 
 #ifdef CONFIG_OMAP4_ERRATA_I688
 extern int omap_barrier_reserve_memblock(void);
Signature · 1 line
1.7.10.4
maintainer
#17 lore raw

Re: [PATCH v2 1/3] omap2: Change clk dev id for rng to omap3-rom-rng

In reply to Pali Rohár
Quoted 14 lines · Pali Rohár

Name omap_rng is already used by omap_rng driver which is for omap2 and omap4. For omap3 HS devices there is new driver omap3-rom-rng which needs that clk. And because there cannot be two drivers with same name, rename omap3 clk dev id.

---
 arch/arm/mach-omap2/cclock3xxx_data.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap2/cclock3xxx_data.c +0 -0
index 334b767..5059338 100644

arch/arm/mach-omap2/cclock3xxx_data.c static struct omap_clk omap36xx_clks[] = { · line 3280

Quoted 8 lines
arch/arm/mach-omap2/cclock3xxx_data.c +1 -1
@@ -3274,7 +3274,7 @@ static struct omap_clk omap36xx_clks[] = {
  */
 static struct omap_clk omap34xx_omap36xx_clks[] = {
 	CLK(NULL,	"aes1_ick",	&aes1_ick),
-	CLK("omap_rng",	"ick",		&rng_ick),
+	CLK("omap3-rom-rng",	"ick",		&rng_ick),
 	CLK(NULL,	"sha11_ick",	&sha11_ick),
 	CLK(NULL,	"des1_ick",	&des1_ick),
 	CLK(NULL,	"cam_mclk",	&cam_mclk),

Hmm are you sure the omap_rng is not available on
any of the omap3 GP versions? If so, the omap_rng
alias should be kept as well.

Regards,

Tony

#18 lore raw

Re: [PATCH v2 1/3] omap2: Change clk dev id for rng to omap3-rom-rng

Quoted 38 lines · On Friday 20 September 2013 18:23:43 Tony Lindgren wrote:
Quoted 22 lines · Pali Rohár

Name omap_rng is already used by omap_rng driver which is for omap2 and omap4. For omap3 HS devices there is new driver omap3-rom-rng which needs that clk. And because there cannot be two drivers with same name, rename omap3 clk dev id.

---

 arch/arm/mach-omap2/cclock3xxx_data.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
(quoted diff) +0 -0

b/arch/arm/mach-omap2/cclock3xxx_data.c index 334b767..5059338 100644

arch/arm/mach-omap2/cclock3xxx_data.c +0 -0
@@ -3274,7 +3274,7 @@ static struct omap_clk omap36xx_clks[]
 = {
 
  */
 

arch/arm/mach-omap2/cclock3xxx_data.c static struct omap_clk omap36xx_clks[] · line 3280

Quoted 10 lines
arch/arm/mach-omap2/cclock3xxx_data.c +1 -1
 static struct omap_clk omap34xx_omap36xx_clks[] = {
 
 	CLK(NULL,	"aes1_ick",	&aes1_ick),
 
-	CLK("omap_rng",	"ick",		&rng_ick),
+	CLK("omap3-rom-rng",	"ick",		&rng_ick),
 
 	CLK(NULL,	"sha11_ick",	&sha11_ick),
 	CLK(NULL,	"des1_ick",	&des1_ick),
 	CLK(NULL,	"cam_mclk",	&cam_mclk),

Hmm are you sure the omap_rng is not available on
any of the omap3 GP versions? If so, the omap_rng
alias should be kept as well.

Quoted 3 lines

Regards,

Tony

I really do not know, but driver char/hw_random/omap-rng.c support only omap2 and omap4 platforms. So "omap_rng" dev id for omap3 is not used.

In email [1] you suggested to use clk_get instead clk_get_sys. If I understand correctly clk_get calling clk_get_sys with driver name. So dev in in CLK macro must be same as driver name. And because in cclock3xxx_data.c is dev id "omap_rng" and there is already driver with name "omap_rng", I need to rename dev in cclock3xxx_data.c to get new omap3-rom-rng driver working.

Or if you know better way how to do it, let me know.

[1] - https://lkml.org/lkml/2013/4/1/278

Signature · 2 lines
Pali Rohár
[email protected]
maintainer
#19 lore raw

Re: [PATCH v2 1/3] omap2: Change clk dev id for rng to omap3-rom-rng

Quoted 47 lines · Pali Rohár
Quoted 38 lines · On Friday 20 September 2013 18:23:43 Tony Lindgren wrote:
Quoted 22 lines · Pali Rohár

Name omap_rng is already used by omap_rng driver which is for omap2 and omap4. For omap3 HS devices there is new driver omap3-rom-rng which needs that clk. And because there cannot be two drivers with same name, rename omap3 clk dev id.

---

 arch/arm/mach-omap2/cclock3xxx_data.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
(quoted diff) +0 -0

b/arch/arm/mach-omap2/cclock3xxx_data.c index 334b767..5059338 100644

arch/arm/mach-omap2/cclock3xxx_data.c +0 -0
@@ -3274,7 +3274,7 @@ static struct omap_clk omap36xx_clks[]
 = {
 
  */
 

arch/arm/mach-omap2/cclock3xxx_data.c static struct omap_clk omap36xx_clks[] · line 3280

Quoted 10 lines
arch/arm/mach-omap2/cclock3xxx_data.c +1 -1
 static struct omap_clk omap34xx_omap36xx_clks[] = {
 
 	CLK(NULL,	"aes1_ick",	&aes1_ick),
 
-	CLK("omap_rng",	"ick",		&rng_ick),
+	CLK("omap3-rom-rng",	"ick",		&rng_ick),
 
 	CLK(NULL,	"sha11_ick",	&sha11_ick),
 	CLK(NULL,	"des1_ick",	&des1_ick),
 	CLK(NULL,	"cam_mclk",	&cam_mclk),

Hmm are you sure the omap_rng is not available on
any of the omap3 GP versions? If so, the omap_rng
alias should be kept as well.

Quoted 3 lines

Regards,

Tony

I really do not know, but driver char/hw_random/omap-rng.c support only omap2 and omap4 platforms. So "omap_rng" dev id for omap3 is not used.

Quoted 8 lines

In email [1] you suggested to use clk_get instead clk_get_sys. If I understand correctly clk_get calling clk_get_sys with driver name. So dev in in CLK macro must be same as driver name. And because in cclock3xxx_data.c is dev id "omap_rng" and there is already driver with name "omap_rng", I need to rename dev in cclock3xxx_data.c to get new omap3-rom-rng driver working.

Or if you know better way how to do it, let me know.

I think it's safest to keep the existing alias also, and add a comment saying that it may not be available on omap3 processors.

Regards,

Tony

Quoted 5 lines

[1] - https://lkml.org/lkml/2013/4/1/278

Signature · 2 lines
Pali Rohár
[email protected]
#20 lore raw

Re: [PATCH v2 1/3] omap2: Change clk dev id for rng to omap3-rom-rng

Quoted 58 lines · On Friday 20 September 2013 19:46:41 Tony Lindgren wrote:
Quoted 55 lines · Pali Rohár
Quoted 38 lines · On Friday 20 September 2013 18:23:43 Tony Lindgren wrote:
Quoted 22 lines · Pali Rohár

Name omap_rng is already used by omap_rng driver which is for omap2 and omap4. For omap3 HS devices there is new driver omap3-rom-rng which needs that clk. And because there cannot be two drivers with same name, rename omap3 clk dev id.

---

 arch/arm/mach-omap2/cclock3xxx_data.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
(quoted diff) +0 -0

b/arch/arm/mach-omap2/cclock3xxx_data.c index 334b767..5059338 100644

arch/arm/mach-omap2/cclock3xxx_data.c +0 -0
@@ -3274,7 +3274,7 @@ static struct omap_clk
 omap36xx_clks[] = {
 
  */
 

arch/arm/mach-omap2/cclock3xxx_data.c static struct omap_clk

Quoted 10 lines
arch/arm/mach-omap2/cclock3xxx_data.c +1 -1
 static struct omap_clk omap34xx_omap36xx_clks[] = {
 
 	CLK(NULL,	"aes1_ick",	&aes1_ick),
 
-	CLK("omap_rng",	"ick",		&rng_ick),
+	CLK("omap3-rom-rng",	"ick",		&rng_ick),
 
 	CLK(NULL,	"sha11_ick",	&sha11_ick),
 	CLK(NULL,	"des1_ick",	&des1_ick),
 	CLK(NULL,	"cam_mclk",	&cam_mclk),

Hmm are you sure the omap_rng is not available on
any of the omap3 GP versions? If so, the omap_rng
alias should be kept as well.

Quoted 3 lines

Regards,

Tony

I really do not know, but driver char/hw_random/omap-rng.c support only omap2 and omap4 platforms. So "omap_rng" dev id for omap3 is not used.

In email [1] you suggested to use clk_get instead clk_get_sys. If I understand correctly clk_get calling clk_get_sys with driver name. So dev in in CLK macro must be same as driver name. And because in cclock3xxx_data.c is dev id "omap_rng" and there is already driver with name "omap_rng", I need to rename dev in cclock3xxx_data.c to get new omap3-rom-rng driver working.

Quoted 1 line

Or if you know better way how to do it, let me know.

Quoted 9 lines

I think it's safest to keep the existing alias also, and add a comment saying that it may not be available on omap3 processors.

Regards,

Tony

Quoted 1 line

[1] - https://lkml.org/lkml/2013/4/1/278

Ok, then there is new patch which only adding omap3-rom-rng and not removing omap_rng. It is OK to have same CLK data but with different names?

arch/arm/mach-omap2/cclock3xxx_data.c +1 -0
index 334b767..03a2829 100644
@@ -3275,6 +3275,7 @@ static struct omap_clk omap36xx_clks[] = {
 static struct omap_clk omap34xx_omap36xx_clks[] = {
 	CLK(NULL,	"aes1_ick",	&aes1_ick),
 	CLK("omap_rng",	"ick",		&rng_ick),
+	CLK("omap3-rom-rng",	"ick",	&rng_ick),
 	CLK(NULL,	"sha11_ick",	&sha11_ick),
 	CLK(NULL,	"des1_ick",	&des1_ick),
 	CLK(NULL,	"cam_mclk",	&cam_mclk),
Signature · 2 lines
Pali Rohár
[email protected]
maintainer
#21 lore raw

Re: [PATCH v2 1/3] omap2: Change clk dev id for rng to omap3-rom-rng

Quoted 4 lines · Pali Rohár

On Friday 20 September 2013 19:46:41 Tony Lindgren wrote:

Ok, then there is new patch which only adding omap3-rom-rng and not removing omap_rng. It is OK to have same CLK data but with different names?

Yes in this case it's always either omap_rng or omap3-rom-rng so the patch below looks OK to me.

Regards,

Tony

Quoted 17 lines
arch/arm/mach-omap2/cclock3xxx_data.c +1 -0
index 334b767..03a2829 100644
@@ -3275,6 +3275,7 @@ static struct omap_clk omap36xx_clks[] = {
 static struct omap_clk omap34xx_omap36xx_clks[] = {
 	CLK(NULL,	"aes1_ick",	&aes1_ick),
 	CLK("omap_rng",	"ick",		&rng_ick),
+	CLK("omap3-rom-rng",	"ick",	&rng_ick),
 	CLK(NULL,	"sha11_ick",	&sha11_ick),
 	CLK(NULL,	"des1_ick",	&des1_ick),
 	CLK(NULL,	"cam_mclk",	&cam_mclk),
Signature · 3 lines
-- 
Pali Rohár
[email protected]
maintainer Acked-by on v2 2/3
#23 lore raw

Re: [PATCH v2 2/3] hwrng: OMAP3 ROM Random Number Generator support

In reply to Pali Rohár
Quoted 5 lines · Pali Rohár

This driver provides kernel-side support for the Random Number Generator hardware found on OMAP34xx processors.

This driver comes from Maemo 2.6.28 kernel and was tested on Nokia RX-51. It is platform device because it needs board specific function for smc calls.

This one is should be merged via the hw_random patches seprately:

Quoted 195 lines
---
 drivers/char/hw_random/Kconfig         |   13 +++
 drivers/char/hw_random/Makefile        |    1 +
 drivers/char/hw_random/omap3-rom-rng.c |  141 ++++++++++++++++++++++++++++++++
 3 files changed, 155 insertions(+)
 create mode 100644 drivers/char/hw_random/omap3-rom-rng.c
drivers/char/hw_random/Kconfig +13 -0
index 0aa9d91..0a331c3 100644
@@ -165,6 +165,19 @@ config HW_RANDOM_OMAP
 
  	  If unsure, say Y.
 
+config HW_RANDOM_OMAP3_ROM
+	tristate "OMAP3 ROM Random Number Generator support"
+	depends on HW_RANDOM && ARCH_OMAP3
+	default HW_RANDOM
+	---help---
+	  This driver provides kernel-side support for the Random Number
+	  Generator hardware found on OMAP34xx processors.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called omap3-rom-rng.
+
+	  If unsure, say Y.
+
 config HW_RANDOM_OCTEON
 	tristate "Octeon Random Number Generator support"
 	depends on HW_RANDOM && CAVIUM_OCTEON_SOC
drivers/char/hw_random/Makefile +1 -0
index bed467c..7c8aa80 100644
@@ -15,6 +15,7 @@ n2-rng-y := n2-drv.o n2-asm.o
 obj-$(CONFIG_HW_RANDOM_VIA) += via-rng.o
 obj-$(CONFIG_HW_RANDOM_IXP4XX) += ixp4xx-rng.o
 obj-$(CONFIG_HW_RANDOM_OMAP) += omap-rng.o
+obj-$(CONFIG_HW_RANDOM_OMAP3_ROM) += omap3-rom-rng.o
 obj-$(CONFIG_HW_RANDOM_PASEMI) += pasemi-rng.o
 obj-$(CONFIG_HW_RANDOM_VIRTIO) += virtio-rng.o
 obj-$(CONFIG_HW_RANDOM_TX4939) += tx4939-rng.o
drivers/char/hw_random/omap3-rom-rng.c new file +141 -0
new file mode 100644
index 0000000..c853e9e
@@ -0,0 +1,141 @@
+/*
+ * omap3-rom-rng.c - RNG driver for TI OMAP3 CPU family
+ *
+ * Copyright (C) 2009 Nokia Corporation
+ * Author: Juha Yrjola <[email protected]>
+ *
+ * Copyright (C) 2013 Pali Rohár <[email protected]>
+ *
+ * This file is licensed under  the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/random.h>
+#include <linux/hw_random.h>
+#include <linux/timer.h>
+#include <linux/clk.h>
+#include <linux/err.h>
+#include <linux/platform_device.h>
+
+#define RNG_RESET			0x01
+#define RNG_GEN_PRNG_HW_INIT		0x02
+#define RNG_GEN_HW			0x08
+
+/* param1: ptr, param2: count, param3: flag */
+static u32 (*omap3_rom_rng_call)(u32, u32, u32);
+
+static struct timer_list idle_timer;
+static int rng_idle;
+static struct clk *rng_clk;
+
+static void omap3_rom_rng_idle(unsigned long data)
+{
+	int r;
+
+	r = omap3_rom_rng_call(0, 0, RNG_RESET);
+	if (r != 0) {
+		pr_err("reset failed: %d\n", r);
+		return;
+	}
+	clk_disable_unprepare(rng_clk);
+	rng_idle = 1;
+}
+
+static int omap3_rom_rng_get_random(void *buf, unsigned int count)
+{
+	u32 r;
+	u32 ptr;
+
+	del_timer_sync(&idle_timer);
+	if (rng_idle) {
+		clk_prepare_enable(rng_clk);
+		r = omap3_rom_rng_call(0, 0, RNG_GEN_PRNG_HW_INIT);
+		if (r != 0) {
+			clk_disable_unprepare(rng_clk);
+			pr_err("HW init failed: %d\n", r);
+			return -EIO;
+		}
+		rng_idle = 0;
+	}
+
+	ptr = virt_to_phys(buf);
+	r = omap3_rom_rng_call(ptr, count, RNG_GEN_HW);
+	mod_timer(&idle_timer, jiffies + msecs_to_jiffies(500));
+	if (r != 0)
+		return -EINVAL;
+	return 0;
+}
+
+static int omap3_rom_rng_data_present(struct hwrng *rng, int wait)
+{
+	return 1;
+}
+
+static int omap3_rom_rng_data_read(struct hwrng *rng, u32 *data)
+{
+	int r;
+
+	r = omap3_rom_rng_get_random(data, 4);
+	if (r < 0)
+		return r;
+	return 4;
+}
+
+static struct hwrng omap3_rom_rng_ops = {
+	.name		= "omap3-rom",
+	.data_present	= omap3_rom_rng_data_present,
+	.data_read	= omap3_rom_rng_data_read,
+};
+
+static int omap3_rom_rng_probe(struct platform_device *pdev)
+{
+	pr_info("initializing\n");
+
+	omap3_rom_rng_call = pdev->dev.platform_data;
+	if (!omap3_rom_rng_call) {
+		pr_err("omap3_rom_rng_call is NULL\n");
+		return -EINVAL;
+	}
+
+	setup_timer(&idle_timer, omap3_rom_rng_idle, 0);
+	rng_clk = clk_get(&pdev->dev, "ick");
+	if (IS_ERR(rng_clk)) {
+		pr_err("unable to get RNG clock\n");
+		return PTR_ERR(rng_clk);
+	}
+
+	/* Leave the RNG in reset state. */
+	clk_prepare_enable(rng_clk);
+	omap3_rom_rng_idle(0);
+
+	return hwrng_register(&omap3_rom_rng_ops);
+}
+
+static int omap3_rom_rng_remove(struct platform_device *pdev)
+{
+	hwrng_unregister(&omap3_rom_rng_ops);
+	clk_disable_unprepare(rng_clk);
+	clk_put(rng_clk);
+	return 0;
+}
+
+static struct platform_driver omap3_rom_rng_driver = {
+	.driver = {
+		.name		= "omap3-rom-rng",
+		.owner		= THIS_MODULE,
+	},
+	.probe		= omap3_rom_rng_probe,
+	.remove		= omap3_rom_rng_remove,
+};
+
+module_platform_driver(omap3_rom_rng_driver);
+
+MODULE_ALIAS("platform:omap3-rom-rng");
+MODULE_AUTHOR("Juha Yrjola");
+MODULE_AUTHOR("Pali Rohár <[email protected]>");
+MODULE_LICENSE("GPL");
Signature · 1 line
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

maintainer
#30 lore raw

Re: [PATCH v2 3/3] RX-51: Add support for OMAP3 ROM Random Number Generator

In reply to Pali Rohár
Quoted 3 lines · Pali Rohár

Adding this driver as platform device and only for RX-51 until somebody test if it working also on other OMAP3 HS devices and until there will be generic ARM way to deal with SMC calls.

Thanks I'll apply this with the patch #1 clock alias folded in into omap-for-v3.13/n900 branch.

Regards,

Tony

#24 lore raw

Re: [PATCH v2 2/3] hwrng: OMAP3 ROM Random Number Generator support

In reply to Tony Lindgren
Quoted 10 lines · Tony Lindgren
Quoted 5 lines · Pali Rohár

This driver provides kernel-side support for the Random Number Generator hardware found on OMAP34xx processors.

This driver comes from Maemo 2.6.28 kernel and was tested on Nokia RX-51. It is platform device because it needs board specific function for smc calls.

This one is should be merged via the hw_random patches seprately:

Patch applied. Thanks!

Signature · 3 lines
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
#25 lore raw

Re: [PATCH v2 2/3] hwrng: OMAP3 ROM Random Number Generator support

Quoted 9 lines · On Wednesday 16 October 2013 14:57:34 Herbert Xu wrote:
Quoted 8 lines · Tony Lindgren
Quoted 6 lines · Pali Rohár

This driver provides kernel-side support for the Random Number Generator hardware found on OMAP34xx processors.

This driver comes from Maemo 2.6.28 kernel and was tested on Nokia RX-51. It is platform device because it needs board specific function for smc calls.

Quoted 6 lines
Quoted 4 lines

This one is should be merged via the hw_random patches seprately:

Patch applied. Thanks!

Hello, I still do not see this patch (2/3) in linus tree. But patch 1/3 and 3/3 are already merged. So is there any problem?

Signature · 6 lines
Pali Rohár
[email protected]
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#26 lore raw

Re: [PATCH v2 2/3] hwrng: OMAP3 ROM Random Number Generator support

Quoted 13 lines · Pali Rohár
Quoted 12 lines · On Wednesday 16 October 2013 14:57:34 Herbert Xu wrote:
Quoted 11 lines · Tony Lindgren
Quoted 6 lines · Pali Rohár

This driver provides kernel-side support for the Random Number Generator hardware found on OMAP34xx processors.

This driver comes from Maemo 2.6.28 kernel and was tested on Nokia RX-51. It is platform device because it needs board specific function for smc calls.

This one is should be merged via the hw_random patches seprately:

Quoted 6 lines
Quoted 3 lines
Quoted 1 line

Patch applied. Thanks!

Hello, I still do not see this patch (2/3) in linus tree. But patch 1/3 and 3/3 are already merged. So is there any problem?

2/3 is still in my tree so when Linus pulls it it'll be there.

Cheers,

Signature · 7 lines
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#27 lore raw

Re: [PATCH v2 2/3] hwrng: OMAP3 ROM Random Number Generator support

Quoted 3 lines · On Tuesday 19 November 2013 03:14:09 Herbert Xu wrote:
Quoted 2 lines · Pali Rohár
Quoted 1 line · On Wednesday 16 October 2013 14:57:34 Herbert Xu wrote:

On Tue, Oct 08, 2013 at 12:04:09PM -0700, Tony Lindgren

Quoted 16 lines · wrote:
Quoted 16 lines
Quoted 15 lines
Quoted 5 lines · Pali Rohár
Quoted 4 lines

This driver provides kernel-side support for the Random Number Generator hardware found on OMAP34xx processors.

Quoted 8 lines
Quoted 3 lines

This driver comes from Maemo 2.6.28 kernel and was tested on Nokia RX-51. It is platform device because it needs board specific function for smc calls.

This one is should be merged via the hw_random patches seprately:

Patch applied. Thanks!

Quoted 7 lines
Quoted 3 lines

Hello, I still do not see this patch (2/3) in linus tree. But patch 1/3 and 3/3 are already merged. So is there any problem?

2/3 is still in my tree so when Linus pulls it it'll be there.

Cheers,

Now 3.13-rc1 is out [1], but your tree was not merged. Can you try to ping Linus what happened?

[1] - https://lkml.org/lkml/2013/11/22/439

Signature · 2 lines
Pali Rohár
[email protected]