From nobody Thu Dec 18 23:47:12 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 97094D29E for ; Thu, 29 Aug 2024 01:21:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724894495; cv=none; b=sLTEhggjW3G7ARz33Wxua1StUlFN+Kmz2KqsBSnUH8RNX1EPzRLOrO+zkPyLVYgft5qVr2UPAXun6CyBlt1u9GuYleTTRdHVEt8UNVUrN20wAuixZuiHcmy1/Bp49e9LzBRdw7afrbdQcfyQaA3rbxTXxm4dQLStCWgwh7OpNG0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724894495; c=relaxed/simple; bh=pVIsjIwUVSuD9f5vpgG6Je4vWyRG4TASquy5YfmS7vk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-type; b=R52eRCm7id5nkjAHHoHYYHv5SlTOb6o7QeZu/ijbbckLOZwNO+ivDauPJ/CLTUCRfcZKCdxJ/8NouhMLENjnY6LyLBAUhOAfGyb5OfFmy5HJfAjn44H0S4ivq1frFSEyp9Q/vIl2yEbVMGWjZbfEeTDUR/4nR/wtg9fv7kiwPTY= 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=jBzPa2D0; arc=none smtp.client-ip=170.10.129.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="jBzPa2D0" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724894492; 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=uPFXZeRskPV1LBySPC5AK+d7TuSi/RtTN6Kvr+xrijg=; b=jBzPa2D0nwrawaPlJZ6Dtvf0JczRl5HVesapRd3HnHVr205XjBndLklHQNosG581so0VLV qrQX3kJdGzriTJ6lAvML2f4Q4tmREcYVmXTf6NOwgS6nMdjyDWqyM8iJXHjhWM1wW0bOZT FY62Y//qnODXiETJH6pQfo+AM2PoRos= Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-615-ZDlgSVDQPF-uCrZ42VO-7g-1; Wed, 28 Aug 2024 21:21:30 -0400 X-MC-Unique: ZDlgSVDQPF-uCrZ42VO-7g-1 Received: by mail-qv1-f70.google.com with SMTP id 6a1803df08f44-6c1610cd159so3234546d6.0 for ; Wed, 28 Aug 2024 18:21:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724894490; x=1725499290; 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=uPFXZeRskPV1LBySPC5AK+d7TuSi/RtTN6Kvr+xrijg=; b=Hg1vQSaTxC2QocALogGE+p3JNzCryCXd+mg3zcP4KfH7DU4b4C2ntBgLy2eWRGhbNR Foc8btyub1+ugE2SZ/eLJMX2/KWEp46c+cbcWtIpUlv/SjW8tSZTkgafUwk0CjiFlQ4j YIQG5oBxImLPBNdTrSkYrbN9jchYmgkcgL8E83dli7pVi2bTRVHOb7KHzArDoLlVz+JN CwLCiKmt/fI0ykYiXqRxDGNTAXHGIx598DorRKqi6Win+IW5CDnQzTqaKWVO+RfoOQ7O XoM65rfI2rnih+bWe6yqq95GnGZB91UMZHQlBImRvQG4FjPXCxDyYliSpugKM3eLLPMj SKQA== X-Forwarded-Encrypted: i=1; AJvYcCWFIt8137YLeezpBDkmvTTdwDKWI3ogwuKvQDh4wISYbVCR0LrAAPm+7liQfqvAZ5ucU1vSnWxK1VJ+a4g=@vger.kernel.org X-Gm-Message-State: AOJu0YzHdBxzjwYZDZ704tqgDk4hnHT3WIOpS5Yo/cnaY/mRQKmLHLYw OC5ogRlgJ6oCfnKb/Uf9u3yQva1XeuhjBLMpQ9Aj9KJtaz97T26F2U8xD8LMb+LpjFs0pnIWnna 3bJLF9GrAK799rTYCpaxWhSGKT+r2nyi8hOJi1do4qhyxMkBP39ouoBoz+zDj+Q== X-Received: by 2002:a05:6214:1946:b0:6bf:7efc:1117 with SMTP id 6a1803df08f44-6c33f33d66emr20160196d6.9.1724894490323; Wed, 28 Aug 2024 18:21:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG+83JODhwFjiVeEZ7C0/0RpEBcm05e8lIief195xyZB9E5UbynGRmQWhUDqK+J30xjphpQgg== X-Received: by 2002:a05:6214:1946:b0:6bf:7efc:1117 with SMTP id 6a1803df08f44-6c33f33d66emr20160006d6.9.1724894490020; Wed, 28 Aug 2024 18:21:30 -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 6a1803df08f44-6c340c96825sm1013236d6.75.2024.08.28.18.21.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Aug 2024 18:21:28 -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 Subject: [PATCH 1/2] crypto: qcom-rng: rename *_of_data to *_match_data Date: Wed, 28 Aug 2024 21:20:04 -0400 Message-ID: <20240829012005.382715-2-bmasney@redhat.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240829012005.382715-1-bmasney@redhat.com> References: <20240829012005.382715-1-bmasney@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The qcom-rng driver supports both ACPI and device tree based systems. Let's rename all instances of *_of_data to *_match_data in preparation for fixing the ACPI support that was broken with commit f29cd5bb64c2 ("crypto: qcom-rng - Add hw_random interface support"). Signed-off-by: Brian Masney Reported-by: Ernesto A. Fern=C3=A1ndez --- drivers/crypto/qcom-rng.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/crypto/qcom-rng.c b/drivers/crypto/qcom-rng.c index c670d7d0c11e..4ed545001b77 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; }; =20 struct qcom_rng_ctx { struct qcom_rng *rng; }; =20 -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) =20 ctx->rng =3D qcom_rng_dev; =20 - if (!ctx->rng->of_data->skip_init) + if (!ctx->rng->match_data->skip_init) return qcom_rng_enable(ctx->rng); =20 return 0; @@ -196,7 +196,7 @@ static int qcom_rng_probe(struct platform_device *pdev) if (IS_ERR(rng->clk)) return PTR_ERR(rng->clk); =20 - rng->of_data =3D (struct qcom_rng_of_data *)of_device_get_match_data(&pde= v->dev); + rng->match_data =3D (struct qcom_rng_match_data *)of_device_get_match_dat= a(&pdev->dev); =20 qcom_rng_dev =3D rng; ret =3D crypto_register_rng(&qcom_rng_alg); @@ -206,7 +206,7 @@ static int qcom_rng_probe(struct platform_device *pdev) return ret; } =20 - if (rng->of_data->hwrng_support) { + if (rng->match_data->hwrng_support) { rng->hwrng.name =3D "qcom_hwrng"; rng->hwrng.read =3D qcom_hwrng_read; rng->hwrng.quality =3D QCOM_TRNG_QUALITY; @@ -231,17 +231,17 @@ static void qcom_rng_remove(struct platform_device *p= dev) qcom_rng_dev =3D NULL; } =20 -static struct qcom_rng_of_data qcom_prng_of_data =3D { +static struct qcom_rng_match_data qcom_prng_match_data =3D { .skip_init =3D false, .hwrng_support =3D false, }; =20 -static struct qcom_rng_of_data qcom_prng_ee_of_data =3D { +static struct qcom_rng_match_data qcom_prng_ee_match_data =3D { .skip_init =3D true, .hwrng_support =3D false, }; =20 -static struct qcom_rng_of_data qcom_trng_of_data =3D { +static struct qcom_rng_match_data qcom_trng_match_data =3D { .skip_init =3D true, .hwrng_support =3D true, }; @@ -253,9 +253,9 @@ static const struct acpi_device_id __maybe_unused qcom_= rng_acpi_match[] =3D { MODULE_DEVICE_TABLE(acpi, qcom_rng_acpi_match); =20 static const struct of_device_id __maybe_unused qcom_rng_of_match[] =3D { - { .compatible =3D "qcom,prng", .data =3D &qcom_prng_of_data }, - { .compatible =3D "qcom,prng-ee", .data =3D &qcom_prng_ee_of_data }, - { .compatible =3D "qcom,trng", .data =3D &qcom_trng_of_data }, + { .compatible =3D "qcom,prng", .data =3D &qcom_prng_match_data }, + { .compatible =3D "qcom,prng-ee", .data =3D &qcom_prng_ee_match_data }, + { .compatible =3D "qcom,trng", .data =3D &qcom_trng_match_data }, {} }; MODULE_DEVICE_TABLE(of, qcom_rng_of_match); --=20 2.46.0 From nobody Thu Dec 18 23:47:12 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 2468D22EF4 for ; Thu, 29 Aug 2024 01:21:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724894497; cv=none; b=H6QYLm8QRXb9PU0s1g0FYxlnK5gZABoetHBuu0ktyj2jizjIMlfZgtTs8BIYfk1eKqrdYvwbzHpnzn5weSeMJH7OIw8/mAm2sHV7mjvaBeLO9SRdva5jklc3ZZkWxmlSfPZfuDbisFYwQUC9q2//SAeL7LQQEEEwudCYMMBHetw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724894497; c=relaxed/simple; bh=5cZ/tjRZEvLlBlcMgDypjgg3mVu/wSmTlQDFzZ8a8WY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-type; b=cL7YVKkbPLI+U8rZ8TBd3CAU280zuuxcv9utiV7oNrVXtqFI8imh6m7NqJ8PNd7PNjOHQJF6pdU1CUkioTgHLJUOCPmXGmFpQx6bv8lammgj4EmZpubbT8ojn56nvW9j+NN/fkZwxWZbDGtQ6s9TOqHae6JS9A+DUWF2JDtzI2c= 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=Jl7Agfz9; arc=none smtp.client-ip=170.10.129.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="Jl7Agfz9" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724894495; 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=1NZAUVynLNTnl3J66RD+E9gv/iCwUnMmJ5YyN4QH4Ew=; b=Jl7Agfz9GGLmPLAQ/M+PUYuzcf6g7A/R2GaPEOtG1TwJiaJhLR6U+q8iYtYd7kSpn50Upb XDKWY90iQCoYaVEM/SsFE8ao9H0CrJPD7JHfYg/QTs8dAbJ4hnwqCxl1agUNLhwTlKKrNd NyWTQrFDg+LElzlUhcbMvaaM3uEoxqE= Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-683-UJ7A7S8FNZCE-AHcI0AbNw-1; Wed, 28 Aug 2024 21:21:33 -0400 X-MC-Unique: UJ7A7S8FNZCE-AHcI0AbNw-1 Received: by mail-qv1-f69.google.com with SMTP id 6a1803df08f44-6bf6d3e210eso1616276d6.3 for ; Wed, 28 Aug 2024 18:21:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724894493; x=1725499293; 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=1NZAUVynLNTnl3J66RD+E9gv/iCwUnMmJ5YyN4QH4Ew=; b=P0seqCcwzbLLOYabR2YFvciIzcCWtF1mGsyE6PfeklsdlkB8KToJ53x3+TlESesqAQ CYjys1xsP0peAHiFURV7ZfW3UXI0GSusPwp8bX6o8i6cHGGDaVQGt7rYFwdyf38V8DWS MWxbXD2LbuEl2t0b08zag3SCLxLQbeesD8DT7wrnIyb7wQNUC6wXPI+dnY0VYB6dTmZ5 xlPKPCRp+v8tqY6TIdOKrfnQ8MkDBgg1SJ3NCm+/HBpyMDiRLYecUeb3f6L/x0pSw5Yo g9zwRyMHMYG9rLNUV8KJ+qy67uh11XEhbb9DpIBvFCNPt4zA2jKJVwwhqH3C5ruia1CA 1qjA== X-Forwarded-Encrypted: i=1; AJvYcCUrK/4ZlfnzuXHK7+gXO09NKxogGUISy/jgiWCfrLCk6RuLbQDQ0S2vr65W1TvBw5M6hxKS2LhHs83TlIE=@vger.kernel.org X-Gm-Message-State: AOJu0YzYRHXIJ2AlYcpzdIR7ReNdXoQMt0jQwnj3qRq4nxC+2+efkLv7 UUrNd4O7jXp6Cn+TWWde+/4IojUNUO0IhDnii6hJQS2+urMG0bKdUVSHxYQ7Xf4fFBScSebIXI0 QdLpzbdxwNDNS3fxl7XaE9+6aRW9NDGb5mOtTCksjlSVJg2XPoXn2DcTKcds36ynT+MsPHUmX X-Received: by 2002:a05:6214:451b:b0:6bd:778b:6594 with SMTP id 6a1803df08f44-6c33e6962a0mr14117446d6.54.1724894492857; Wed, 28 Aug 2024 18:21:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFicbErcyZiL6ygZRYadzj1SdSXTCvwnpByTUjprwT++cXLx+ACzuYsCKWZ7aVgr6os4cyMlg== X-Received: by 2002:a05:6214:451b:b0:6bd:778b:6594 with SMTP id 6a1803df08f44-6c33e6962a0mr14117266d6.54.1724894492488; Wed, 28 Aug 2024 18:21:32 -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 6a1803df08f44-6c340c96825sm1013236d6.75.2024.08.28.18.21.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Aug 2024 18:21:30 -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 Subject: [PATCH 2/2] crypto: qcom-rng: fix support for ACPI-based systems Date: Wed, 28 Aug 2024 21:20:05 -0400 Message-ID: <20240829012005.382715-3-bmasney@redhat.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240829012005.382715-1-bmasney@redhat.com> References: <20240829012005.382715-1-bmasney@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 checking has_acpi_companion(). This fix was boot tested on a Qualcomm Amberwing server. Fixes: f29cd5bb64c2 ("crypto: qcom-rng - Add hw_random interface support") Signed-off-by: Brian Masney Reported-by: Ernesto A. Fern=C3=A1ndez --- drivers/crypto/qcom-rng.c | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/drivers/crypto/qcom-rng.c b/drivers/crypto/qcom-rng.c index 4ed545001b77..470062cb258c 100644 --- a/drivers/crypto/qcom-rng.c +++ b/drivers/crypto/qcom-rng.c @@ -176,6 +176,21 @@ static struct rng_alg qcom_rng_alg =3D { } }; =20 +static struct qcom_rng_match_data qcom_prng_match_data =3D { + .skip_init =3D false, + .hwrng_support =3D false, +}; + +static struct qcom_rng_match_data qcom_prng_ee_match_data =3D { + .skip_init =3D true, + .hwrng_support =3D false, +}; + +static struct qcom_rng_match_data qcom_trng_match_data =3D { + .skip_init =3D true, + .hwrng_support =3D true, +}; + static int qcom_rng_probe(struct platform_device *pdev) { struct qcom_rng *rng; @@ -196,7 +211,11 @@ static int qcom_rng_probe(struct platform_device *pdev) if (IS_ERR(rng->clk)) return PTR_ERR(rng->clk); =20 - rng->match_data =3D (struct qcom_rng_match_data *)of_device_get_match_dat= a(&pdev->dev); + if (has_acpi_companion(&pdev->dev)) + rng->match_data =3D &qcom_prng_match_data; + else + rng->match_data =3D + (struct qcom_rng_match_data *)of_device_get_match_data(&pdev->dev); =20 qcom_rng_dev =3D rng; ret =3D crypto_register_rng(&qcom_rng_alg); @@ -231,21 +250,6 @@ static void qcom_rng_remove(struct platform_device *pd= ev) qcom_rng_dev =3D NULL; } =20 -static struct qcom_rng_match_data qcom_prng_match_data =3D { - .skip_init =3D false, - .hwrng_support =3D false, -}; - -static struct qcom_rng_match_data qcom_prng_ee_match_data =3D { - .skip_init =3D true, - .hwrng_support =3D false, -}; - -static struct qcom_rng_match_data qcom_trng_match_data =3D { - .skip_init =3D true, - .hwrng_support =3D true, -}; - static const struct acpi_device_id __maybe_unused qcom_rng_acpi_match[] = =3D { { .id =3D "QCOM8160", .driver_data =3D 1 }, {} --=20 2.46.0