From patchwork Tue Jul 3 06:04:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinod Koul X-Patchwork-Id: 141567 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp764197ljj; Mon, 2 Jul 2018 23:05:18 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfF6XnHPUEnWEl361I79Yd9CFSZUqOeCL66gSURl2nHBARip0DL5wN7JJdu5ktjWaCucT4F X-Received: by 2002:a62:57dc:: with SMTP id i89-v6mr16278881pfj.65.1530597917988; Mon, 02 Jul 2018 23:05:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530597917; cv=none; d=google.com; s=arc-20160816; b=T4ILJmr/E6O+XMX97yHccpVNSSVaJlNWl9yiHagp1ahwnxUEsLgaNIImxbT7jgmuau nhrmvhGCsanCMohTuQ8erMBPUuypZXtx6bcsSQ76xqIELfVeB+1L1D13hK7IaxkMNrFr SsPwFv7tLNGNyE8Y2nwT2MMz/4uGnQy0Qlp2bY3ooLuF2M4zAjoTSA6cBl+MgUa+Z1RY zJavoNNfp0/tYgxs07t5jOfVCdHmPpiFDT9KPOPbteXWTU4I732JSt9NxVlm3+CbOt// NTUCk/N6nYEEcvdlIhWHbtPt4Z+yHFqunl4HcSO/TljsgGNCT1OfjkqYCrgYFJCDWw7d leKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=6I+FiAe//3lBshdXMVjtJc6Ltbq78qHQSFfFnEaFLFE=; b=vBw92JL0c3GhC5MeXn9xL7P9dqMBNW2BcKtjqCAw8PVeExxsY8qGHjsrjtxmLI35MS hyG8jm2ilPQGv5WVZPYEe1oXfrGNwgFNge4lrzv/SZhI+BMCGb9qYmEVR8FiM1MYPybw 3ZtzZmcGBIYUuPKTEaUnbfuNgr44YjmhW6PVN+1Wm7vALHLH6DfldpNGod4jm8k9/m1U z63zBtFonI29vZxI+AxbOde8STbWKtwJwKRRQVBTILg/fU8eEL0t3tkRUfm3Gg9epopg x8hB6TvYf3g/hjNo4OT+NYTKgHlxh4vOyQqj9rj/b+RFlPcx+ylVBXntcLGTN9J7O31h d2QA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=0UNsa8Vs; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t9-v6si342313pgo.330.2018.07.02.23.05.17; Mon, 02 Jul 2018 23:05:17 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=0UNsa8Vs; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754253AbeGCGFO (ORCPT + 1 other); Tue, 3 Jul 2018 02:05:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:48710 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753789AbeGCGFM (ORCPT ); Tue, 3 Jul 2018 02:05:12 -0400 Received: from localhost.localdomain (unknown [171.61.87.109]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D4EA924462; Tue, 3 Jul 2018 06:05:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1530597911; bh=6+OBQNvRg3jErPCKQ+HAePMkltPA+PT3CAaXbXhfc24=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0UNsa8Vsv+VyEZi7Zo3w7ZXofvFKNsWq3mD3C4QQUEFEeNN20CpR2kjWtMpBFpBuP hChUv8nNF3zZYIFXbiBGgMFDZwObWP+aKTLYBW2MAAS30Yk2LjD/S9sgPN/SUS+GDJ 8Yd49017lbCYLc6ke5Ms+csh0gQ/1Zozjayuh0XE= From: Vinod Koul To: linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Bjorn Andersson , Matt Mackall , Herbert Xu , Arnd Bergmann , Greg Kroah-Hartman , linux-arm-msm@vger.kernel.org, Stephen Boyd , Timur Tabi , Vinod Koul Subject: [PATCH v3 1/6] hwrng: remove msm hw_random driver Date: Tue, 3 Jul 2018 11:34:29 +0530 Message-Id: <20180703060434.19293-2-vkoul@kernel.org> X-Mailer: git-send-email 2.14.4 In-Reply-To: <20180703060434.19293-1-vkoul@kernel.org> References: <20180703060434.19293-1-vkoul@kernel.org> Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org This driver is for a psedo-rng so should not be added in hwrng. Remove it so that it's replacement can be added. Signed-off-by: Vinod Koul --- drivers/char/hw_random/Kconfig | 13 --- drivers/char/hw_random/Makefile | 1 - drivers/char/hw_random/msm-rng.c | 183 --------------------------------------- 3 files changed, 197 deletions(-) delete mode 100644 drivers/char/hw_random/msm-rng.c -- 2.14.4 diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig index c34b257d852d..dac895dc01b9 100644 --- a/drivers/char/hw_random/Kconfig +++ b/drivers/char/hw_random/Kconfig @@ -307,19 +307,6 @@ config HW_RANDOM_HISI If unsure, say Y. -config HW_RANDOM_MSM - tristate "Qualcomm SoCs Random Number Generator support" - depends on HW_RANDOM && ARCH_QCOM - default HW_RANDOM - ---help--- - This driver provides kernel-side support for the Random Number - Generator hardware found on Qualcomm SoCs. - - To compile this driver as a module, choose M here. the - module will be called msm-rng. - - If unsure, say Y. - config HW_RANDOM_ST tristate "ST Microelectronics HW Random Number Generator support" depends on HW_RANDOM && ARCH_STI diff --git a/drivers/char/hw_random/Makefile b/drivers/char/hw_random/Makefile index 533e913c93d1..e35ec3ce3a20 100644 --- a/drivers/char/hw_random/Makefile +++ b/drivers/char/hw_random/Makefile @@ -29,7 +29,6 @@ obj-$(CONFIG_HW_RANDOM_POWERNV) += powernv-rng.o obj-$(CONFIG_HW_RANDOM_HISI) += hisi-rng.o obj-$(CONFIG_HW_RANDOM_BCM2835) += bcm2835-rng.o obj-$(CONFIG_HW_RANDOM_IPROC_RNG200) += iproc-rng200.o -obj-$(CONFIG_HW_RANDOM_MSM) += msm-rng.o obj-$(CONFIG_HW_RANDOM_ST) += st-rng.o obj-$(CONFIG_HW_RANDOM_XGENE) += xgene-rng.o obj-$(CONFIG_HW_RANDOM_STM32) += stm32-rng.o diff --git a/drivers/char/hw_random/msm-rng.c b/drivers/char/hw_random/msm-rng.c deleted file mode 100644 index 841fee845ec9..000000000000 --- a/drivers/char/hw_random/msm-rng.c +++ /dev/null @@ -1,183 +0,0 @@ -/* - * Copyright (c) 2011-2013, The Linux Foundation. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 and - * only version 2 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - */ -#include -#include -#include -#include -#include -#include -#include - -/* Device specific register offsets */ -#define PRNG_DATA_OUT 0x0000 -#define PRNG_STATUS 0x0004 -#define PRNG_LFSR_CFG 0x0100 -#define PRNG_CONFIG 0x0104 - -/* Device specific register masks and config values */ -#define PRNG_LFSR_CFG_MASK 0x0000ffff -#define PRNG_LFSR_CFG_CLOCKS 0x0000dddd -#define PRNG_CONFIG_HW_ENABLE BIT(1) -#define PRNG_STATUS_DATA_AVAIL BIT(0) - -#define MAX_HW_FIFO_DEPTH 16 -#define MAX_HW_FIFO_SIZE (MAX_HW_FIFO_DEPTH * 4) -#define WORD_SZ 4 - -struct msm_rng { - void __iomem *base; - struct clk *clk; - struct hwrng hwrng; -}; - -#define to_msm_rng(p) container_of(p, struct msm_rng, hwrng) - -static int msm_rng_enable(struct hwrng *hwrng, int enable) -{ - struct msm_rng *rng = to_msm_rng(hwrng); - u32 val; - int ret; - - ret = clk_prepare_enable(rng->clk); - if (ret) - return ret; - - if (enable) { - /* Enable PRNG only if it is not already enabled */ - val = readl_relaxed(rng->base + PRNG_CONFIG); - if (val & PRNG_CONFIG_HW_ENABLE) - goto already_enabled; - - val = readl_relaxed(rng->base + PRNG_LFSR_CFG); - val &= ~PRNG_LFSR_CFG_MASK; - val |= PRNG_LFSR_CFG_CLOCKS; - writel(val, rng->base + PRNG_LFSR_CFG); - - val = readl_relaxed(rng->base + PRNG_CONFIG); - val |= PRNG_CONFIG_HW_ENABLE; - writel(val, rng->base + PRNG_CONFIG); - } else { - val = readl_relaxed(rng->base + PRNG_CONFIG); - val &= ~PRNG_CONFIG_HW_ENABLE; - writel(val, rng->base + PRNG_CONFIG); - } - -already_enabled: - clk_disable_unprepare(rng->clk); - return 0; -} - -static int msm_rng_read(struct hwrng *hwrng, void *data, size_t max, bool wait) -{ - struct msm_rng *rng = to_msm_rng(hwrng); - size_t currsize = 0; - u32 *retdata = data; - size_t maxsize; - int ret; - u32 val; - - /* calculate max size bytes to transfer back to caller */ - maxsize = min_t(size_t, MAX_HW_FIFO_SIZE, max); - - ret = clk_prepare_enable(rng->clk); - if (ret) - return ret; - - /* read random data from hardware */ - do { - val = readl_relaxed(rng->base + PRNG_STATUS); - if (!(val & PRNG_STATUS_DATA_AVAIL)) - break; - - val = readl_relaxed(rng->base + PRNG_DATA_OUT); - if (!val) - break; - - *retdata++ = val; - currsize += WORD_SZ; - - /* make sure we stay on 32bit boundary */ - if ((maxsize - currsize) < WORD_SZ) - break; - } while (currsize < maxsize); - - clk_disable_unprepare(rng->clk); - - return currsize; -} - -static int msm_rng_init(struct hwrng *hwrng) -{ - return msm_rng_enable(hwrng, 1); -} - -static void msm_rng_cleanup(struct hwrng *hwrng) -{ - msm_rng_enable(hwrng, 0); -} - -static int msm_rng_probe(struct platform_device *pdev) -{ - struct resource *res; - struct msm_rng *rng; - int ret; - - rng = devm_kzalloc(&pdev->dev, sizeof(*rng), GFP_KERNEL); - if (!rng) - return -ENOMEM; - - platform_set_drvdata(pdev, rng); - - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - rng->base = devm_ioremap_resource(&pdev->dev, res); - if (IS_ERR(rng->base)) - return PTR_ERR(rng->base); - - rng->clk = devm_clk_get(&pdev->dev, "core"); - if (IS_ERR(rng->clk)) - return PTR_ERR(rng->clk); - - rng->hwrng.name = KBUILD_MODNAME, - rng->hwrng.init = msm_rng_init, - rng->hwrng.cleanup = msm_rng_cleanup, - rng->hwrng.read = msm_rng_read, - - ret = devm_hwrng_register(&pdev->dev, &rng->hwrng); - if (ret) { - dev_err(&pdev->dev, "failed to register hwrng\n"); - return ret; - } - - return 0; -} - -static const struct of_device_id msm_rng_of_match[] = { - { .compatible = "qcom,prng", }, - {} -}; -MODULE_DEVICE_TABLE(of, msm_rng_of_match); - -static struct platform_driver msm_rng_driver = { - .probe = msm_rng_probe, - .driver = { - .name = KBUILD_MODNAME, - .of_match_table = of_match_ptr(msm_rng_of_match), - } -}; -module_platform_driver(msm_rng_driver); - -MODULE_ALIAS("platform:" KBUILD_MODNAME); -MODULE_AUTHOR("The Linux Foundation"); -MODULE_DESCRIPTION("Qualcomm MSM random number generator driver"); -MODULE_LICENSE("GPL v2"); From patchwork Tue Jul 3 06:04:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinod Koul X-Patchwork-Id: 141564 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp765433ljj; Mon, 2 Jul 2018 23:06:20 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeE1ribBHekVgq7XBNM2ojoIR50Ym4CHUdRenBmxhNBCg0iLxGKvfclqAOPRNpS5Lwnvd7u X-Received: by 2002:a62:d544:: with SMTP id d65-v6mr7713937pfg.107.1530597980449; Mon, 02 Jul 2018 23:06:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530597980; cv=none; d=google.com; s=arc-20160816; b=wIAZhHKIyZ5622qY6mzLx9bbiE/HuwiW0zXPeUiMlKzXrOQyD6+FArEZ0mZwsC6rdr Z0u333qC0ApHl3X5LkWcH+1F6zAEuhFa5en1SmY40+NLrmfCxdqFh+apFGcTrK+jID+m W4Mx2BsguwhA7/oflfjNJMmTYKpA8XOMnYWePXo8lvM/opZJo9KaikQrZyvaDXbeDQTw Nn10HKGJIcM4t0YZ3CaA5zVYUWYoW/HpVRti/FD8vgaRyAXfMyqkEtzZFx+Y3JjfATbq PS898eDlI8Brrkgk0ss+8pE4xeAM8I0U+8+TesVNMLR6aYECSW0ZNm8aTGSFw4XUygGe V1Lw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=dA/j/tFoxxP3yrRqCRqNVjBBipgMx8wg3552GT0Mq4M=; b=TculW6V9QxIgJ4TRc80fObO7EEZZmCiFwA7WpZobXs0DEjpmWsIFaUk1MPCbq0I0tz KRLOliaZ/CmMCJMfBp7xI42+6vUaBi4xNJKC0sULUa6tl8VX5Qv8avpt2MMExbjt6IHz Ptd4R1H0L8mWLcf5S+tEePgC3rbj+wph50Wg2aRuC+ks/0F85W4maAmXyLVb5VcknGZ9 Y3OCgkdkhMty+IKfYInBFOiGN49sTzJi8c4irlTJYNLJ1Q9WRPM0Ng8gqvRqqRfSJHil LGLYTsdohLXbjddTn2kYVew2KqPQ/f8Ez6K/s4V6XxuGmZ/GDMen/PyB3PRKWOK4iiCX CemA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="aw/ZFIXt"; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h189-v6si349825pge.66.2018.07.02.23.06.20; Mon, 02 Jul 2018 23:06:20 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="aw/ZFIXt"; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932831AbeGCGGS (ORCPT + 1 other); Tue, 3 Jul 2018 02:06:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:48776 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754291AbeGCGFP (ORCPT ); Tue, 3 Jul 2018 02:05:15 -0400 Received: from localhost.localdomain (unknown [171.61.87.109]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 55A6C2246B; Tue, 3 Jul 2018 06:05:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1530597915; bh=Y6e/3n+guSDc62R6uIPH9agVkOQjWphtXjwR8dgS8bw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aw/ZFIXthVKFpCx6O/mLP9BRiURxoUiJV0ulPN9y0F3LkhmigbHwXqGdqr/f529lU xOmJhLzT/V5Jt5gkRdbGD+so4jHkgSMEzdhLASvgCQuFi3/w47tuvLBojZFdrl0K+6 639c9Kl1JDo2wbXETY2o+aiu61D23IdAf1PVSb2g= From: Vinod Koul To: linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Bjorn Andersson , Matt Mackall , Herbert Xu , Arnd Bergmann , Greg Kroah-Hartman , linux-arm-msm@vger.kernel.org, Stephen Boyd , Timur Tabi , Vinod Koul Subject: [PATCH v3 2/6] dt-bindings: crypto: Move prng binding to crypto Date: Tue, 3 Jul 2018 11:34:30 +0530 Message-Id: <20180703060434.19293-3-vkoul@kernel.org> X-Mailer: git-send-email 2.14.4 In-Reply-To: <20180703060434.19293-1-vkoul@kernel.org> References: <20180703060434.19293-1-vkoul@kernel.org> Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org Now that we are adding new driver for prng in crypto, move the binding as well. Signed-off-by: Vinod Koul --- Documentation/devicetree/bindings/{rng => crypto}/qcom,prng.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Documentation/devicetree/bindings/{rng => crypto}/qcom,prng.txt (100%) -- 2.14.4 diff --git a/Documentation/devicetree/bindings/rng/qcom,prng.txt b/Documentation/devicetree/bindings/crypto/qcom,prng.txt similarity index 100% rename from Documentation/devicetree/bindings/rng/qcom,prng.txt rename to Documentation/devicetree/bindings/crypto/qcom,prng.txt