From patchwork Wed Aug 17 15:35:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: PrasannaKumar Muralidharan X-Patchwork-Id: 660167 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3sDtvD0QDZz9t2H for ; Thu, 18 Aug 2016 01:49:12 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=Z0IZ7Cyl; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752870AbcHQPtK (ORCPT ); Wed, 17 Aug 2016 11:49:10 -0400 Received: from mail-pa0-f67.google.com ([209.85.220.67]:34450 "EHLO mail-pa0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752426AbcHQPtJ (ORCPT ); Wed, 17 Aug 2016 11:49:09 -0400 Received: by mail-pa0-f67.google.com with SMTP id hh10so7505375pac.1; Wed, 17 Aug 2016 08:49:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=ZqMREsahW8QyxkUb1N1Bgrfkq8mpFu/gfcTgohojK5E=; b=Z0IZ7CylrDhMcC7ueyMAKlg4ypXK3OaOMWHEcSqN3ddN+BPdskffMAqzxGKEu+plra KXN2Ce3rtlikx+7wy6qjcZfITu0iAIDHnzM6UgaxFVEOFaY3u2/ty9JHm3O9OPykdmei hFBur5JIlLBABHIC9hmeZFg2MrGBPDMA9kKFY+wZ4LMMkZkJdbgRgGtUbQhpUInLUQ5J +iidYp/SqUQvIo0jasyWzT8giAFM4PHYSWdSjvpDMx+fvnX4xfHJoqDemTGpbzeCTfz1 6llHyrMwHu+Hx4ixcSlIC0u+r90GgyYAli1aC8NR0z6cd4n7Q8P5mBTZ1fXRuVEmVvaE 7V5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=ZqMREsahW8QyxkUb1N1Bgrfkq8mpFu/gfcTgohojK5E=; b=Lf7McbyKqu38ZY14HkZ4x2UNY9edPYiWyXvSOwWODUoBpGDu+ROqvkrv3jPXKMUjX6 iP95rv+jstNUXkVzdJjyRONeis6FvdDMltkxgtdanaG6jsJ516WcTGIL4/7KG+q4RPd+ EuGEKgkKtmzUUNSp0YGTn8aMAzQje1lYHXZvRXNWKtzqO2xW2VkTwlMdu7DzbcVrqSUl 6ej2XkJH97YVmh9joEbECBqA0YMZawLxI34JA1aDRBUTSDuY8QlaJ/cFwsUd1mnuL5SO 4azDEBqsWH9dy4SQ7AONxSpGBHbBOdrv659ffLbTLCSENxnJ1wJUUqRtAowMZdr3upCa KXMQ== X-Gm-Message-State: AEkoouuHAH5AE9xqk15E9/ODxr0snzb8LN7C75AwwZO/BEm4C+AhMWO0u1o2RpWy+YuH3g== X-Received: by 10.66.49.137 with SMTP id u9mr76836722pan.72.1471448252276; Wed, 17 Aug 2016 08:37:32 -0700 (PDT) Received: from localhost.localdomain ([1.23.11.50]) by smtp.gmail.com with ESMTPSA id t80sm48162889pfj.38.2016.08.17.08.37.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 17 Aug 2016 08:37:31 -0700 (PDT) From: PrasannaKumar Muralidharan To: mpm@selenic.com, herbert@gondor.apana.org.au, robh+dt@kernel.org, mark.rutland@arm.com, ralf@linux-mips.org, davem@davemloft.net, geert@linux-m68k.org, akpm@linux-foundation.org, gregkh@linuxfoundation.org, mchehab@kernel.org, linux@roeck-us.net, boris.brezillon@free-electrons.com, harvey.hunt@imgtec.com, alex.smith@imgtec.com, daniel.thompson@linaro.org, lee.jones@linaro.org, f.fainelli@gmail.com, kieran@ksquared.org.uk, krzk@kernel.org, joshua.henderson@microchip.com, yendapally.reddy@broadcom.com, narmstrong@baylibre.com, wangkefeng.wang@huawei.com, chunkeey@googlemail.com, noltari@gmail.com, linus.walleij@linaro.org, pankaj.dev@st.com, mathieu.poirier@linaro.org, linux-crypto@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mips@linux-mips.org Cc: PrasannaKumar Muralidharan Subject: [PATCH] Add Ingenic JZ4780 hardware RNG driver Date: Wed, 17 Aug 2016 21:05:51 +0530 Message-Id: <1471448151-20850-1-git-send-email-prasannatsmkumar@gmail.com> X-Mailer: git-send-email 2.5.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org This patch adds support for hardware random number generator present in JZ4780 SoC. Signed-off-by: PrasannaKumar Muralidharan Acked-by: Rob Herring --- .../devicetree/bindings/rng/ingenic,jz4780-rng.txt | 12 +++ MAINTAINERS | 5 + arch/mips/boot/dts/ingenic/jz4780.dtsi | 7 +- drivers/char/hw_random/Kconfig | 14 +++ drivers/char/hw_random/Makefile | 1 + drivers/char/hw_random/jz4780-rng.c | 105 +++++++++++++++++++++ 6 files changed, 143 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/rng/ingenic,jz4780-rng.txt create mode 100644 drivers/char/hw_random/jz4780-rng.c diff --git a/Documentation/devicetree/bindings/rng/ingenic,jz4780-rng.txt b/Documentation/devicetree/bindings/rng/ingenic,jz4780-rng.txt new file mode 100644 index 0000000..03abf56 --- /dev/null +++ b/Documentation/devicetree/bindings/rng/ingenic,jz4780-rng.txt @@ -0,0 +1,12 @@ +Ingenic jz4780 RNG driver + +Required properties: +- compatible : Should be "ingenic,jz4780-rng" +- reg : Specifies base physical address and size of the registers. + +Example: + +rng: rng@100000D8 { + compatible = "ingenic,jz4780-rng"; + reg = <0x100000D8 0x8>; +}; diff --git a/MAINTAINERS b/MAINTAINERS index 08e9efe..c0c66eb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6002,6 +6002,11 @@ M: Zubair Lutfullah Kakakhel S: Maintained F: drivers/dma/dma-jz4780.c +INGENIC JZ4780 HW RNG Driver +M: PrasannaKumar Muralidharan +S: Maintained +F: drivers/char/hw_random/jz4780-rng.c + INTEGRITY MEASUREMENT ARCHITECTURE (IMA) M: Mimi Zohar M: Dmitry Kasatkin diff --git a/arch/mips/boot/dts/ingenic/jz4780.dtsi b/arch/mips/boot/dts/ingenic/jz4780.dtsi index b868b42..f11d139 100644 --- a/arch/mips/boot/dts/ingenic/jz4780.dtsi +++ b/arch/mips/boot/dts/ingenic/jz4780.dtsi @@ -36,7 +36,7 @@ cgu: jz4780-cgu@10000000 { compatible = "ingenic,jz4780-cgu"; - reg = <0x10000000 0x100>; + reg = <0x10000000 0xD8>; clocks = <&ext>, <&rtc>; clock-names = "ext", "rtc"; @@ -44,6 +44,11 @@ #clock-cells = <1>; }; + rng: jz4780-rng@100000D8 { + compatible = "ingenic,jz4780-rng"; + reg = <0x100000D8 0x8>; + }; + uart0: serial@10030000 { compatible = "ingenic,jz4780-uart"; reg = <0x10030000 0x100>; diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig index 56ad5a59..c336fe8 100644 --- a/drivers/char/hw_random/Kconfig +++ b/drivers/char/hw_random/Kconfig @@ -294,6 +294,20 @@ config HW_RANDOM_POWERNV If unsure, say Y. +config HW_RANDOM_JZ4780 + tristate "JZ4780 HW random number generator support" + depends on MACH_INGENIC + depends on HAS_IOMEM + default HW_RANDOM + ---help--- + This driver provides kernel-side support for the Random Number + Generator hardware found on JZ4780 SOCs. + + To compile this driver as a module, choose M here: the + module will be called jz4780-rng. + + If unsure, say Y. + config HW_RANDOM_EXYNOS tristate "EXYNOS HW random number generator support" depends on ARCH_EXYNOS || COMPILE_TEST diff --git a/drivers/char/hw_random/Makefile b/drivers/char/hw_random/Makefile index 04bb0b0..a155066 100644 --- a/drivers/char/hw_random/Makefile +++ b/drivers/char/hw_random/Makefile @@ -26,6 +26,7 @@ obj-$(CONFIG_HW_RANDOM_PSERIES) += pseries-rng.o obj-$(CONFIG_HW_RANDOM_POWERNV) += powernv-rng.o obj-$(CONFIG_HW_RANDOM_EXYNOS) += exynos-rng.o obj-$(CONFIG_HW_RANDOM_HISI) += hisi-rng.o +obj-$(CONFIG_HW_RANDOM_JZ4780) += jz4780-rng.o obj-$(CONFIG_HW_RANDOM_TPM) += tpm-rng.o obj-$(CONFIG_HW_RANDOM_BCM2835) += bcm2835-rng.o obj-$(CONFIG_HW_RANDOM_IPROC_RNG200) += iproc-rng200.o diff --git a/drivers/char/hw_random/jz4780-rng.c b/drivers/char/hw_random/jz4780-rng.c new file mode 100644 index 0000000..c9d2cde --- /dev/null +++ b/drivers/char/hw_random/jz4780-rng.c @@ -0,0 +1,105 @@ +/* + * jz4780-rng.c - Random Number Generator driver for J4780 + * + * Copyright 2016 (C) PrasannaKumar Muralidharan + * + * 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. + */ + +#include +#include +#include +#include +#include +#include +#include + +#define REG_RNG_CTRL 0x0 +#define REG_RNG_DATA 0x4 + +struct jz4780_rng { + struct device *dev; + struct hwrng rng; + void __iomem *mem; +}; + +static u32 jz4780_rng_readl(struct jz4780_rng *rng, u32 offset) +{ + return readl(rng->mem + offset); +} + +static void jz4780_rng_writel(struct jz4780_rng *rng, u32 val, u32 offset) +{ + writel(val, rng->mem + offset); +} + +static int jz4780_rng_read(struct hwrng *rng, void *buf, size_t max, bool wait) +{ + struct jz4780_rng *jz4780_rng = container_of(rng, struct jz4780_rng, + rng); + u32 *data = buf; + *data = jz4780_rng_readl(jz4780_rng, REG_RNG_DATA); + return 4; +} + +static int jz4780_rng_probe(struct platform_device *pdev) +{ + struct jz4780_rng *jz4780_rng; + struct resource *res; + resource_size_t size; + int ret; + + jz4780_rng = devm_kzalloc(&pdev->dev, sizeof(struct jz4780_rng), + GFP_KERNEL); + if (!jz4780_rng) + return -ENOMEM; + + jz4780_rng->dev = &pdev->dev; + jz4780_rng->rng.name = "jz4780"; + jz4780_rng->rng.read = jz4780_rng_read; + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + size = resource_size(res); + + jz4780_rng->mem = devm_ioremap(&pdev->dev, res->start, size); + if (IS_ERR(jz4780_rng->mem)) + return PTR_ERR(jz4780_rng->mem); + + platform_set_drvdata(pdev, jz4780_rng); + jz4780_rng_writel(jz4780_rng, 1, REG_RNG_CTRL); + ret = hwrng_register(&jz4780_rng->rng); + + return ret; +} + +static int jz4780_rng_remove(struct platform_device *pdev) +{ + struct jz4780_rng *jz4780_rng = platform_get_drvdata(pdev); + + jz4780_rng_writel(jz4780_rng, 0, REG_RNG_CTRL); + hwrng_unregister(&jz4780_rng->rng); + + return 0; +} + +static const struct of_device_id jz4780_rng_dt_match[] = { + { .compatible = "ingenic,jz4780-rng", }, + { }, +}; +MODULE_DEVICE_TABLE(of, jz4780_rng_dt_match); + +static struct platform_driver jz4780_rng_driver = { + .driver = { + .name = "jz4780-rng", + .of_match_table = jz4780_rng_dt_match, + }, + .probe = jz4780_rng_probe, + .remove = jz4780_rng_remove, +}; +module_platform_driver(jz4780_rng_driver); + +MODULE_DESCRIPTION("Ingenic JZ4780 H/W Random Number Generator driver"); +MODULE_AUTHOR("PrasannaKumar Muralidharan "); +MODULE_LICENSE("GPL");