From patchwork Mon Jun 18 14:12:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinod Koul X-Patchwork-Id: 10471597 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 2EFBA60532 for ; Mon, 18 Jun 2018 14:14:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 22275289F8 for ; Mon, 18 Jun 2018 14:14:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1583928A17; Mon, 18 Jun 2018 14:14:40 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 1673C289F8 for ; Mon, 18 Jun 2018 14:14:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934861AbeFRONe (ORCPT ); Mon, 18 Jun 2018 10:13:34 -0400 Received: from mail-pg0-f66.google.com ([74.125.83.66]:43976 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934845AbeFRONb (ORCPT ); Mon, 18 Jun 2018 10:13:31 -0400 Received: by mail-pg0-f66.google.com with SMTP id a14-v6so7594103pgw.10 for ; Mon, 18 Jun 2018 07:13:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=UUJzwfgpvKs1LpNf7zUfObyZZsWD9zUmBur3t7sFcAo=; b=KFYwkS0FV/wf8gCkPEVCMxGpBZ0srhTzLP4tAb4AqBl05Yw1otuuJK7WmbAQZKdTul gu47WCGk7DrNEyYKFrecjRhyohbJhA3yaG1a54MXC3H2lCvOh6lgwsrwZdodRMK7XDWO 7EZwbPQZQs7w/hWsaEkEDZjmUIZWXYaf+8gqM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=UUJzwfgpvKs1LpNf7zUfObyZZsWD9zUmBur3t7sFcAo=; b=mIbHFk/f3IeRkSEHcT2COFml3PJEfNRp0dsAcxw/xH4Ua2uXwzsp9paQ5EtVM9TStE NhW2NulAocWl/Kn05VOBM/s03YmuJLlATx80nF2fu9Uflfw3a3hvhyw26/Iz6c1G1GuA hX6iMTNlRChpE3jGWXAqmfig1EbjX9sADT91iyyqnAe1g1M09u3DTcG4eNVPnBZXslyY 5F5hGi5jIKD4e+BuOtxEHx2Mu5cvzf/bBBN2L9miu/0lnrqYoMwuXRvF7HzQYLY/JK0V +jR3CNitopmmh2Sz2FCAzaBeKei5AFUuAsT04oN92/+LPa0VrBhzwtd2WvyHTWJcJw0y XAeg== X-Gm-Message-State: APt69E1qn6zaf2wjQ/ThDZ4pOZYjWr40MSa0lh3VIFITiDgmPNCDp0EW fYb8Gwdh2WNdqKSdR1JUPAdWfou2KHM= X-Google-Smtp-Source: ADUXVKLma+ohpFmtuM805xz1PF6/l70VFA4Kbu4hKlssjmC/SegENUTf4IkzJvbU2eDYwX6vfMi1eQ== X-Received: by 2002:a62:d09:: with SMTP id v9-v6mr13565715pfi.163.1529331211173; Mon, 18 Jun 2018 07:13:31 -0700 (PDT) Received: from localhost.localdomain ([27.59.118.133]) by smtp.gmail.com with ESMTPSA id t17-v6sm25813339pfj.75.2018.06.18.07.13.28 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 18 Jun 2018 07:13:30 -0700 (PDT) From: Vinod Koul X-Google-Original-From: Vinod Koul To: linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Matt Mackall , Herbert Xu , Arnd Bergmann , Greg Kroah-Hartman , linux-arm-msm@vger.kernel.org, Vinod Koul Subject: [PATCH 3/3] hwrng: msm - Add support for prng v2 Date: Mon, 18 Jun 2018 19:42:59 +0530 Message-Id: <20180618141259.23141-4-vkoul@kernel.org> X-Mailer: git-send-email 2.14.4 In-Reply-To: <20180618141259.23141-1-vkoul@kernel.org> References: <20180618141259.23141-1-vkoul@kernel.org> 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 Qcom 8996 and later chips support prng v2 where we need to only implement .read callback for hwrng. Add a new table for v2 which supports this and get version required for driver data. Signed-off-by: Vinod Koul --- drivers/char/hw_random/msm-rng.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/char/hw_random/msm-rng.c b/drivers/char/hw_random/msm-rng.c index 7644474035e5..3f509072a6c6 100644 --- a/drivers/char/hw_random/msm-rng.c +++ b/drivers/char/hw_random/msm-rng.c @@ -17,6 +17,7 @@ #include #include #include +#include #include /* Device specific register offsets */ @@ -132,10 +133,16 @@ static struct hwrng msm_rng = { .read = msm_rng_read, }; +static struct hwrng msm_rng_v2 = { + .name = KBUILD_MODNAME, + .read = msm_rng_read, +}; + static int msm_rng_probe(struct platform_device *pdev) { struct resource *res; struct msm_rng *rng; + unsigned int version; int ret; rng = devm_kzalloc(&pdev->dev, sizeof(*rng), GFP_KERNEL); @@ -154,6 +161,9 @@ static int msm_rng_probe(struct platform_device *pdev) return PTR_ERR(rng->clk); rng->hwrng = &msm_rng; + version = (unsigned long)of_device_get_match_data(&pdev->dev); + if (version) + rng->hwrng = &msm_rng_v2; rng->hwrng->priv = (unsigned long)rng; ret = devm_hwrng_register(&pdev->dev, rng->hwrng); @@ -166,7 +176,8 @@ static int msm_rng_probe(struct platform_device *pdev) } static const struct of_device_id msm_rng_of_match[] = { - { .compatible = "qcom,prng", }, + { .compatible = "qcom,prng", .data = (void *)0}, + { .compatible = "qcom,prng-v2", .data = (void *)1}, {} }; MODULE_DEVICE_TABLE(of, msm_rng_of_match);