From patchwork Tue Sep 3 21:22:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brian Masney X-Patchwork-Id: 13789317 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5DEDB126BE4 for ; Tue, 3 Sep 2024 21:22:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725398570; cv=none; b=b1nQEqgRSiLSMS7uTMRdwK8qyy883FA/XQLQGCl/MTi4HXOBh/G47g27ldqTyghwmlN8T8sLEM4JZZbeAz6jn/Gy4nOKfC8n0ANmYUjgql1GIGpzWt/9lOd4/rn3IYX4Cliqong0qFYvo3jmNAFq49HZWffi60Zt1/qNAJhhAcE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725398570; c=relaxed/simple; bh=XeVESrItEVM4R9ipyaNeknfhuHOQ4dILrBWsO0yCW3s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-type; b=p3aaOA0vjoKOZ5aYCLqnZS+uS2fPAviUPO49YsnNNsDdhJaVyskULxX2d26IwNrrHfWjpk1q/iZGJoVmfv7SWGgMPL1MnaXPv6znWdCIdx9hS4qxTADkRT6pw5tbs6sq+QSeX1eTwRbImIrJG3kG6q5SPTguZt5rphdBFlhUq1o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=SQ4Td4DS; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="SQ4Td4DS" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1725398568; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5OaxE+qf4J1jZnk8c8Xd2x+KJy3fbwff+kIsNtq2Opo=; b=SQ4Td4DSIcu5BDsv8KOsgG2sUCsevTeMQZodja7MEKK/vOPh4x0m4CZORZbKpCq2SWTbE/ ucODV1iOTzDDJYNQCy8G5/NfjSYJnRosS99aWN5TSyeVL74CsbpiP/N6BwsWZFqZsTvQdU WhKluPPaD9W13EwbzdqZRL/Aj/kCSbE= Received: from mail-oa1-f72.google.com (mail-oa1-f72.google.com [209.85.160.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-382-Sp-iZDDzMt6_WeYb7zNo-A-1; Tue, 03 Sep 2024 17:22:47 -0400 X-MC-Unique: Sp-iZDDzMt6_WeYb7zNo-A-1 Received: by mail-oa1-f72.google.com with SMTP id 586e51a60fabf-277f1e27d63so3955030fac.0 for ; Tue, 03 Sep 2024 14:22:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725398566; x=1726003366; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5OaxE+qf4J1jZnk8c8Xd2x+KJy3fbwff+kIsNtq2Opo=; b=jyRMzt1E6QG2aQddJlYWUlMohCjdzJejRCqSw1o+1JUy8ZNv0KFNcMNL2BuGinr8ey Yucps+exNtIWTiz4x1taeWHWqrdRfyoYUNEhytvBOox2ELpglRZ0c+eS2IEI7dkzmsla 97dOc9/fFM6mrFhprPi/nZTb2QKT8+Y4NC/j7nZEoGQFYBr2n4gDIHRhAKycWExpTMbY BaW0NUgpNHBgdX4dqKYvLXuKjF8iKnA5cvZucwS5cFUyOUhqQDFnNMpOL/FBfK+Ux2Q2 Mx9reXgJ/+jlcadk493uE/WhYlXz4vGHa1QZOKzzKLJbhLoJpW70mgb0sz68CrsigwFR 7D+g== X-Forwarded-Encrypted: i=1; AJvYcCWuVUHNofYD8NXTEm7HRe4LRzRNawXXnOMvYzcgZRQSwAMOe5V9F3ybBKZ/31tWFflQa8zdegJ8jLBihxdk@vger.kernel.org X-Gm-Message-State: AOJu0YxMsAfONx53+HGMVnq3lTxzL0OvAXSzDm5orQe0prciNFIwLlfK imNK2oBcBfJvlCKMBrxaT9VvHbYPlO92lINzjG5RS1T9jNye3c7cDPCQLAl43s31XZzUe+fkVcX qKbGOVW1BvTl5w138yPcaRXez2R8xMyPw09x5LLXqfJESb4WruyClzcrw4XT2jFM= X-Received: by 2002:a05:6870:331e:b0:25e:7a1:ea8f with SMTP id 586e51a60fabf-277d06c897amr10603217fac.47.1725398566446; Tue, 03 Sep 2024 14:22:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG5djy4RfXuBi03LceJtw15luMRH4Faxo5Y9BNdPLILRJ8AbHm4nzFztUWK6JYZrH61sMi09w== X-Received: by 2002:a05:6870:331e:b0:25e:7a1:ea8f with SMTP id 586e51a60fabf-277d06c897amr10603204fac.47.1725398566139; Tue, 03 Sep 2024 14:22:46 -0700 (PDT) Received: from x1.redhat.com (c-98-219-206-88.hsd1.pa.comcast.net. [98.219.206.88]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7a806bfb8c9sm564737185a.25.2024.09.03.14.22.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Sep 2024 14:22:44 -0700 (PDT) From: Brian Masney To: herbert@gondor.apana.org.au Cc: davem@davemloft.net, quic_omprsing@quicinc.com, neil.armstrong@linaro.org, quic_bjorande@quicinc.com, linux-arm-msm@vger.kernel.org, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, ernesto.mnd.fernandez@gmail.com, quic_jhugo@quicinc.com Subject: [PATCH v2 1/2] crypto: qcom-rng: fix support for ACPI-based systems Date: Tue, 3 Sep 2024 17:22:19 -0400 Message-ID: <20240903212230.707376-2-bmasney@redhat.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240903212230.707376-1-bmasney@redhat.com> References: <20240903212230.707376-1-bmasney@redhat.com> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-type: text/plain The qcom-rng driver supports both ACPI and device tree based systems. ACPI support was broken when the hw_random interface support was added. Let's go ahead and fix this by adding a check for has_acpi_companion(). This fix was boot tested on a Qualcomm Amberwing server. Fixes: f29cd5bb64c2 ("crypto: qcom-rng - Add hw_random interface support") Reported-by: Ernesto A. Fernández Closes: https://lore.kernel.org/linux-arm-msm/20240828184019.GA21181@eaf/ Cc: stable@vger.kernel.org Signed-off-by: Brian Masney --- Note: I looked at updating the struct qcom_rng_acpi_match to have driver_data point to &qcom_prng_ee_of_data, however that won't work since struct acpi_device_id has a driver_data member of type kernel_ulong_t. struct of_device_id has the data member set to type const void *. As I get available time, I'll look to see if it's possible to migrate struct acpi_device_id.driver_data from a kernel_ulong_t to a const void * to match what's done in struct of_device_id. That will allow removing the has_acpi_companion() check in the future. I suspect that change is not going to be trivial though. drivers/crypto/qcom-rng.c | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/drivers/crypto/qcom-rng.c b/drivers/crypto/qcom-rng.c index c670d7d0c11e..7ba978f0ce8b 100644 --- a/drivers/crypto/qcom-rng.c +++ b/drivers/crypto/qcom-rng.c @@ -176,6 +176,21 @@ static struct rng_alg qcom_rng_alg = { } }; +static struct qcom_rng_of_data qcom_prng_of_data = { + .skip_init = false, + .hwrng_support = false, +}; + +static struct qcom_rng_of_data qcom_prng_ee_of_data = { + .skip_init = true, + .hwrng_support = false, +}; + +static struct qcom_rng_of_data qcom_trng_of_data = { + .skip_init = true, + .hwrng_support = true, +}; + static int qcom_rng_probe(struct platform_device *pdev) { struct qcom_rng *rng; @@ -196,7 +211,10 @@ static int qcom_rng_probe(struct platform_device *pdev) if (IS_ERR(rng->clk)) return PTR_ERR(rng->clk); - rng->of_data = (struct qcom_rng_of_data *)of_device_get_match_data(&pdev->dev); + if (has_acpi_companion(&pdev->dev)) + rng->of_data = &qcom_prng_ee_of_data; + else + rng->of_data = (struct qcom_rng_of_data *)of_device_get_match_data(&pdev->dev); qcom_rng_dev = rng; ret = crypto_register_rng(&qcom_rng_alg); @@ -231,21 +249,6 @@ static void qcom_rng_remove(struct platform_device *pdev) qcom_rng_dev = NULL; } -static struct qcom_rng_of_data qcom_prng_of_data = { - .skip_init = false, - .hwrng_support = false, -}; - -static struct qcom_rng_of_data qcom_prng_ee_of_data = { - .skip_init = true, - .hwrng_support = false, -}; - -static struct qcom_rng_of_data qcom_trng_of_data = { - .skip_init = true, - .hwrng_support = true, -}; - static const struct acpi_device_id __maybe_unused qcom_rng_acpi_match[] = { { .id = "QCOM8160", .driver_data = 1 }, {} From patchwork Tue Sep 3 21:22:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Masney X-Patchwork-Id: 13789318 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0CC1A190482 for ; Tue, 3 Sep 2024 21:22:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725398573; cv=none; b=BVm8+3TS48HMmmVghPktNTMUBviKVpvvBvDMHe4ePgR/LzgGrmZ2DNtmh0YAePVHUlnyYM/q1C//j4Ga3IGStvlX2H+WQXzMcmcXmNqSobdA/Y2PgwOh0cAmhakE1uLb46xNj75X/1qN1qHl25vCy9KzjTQOSTOlsFohc6384lc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725398573; c=relaxed/simple; bh=8P1Jum47rGgM7FDX62HMOHw91bamdwad0+5M/vSm+X0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-type; b=pj1DZ8tubQzZP2m80Hobf2YRQNQ7fhwYPPoqvFo8DcRgoIpwhu/0sYxoMBTiyoKDZz8U7HImzWk+eUa9uFIufgBR2m6j3tm5PfVQNWmVDvi2E+ug+5gKTPm/ZTLXr6vW9o6TuZkBGaT2ME6MVIACdq4NlZnuJIDWbp6QaB097AE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=U640d6iX; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="U640d6iX" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1725398571; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=x8BQfqOVIo0s9x5Bh8x8Xi9+zxZ5VGhm3NLe1eX0SoQ=; b=U640d6iXbRZbI42cUA81k+AhotHl6t835KYw8r2TuY8aQKYFrN3u3dkwEYkhdisZOVJdGb O86/ING9HdXSDaepBrYNlRFwCsRZw4rtlCSDCdgsTsDlurZchU7tMBH46SShFx6AGaNKAE FnMcl0u//dYOdIGv8VLMl+eNPj4RXyw= Received: from mail-oa1-f72.google.com (mail-oa1-f72.google.com [209.85.160.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-154--ns-XfxDMoCXay299kZ2Mg-1; Tue, 03 Sep 2024 17:22:50 -0400 X-MC-Unique: -ns-XfxDMoCXay299kZ2Mg-1 Received: by mail-oa1-f72.google.com with SMTP id 586e51a60fabf-277e50bf7c8so3364865fac.1 for ; Tue, 03 Sep 2024 14:22:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725398569; x=1726003369; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=x8BQfqOVIo0s9x5Bh8x8Xi9+zxZ5VGhm3NLe1eX0SoQ=; b=NhNbBxc+XIuAW1W/nP7zW57VWHZ0yYwwecrZMTy76WXxX6NAHAvEboX0/AV/7Z/9C9 sYGwiK6JvyX7tFU9HuqPuZcJm4NKrm9v6Oje7cLFsLwXAdt3gFfJNGgrM0olPmeqfS78 fY4F3eI9bSlQwC6JWQY1rLvgo4wWPbDpCYVOphkwoW7XhNAcARIc2fMcpd03Ey68OSbv KAnCtMe+9/odzDqcwACRZ5XykIa/Y6JRW7jWXZ/aD7ee551m4YQSbqWE8Q4Nhtmc9uhA h/1QCjR94On0qDBdsgQntO9ql+BTCcHupkHIEUL//AvHBpDZdckEUV8my/CzZYLjnrY+ uI+w== X-Forwarded-Encrypted: i=1; AJvYcCWmOiSYK4pr5wreRIjvAsLZKuX6QkfNd30mvmcNfUY+vpolavQMUcoe8yXzGOqFVQyg64NhpckJ8+dzaZcG@vger.kernel.org X-Gm-Message-State: AOJu0Yzi6MtKJ1wuThUvyDIsIrZ6xxr4AlSbKx6R03jt5dUg9hpmLfZf 9gyvMyvbT4SNbne6ZeX5jmsHojk9Ifn60TnvJq7RezPCw9smQOknbWG5YcAsM6v4hukhWmo+y4d ODYGTwB1DMVSpfQ9EYHCAe9RnCBijm5VW0mFZXo9hd+15g8TRgrkZew32DB7KZdo= X-Received: by 2002:a05:6870:ab13:b0:261:648:ddc5 with SMTP id 586e51a60fabf-277d0440313mr13448320fac.22.1725398569447; Tue, 03 Sep 2024 14:22:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGkeRLWZ/sDG45fCql0Gm6F6kVH9oaiaaJPzDMm1J3AN0Z6MSDkiIcKaR6kgJxb0RqGP1wSkQ== X-Received: by 2002:a05:6870:ab13:b0:261:648:ddc5 with SMTP id 586e51a60fabf-277d0440313mr13448302fac.22.1725398569071; Tue, 03 Sep 2024 14:22:49 -0700 (PDT) Received: from x1.redhat.com (c-98-219-206-88.hsd1.pa.comcast.net. [98.219.206.88]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7a806bfb8c9sm564737185a.25.2024.09.03.14.22.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Sep 2024 14:22:47 -0700 (PDT) From: Brian Masney To: herbert@gondor.apana.org.au Cc: davem@davemloft.net, quic_omprsing@quicinc.com, neil.armstrong@linaro.org, quic_bjorande@quicinc.com, linux-arm-msm@vger.kernel.org, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, ernesto.mnd.fernandez@gmail.com, quic_jhugo@quicinc.com Subject: [PATCH v2 2/2] crypto: qcom-rng: rename *_of_data to *_match_data Date: Tue, 3 Sep 2024 17:22:20 -0400 Message-ID: <20240903212230.707376-3-bmasney@redhat.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240903212230.707376-1-bmasney@redhat.com> References: <20240903212230.707376-1-bmasney@redhat.com> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-type: text/plain The qcom-rng driver supports both ACPI and device tree based systems. Let's rename all instances of *_of_data to *_match_data so that it's not implied that this driver only supports device tree. Signed-off-by: Brian Masney --- drivers/crypto/qcom-rng.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/drivers/crypto/qcom-rng.c b/drivers/crypto/qcom-rng.c index 7ba978f0ce8b..f630962469c8 100644 --- a/drivers/crypto/qcom-rng.c +++ b/drivers/crypto/qcom-rng.c @@ -36,14 +36,14 @@ struct qcom_rng { void __iomem *base; struct clk *clk; struct hwrng hwrng; - struct qcom_rng_of_data *of_data; + struct qcom_rng_match_data *match_data; }; struct qcom_rng_ctx { struct qcom_rng *rng; }; -struct qcom_rng_of_data { +struct qcom_rng_match_data { bool skip_init; bool hwrng_support; }; @@ -155,7 +155,7 @@ static int qcom_rng_init(struct crypto_tfm *tfm) ctx->rng = qcom_rng_dev; - if (!ctx->rng->of_data->skip_init) + if (!ctx->rng->match_data->skip_init) return qcom_rng_enable(ctx->rng); return 0; @@ -176,17 +176,17 @@ static struct rng_alg qcom_rng_alg = { } }; -static struct qcom_rng_of_data qcom_prng_of_data = { +static struct qcom_rng_match_data qcom_prng_match_data = { .skip_init = false, .hwrng_support = false, }; -static struct qcom_rng_of_data qcom_prng_ee_of_data = { +static struct qcom_rng_match_data qcom_prng_ee_match_data = { .skip_init = true, .hwrng_support = false, }; -static struct qcom_rng_of_data qcom_trng_of_data = { +static struct qcom_rng_match_data qcom_trng_match_data = { .skip_init = true, .hwrng_support = true, }; @@ -212,9 +212,10 @@ static int qcom_rng_probe(struct platform_device *pdev) return PTR_ERR(rng->clk); if (has_acpi_companion(&pdev->dev)) - rng->of_data = &qcom_prng_ee_of_data; + rng->match_data = &qcom_prng_ee_match_data; else - rng->of_data = (struct qcom_rng_of_data *)of_device_get_match_data(&pdev->dev); + rng->match_data = + (struct qcom_rng_match_data *)of_device_get_match_data(&pdev->dev); qcom_rng_dev = rng; ret = crypto_register_rng(&qcom_rng_alg); @@ -224,7 +225,7 @@ static int qcom_rng_probe(struct platform_device *pdev) return ret; } - if (rng->of_data->hwrng_support) { + if (rng->match_data->hwrng_support) { rng->hwrng.name = "qcom_hwrng"; rng->hwrng.read = qcom_hwrng_read; rng->hwrng.quality = QCOM_TRNG_QUALITY; @@ -256,9 +257,9 @@ static const struct acpi_device_id __maybe_unused qcom_rng_acpi_match[] = { MODULE_DEVICE_TABLE(acpi, qcom_rng_acpi_match); static const struct of_device_id __maybe_unused qcom_rng_of_match[] = { - { .compatible = "qcom,prng", .data = &qcom_prng_of_data }, - { .compatible = "qcom,prng-ee", .data = &qcom_prng_ee_of_data }, - { .compatible = "qcom,trng", .data = &qcom_trng_of_data }, + { .compatible = "qcom,prng", .data = &qcom_prng_match_data }, + { .compatible = "qcom,prng-ee", .data = &qcom_prng_ee_match_data }, + { .compatible = "qcom,trng", .data = &qcom_trng_match_data }, {} }; MODULE_DEVICE_TABLE(of, qcom_rng_of_match);