From: Stefan Wahren Subject: Re: [PATCH 11/12] hwrng: bcm2835-rng: Enable BCM2835 RNG to work on BCM63xx platforms Date: Wed, 8 Nov 2017 00:27:13 +0100 (CET) Message-ID: <1627253231.37578.1510097233943@email.1und1.de> References: <20171102010408.27736-1-f.fainelli@gmail.com> <20171102010408.27736-12-f.fainelli@gmail.com> <1831955836.132229.1509820078271@email.1und1.de> <2538f1bb-e0f8-c336-d82a-0cb2f19b0ead@gmail.com> <345702666.5362.1510037144469@email.1und1.de> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: Mark Rutland , "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS" , Sean Wang , Martin Kaiser , Herbert Xu , Scott Branden , Ray Jui , Matt Mackall , Russell King , Krzysztof Kozlowski , linux-kernel@vger.kernel.org, Eric Anholt , Harald Freudenberger , Rob Herring , "maintainer:BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITE..." , "open list:HARDWARE RANDOM NUMBER GENERATOR CORE" , PrasannaKumar Muralidharan , Steffen Trumtrar , "moderated list:BROADCO To: Florian Fainelli Return-path: In-Reply-To: <345702666.5362.1510037144469@email.1und1.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org List-Id: linux-crypto.vger.kernel.org > Stefan Wahren hat am 7. November 2017 um 07:45 geschrieben: > > > > Florian Fainelli hat am 6. November 2017 um 21:16 geschrieben: > > > > > > On 11/04/2017 11:27 AM, Stefan Wahren wrote: > > > Hi Florian > > > > > >> Florian Fainelli hat am 2. November 2017 um 02:04 geschrieben: > > >> > > >> > > >> We have now incorporated all necessary functionality for the BCM63xx > > >> platforms to successfully migrate over bcm2835-rng, so add the final > > >> bits: Kconfig selection and proper platform_device device type matching > > >> to keep the same platform device name for registration to work. > > >> > > >> Signed-off-by: Florian Fainelli > > >> --- > > >> drivers/char/hw_random/Kconfig | 7 ++++--- > > >> drivers/char/hw_random/bcm2835-rng.c | 11 ++++++++++- > > >> 2 files changed, 14 insertions(+), 4 deletions(-) > > >> > > >> diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig > > >> index 95a031e9eced..d0689cc8c7fc 100644 > > >> --- a/drivers/char/hw_random/Kconfig > > >> +++ b/drivers/char/hw_random/Kconfig > > >> @@ -87,12 +87,13 @@ config HW_RANDOM_BCM63XX > > >> If unusure, say Y. > > >> > > >> config HW_RANDOM_BCM2835 > > >> - tristate "Broadcom BCM2835 Random Number Generator support" > > >> - depends on ARCH_BCM2835 || ARCH_BCM_NSP || ARCH_BCM_5301X > > >> + tristate "Broadcom BCM2835/BCM63xx Random Number Generator support" > > >> + depends on ARCH_BCM2835 || ARCH_BCM_NSP || ARCH_BCM_5301X || \ > > >> + ARCH_BCM_63XX || BCM63XX || BMIPS_GENERIC > > >> default HW_RANDOM > > >> ---help--- > > >> This driver provides kernel-side support for the Random Number > > >> - Generator hardware found on the Broadcom BCM2835 SoCs. > > >> + Generator hardware found on the Broadcom BCM2835 and BCM63xx SoCs. > > >> > > >> To compile this driver as a module, choose M here: the > > >> module will be called bcm2835-rng > > >> diff --git a/drivers/char/hw_random/bcm2835-rng.c b/drivers/char/hw_random/bcm2835-rng.c > > >> index 650e0033c273..d9ffe14f312b 100644 > > >> --- a/drivers/char/hw_random/bcm2835-rng.c > > >> +++ b/drivers/char/hw_random/bcm2835-rng.c > > >> @@ -131,6 +131,7 @@ static const struct of_device_id bcm2835_rng_of_match[] = { > > >> { .compatible = "brcm,bcm2835-rng"}, > > >> { .compatible = "brcm,bcm-nsp-rng", .data = &nsp_rng_of_data }, > > >> { .compatible = "brcm,bcm5301x-rng", .data = &nsp_rng_of_data }, > > >> + { .compatible = "brcm,bcm6368-rng"}, > > >> {}, > > >> }; > > >> > > >> @@ -164,7 +165,7 @@ static int bcm2835_rng_probe(struct platform_device *pdev) > > >> if (IS_ERR(priv->clk)) > > >> priv->clk = NULL; > > >> > > >> - priv->rng.name = "bcm2835-rng"; > > >> + priv->rng.name = pdev->id_entry->name; > > > > > > this change breaks registration on bcm2835, because the name is NULL. > > > > OH right, I will fix that in v2, I am assuming that if you did something > > like this, things still work correctly for you on 2835: > > > > if (!priv->id_entry->name) > > priv->rng.name = "bcm2835-rng"; > > else > > priv->rng.name = priv->id_entry->name; > > > > ? > > I think that should work, but i'm not really happy about it. I prefer a more general solution. Looking at the other rng drivers shows the following pattern: > > priv->rng.name = pdev->name; > > I need to verify this on bcm2835. Okay pdev->name works for bcm2835