From patchwork Thu Jun 21 15:17:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timur Tabi X-Patchwork-Id: 10480025 X-Patchwork-Delegate: agross@codeaurora.org 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 D933160230 for ; Thu, 21 Jun 2018 15:18:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C89D129166 for ; Thu, 21 Jun 2018 15:18:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BD62829172; Thu, 21 Jun 2018 15:18: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=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham 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 5AE6329166 for ; Thu, 21 Jun 2018 15:18:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933291AbeFUPSD (ORCPT ); Thu, 21 Jun 2018 11:18:03 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:55022 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933179AbeFUPSC (ORCPT ); Thu, 21 Jun 2018 11:18:02 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id B166E60B16; Thu, 21 Jun 2018 15:18:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1529594281; bh=C/ESjEBul0hkfDWrjUFBa9/oOtKwiJKB2Rs3smLPwg0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LSfxIdNlUZh4YoPh12Mu2kL8zfYMkcXqYY+Cev7HxZpG17+fzGg0OeCKrfpqOecxe cFrIa+R/MG1358ku9tKlUZM8Omhdxyhu9HWlBXWxGNwhjIhM+JtutzIOgzzoiBIfXB zWf+hJUjnneB2eCWJzHMEwBFDTIl65C7pnW2mV0o= Received: from timur-ubuntu.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: timur@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 9013C60376; Thu, 21 Jun 2018 15:18:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1529594281; bh=C/ESjEBul0hkfDWrjUFBa9/oOtKwiJKB2Rs3smLPwg0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LSfxIdNlUZh4YoPh12Mu2kL8zfYMkcXqYY+Cev7HxZpG17+fzGg0OeCKrfpqOecxe cFrIa+R/MG1358ku9tKlUZM8Omhdxyhu9HWlBXWxGNwhjIhM+JtutzIOgzzoiBIfXB zWf+hJUjnneB2eCWJzHMEwBFDTIl65C7pnW2mV0o= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 9013C60376 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=timur@codeaurora.org From: Timur Tabi To: linux-arm-kernel@lists.infradead.org, linux-crypto@vger.kernel.org, vinod.koul@linaro.org, Matt Mackall , swboyd@chromium.org, linux-arm-msm@vger.kernel.org, timur@kernel.org Cc: timur@codeaurora.org Subject: [PATCH 2/2] hwrng: msm: add ACPI support Date: Thu, 21 Jun 2018 10:17:56 -0500 Message-Id: <1529594276-12210-2-git-send-email-timur@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1529594276-12210-1-git-send-email-timur@codeaurora.org> References: <1529594276-12210-1-git-send-email-timur@codeaurora.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add support for probing on ACPI systems, with ACPI HID QCOM8160. On ACPI systems, clocks are always enabled, the PRNG should already be enabled, and the register region is read-only. The driver only verifies that the hardware is already enabled never tries to disable or configure it. Signed-off-by: Timur Tabi --- drivers/char/hw_random/msm-rng.c | 40 ++++++++++++++++++++++++++++++++++------ 1 file changed, 34 insertions(+), 6 deletions(-) diff --git a/drivers/char/hw_random/msm-rng.c b/drivers/char/hw_random/msm-rng.c index 44580588b938..f34713d23d77 100644 --- a/drivers/char/hw_random/msm-rng.c +++ b/drivers/char/hw_random/msm-rng.c @@ -20,6 +20,7 @@ #include #include #include +#include /* Device specific register offsets */ #define PRNG_DATA_OUT 0x0000 @@ -186,16 +187,32 @@ static int msm_rng_probe(struct platform_device *pdev) 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; spin_lock_init(&rng->lock); + /* + * ACPI systems have v2 hardware. The clocks are always enabled, + * the PRNG register space is read-only, and the PRNG should + * already be enabled. + */ + if (has_acpi_companion(&pdev->dev)) { + u32 val; + + val = readl(rng->base + PRNG_CONFIG); + if (!(val & PRNG_CONFIG_HW_ENABLE)) { + dev_err(&pdev->dev, "device is not enabled\n"); + return -ENODEV; + } + } else { + rng->clk = devm_clk_get(&pdev->dev, "core"); + if (IS_ERR(rng->clk)) + return PTR_ERR(rng->clk); + + rng->hwrng.init = msm_rng_init; + rng->hwrng.cleanup = msm_rng_cleanup; + } + ret = devm_hwrng_register(&pdev->dev, &rng->hwrng); if (ret) { dev_err(&pdev->dev, "failed to register hwrng\n"); @@ -211,11 +228,22 @@ static int msm_rng_probe(struct platform_device *pdev) }; MODULE_DEVICE_TABLE(of, msm_rng_of_match); +#if IS_ENABLED(CONFIG_ACPI) +static const struct acpi_device_id msm_rng_acpi_match[] = { + { + .id = "QCOM8160", /* v2 PRNG */ + }, + {} +}; +MODULE_DEVICE_TABLE(acpi, msm_rng_acpi_match); +#endif + 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), + .acpi_match_table = ACPI_PTR(msm_rng_acpi_match), } }; module_platform_driver(msm_rng_driver);