From patchwork Mon May 23 16:20:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yendapally Reddy Dhananjaya Reddy X-Patchwork-Id: 9132117 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EF900607D8 for ; Mon, 23 May 2016 16:22:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E77D728240 for ; Mon, 23 May 2016 16:22:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DC02A28242; Mon, 23 May 2016 16:22:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7A6C92823A for ; Mon, 23 May 2016 16:22:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754012AbcEWQVl (ORCPT ); Mon, 23 May 2016 12:21:41 -0400 Received: from mail-pf0-f176.google.com ([209.85.192.176]:33691 "EHLO mail-pf0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754177AbcEWQVi (ORCPT ); Mon, 23 May 2016 12:21:38 -0400 Received: by mail-pf0-f176.google.com with SMTP id b124so9195459pfb.0 for ; Mon, 23 May 2016 09:21:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=YgaCeUWbrc/tuu73ipoWyS5i0oUBL6CcS7CoigDMYNE=; b=cM+XZx9XdA3R+n1p+u1KUrd1u+zn57jof1aN5ajsGgxcLPjJXjlCjuNN/6vJlQNRRx 8bm4Hg8wAEjPC3z+nVKbS00kfABCtb+48GehKr7n6Rvph2jQqj3Ygmk4C9TczAqyND1k SP1T5VEpVFBRFD3xe71SxBaJbEutg4Cyv3FdI= 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:in-reply-to :references; bh=YgaCeUWbrc/tuu73ipoWyS5i0oUBL6CcS7CoigDMYNE=; b=PIIcKmmE7oli1+JbBkVlRuqoHkreLUU4fC6TN2uCYPmUt9jjsmZCkFIOeKLzlD+nlz 58p1S8R252fiCh7zsuMMFgGGBSjUMn3e+5qb7RV6924phZUloyGXmkMnJDmn1uRTtoYn BIpFDRREqwLBpz3DDTyMTCY1F0VhG3sXr0hWnVkFoeOPyJMjm0hPoVyPEyBCE6EwM9XX zqY6Pg11hlTQrmYZUm89xypQkJ8JgMeh0cF6L1oNrcLoTwSneJZiHnGLBpcoGuZC+Pwe 4aIHyyHx/SJ2Ml363JPBHazTcfRC8UpmUXx95juedQJfPq3FagP2w386uyno2s3nZSG2 O7hQ== X-Gm-Message-State: ALyK8tJJnbmNRmX+W3o7diyZRziJMrj5SUKv2RW1hKFSPIUiEy1FZyJTgzq+Teill1fxcQFV X-Received: by 10.98.157.4 with SMTP id i4mr10814621pfd.31.1464020492075; Mon, 23 May 2016 09:21:32 -0700 (PDT) Received: from xl-rtp-02.rtp.broadcom.com ([216.31.219.19]) by smtp.gmail.com with ESMTPSA id u65sm47782512pfa.9.2016.05.23.09.21.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 May 2016 09:21:31 -0700 (PDT) From: Yendapally Reddy Dhananjaya Reddy To: Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Stephen Warren , Lee Jones , Eric Anholt , Russell King , Ray Jui , Scott Branden , Jon Mason , Matt Mackall , Herbert Xu , Daniel Thompson , Kieran Bingham , Pankaj Dev , Richard Weinberger , noltari@gmail.com, Joshua Henderson Cc: devicetree@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, linux-crypto@vger.kernel.org, Yendapally Reddy Dhananjaya Reddy Subject: [PATCH 2/4] hwrng: bcm2835: Support Broadcom NSP SoC rng Date: Mon, 23 May 2016 12:20:49 -0400 Message-Id: <1464020451-16520-3-git-send-email-yendapally.reddy@broadcom.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1464020451-16520-1-git-send-email-yendapally.reddy@broadcom.com> References: <1464020451-16520-1-git-send-email-yendapally.reddy@broadcom.com> Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This supports the random number generator available in NSP SoC. Masks the rng interrupt for NSP. Signed-off-by: Yendapally Reddy Dhananjaya Reddy Acked-by: Eric Anholt --- drivers/char/hw_random/Kconfig | 2 +- drivers/char/hw_random/bcm2835-rng.c | 34 ++++++++++++++++++++++++++++++---- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig index 67ee8b0..f8d1a2b 100644 --- a/drivers/char/hw_random/Kconfig +++ b/drivers/char/hw_random/Kconfig @@ -90,7 +90,7 @@ config HW_RANDOM_BCM63XX config HW_RANDOM_BCM2835 tristate "Broadcom BCM2835 Random Number Generator support" - depends on ARCH_BCM2835 + depends on ARCH_BCM2835 || ARCH_BCM_NSP default HW_RANDOM ---help--- This driver provides kernel-side support for the Random Number diff --git a/drivers/char/hw_random/bcm2835-rng.c b/drivers/char/hw_random/bcm2835-rng.c index 7192ec2..b1e8b78 100644 --- a/drivers/char/hw_random/bcm2835-rng.c +++ b/drivers/char/hw_random/bcm2835-rng.c @@ -19,6 +19,7 @@ #define RNG_CTRL 0x0 #define RNG_STATUS 0x4 #define RNG_DATA 0x8 +#define RNG_INT_MASK 0x10 /* enable rng */ #define RNG_RBGEN 0x1 @@ -26,6 +27,18 @@ /* the initial numbers generated are "less random" so will be discarded */ #define RNG_WARMUP_COUNT 0x40000 +#define RNG_INT_OFF 0x1 + +static void __init nsp_rng_init(void __iomem *base) +{ + u32 val; + + /* mask the interrupt */ + val = readl(base + RNG_INT_MASK); + val |= RNG_INT_OFF; + writel(val, base + RNG_INT_MASK); +} + static int bcm2835_rng_read(struct hwrng *rng, void *buf, size_t max, bool wait) { @@ -46,10 +59,18 @@ static struct hwrng bcm2835_rng_ops = { .read = bcm2835_rng_read, }; +static const struct of_device_id bcm2835_rng_of_match[] = { + { .compatible = "brcm,bcm2835-rng"}, + { .compatible = "brcm,bcm-nsp-rng", .data = nsp_rng_init}, + {}, +}; + static int bcm2835_rng_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; struct device_node *np = dev->of_node; + void (*rng_setup)(void __iomem *base); + const struct of_device_id *rng_id; void __iomem *rng_base; int err; @@ -61,6 +82,15 @@ static int bcm2835_rng_probe(struct platform_device *pdev) } bcm2835_rng_ops.priv = (unsigned long)rng_base; + rng_id = of_match_node(bcm2835_rng_of_match, np); + if (!rng_id) + return -EINVAL; + + /* Check for rng init function, execute it */ + rng_setup = rng_id->data; + if (rng_setup) + rng_setup(rng_base); + /* set warm-up count & enable */ __raw_writel(RNG_WARMUP_COUNT, rng_base + RNG_STATUS); __raw_writel(RNG_RBGEN, rng_base + RNG_CTRL); @@ -90,10 +120,6 @@ static int bcm2835_rng_remove(struct platform_device *pdev) return 0; } -static const struct of_device_id bcm2835_rng_of_match[] = { - { .compatible = "brcm,bcm2835-rng", }, - {}, -}; MODULE_DEVICE_TABLE(of, bcm2835_rng_of_match); static struct platform_driver bcm2835_rng_driver = {