From patchwork Wed Nov 8 00:44:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 10047445 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 D1E9660247 for ; Wed, 8 Nov 2017 00:47:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C555D2A1C7 for ; Wed, 8 Nov 2017 00:47:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B9E422A1E2; Wed, 8 Nov 2017 00:47:31 +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=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM 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 70AC22A1C7 for ; Wed, 8 Nov 2017 00:47:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751056AbdKHArN (ORCPT ); Tue, 7 Nov 2017 19:47:13 -0500 Received: from mail-qk0-f193.google.com ([209.85.220.193]:56754 "EHLO mail-qk0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934174AbdKHApY (ORCPT ); Tue, 7 Nov 2017 19:45:24 -0500 Received: by mail-qk0-f193.google.com with SMTP id 2so573055qkg.13; Tue, 07 Nov 2017 16:45:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=umHXKtaBUnR4wQfLuCYM01sHDUPMW2N6SDG+7zsV8Ro=; b=VZwQ4yEQmm5U4Zb5sCWABogRYKXENGlz6alP7DfLnCcNs1z6+nY45LkQuSEi+00Hnp yWbwPPJlgNJouhGG3BypaM1uLIi7I5XdtUcNoKb0kMPpDWEByleh9P8nnUdzTglutlH1 EAlY4SUqSZd2Q3kU0xLZ+DC/+kHEMVuNSMzRjNP8PTA9/gFJ4LADhowUoOI8Rk+NMD+R AwmNye1XWFZ9Ycn5eMjTmB7EN/PhKWdIEIUWf1tDtgGyIUGc/fD49+NIrqum5DvECF6p ONR3tqulJ0I0vnwj2kx3qoz4lmDdrT0gRlhWDLHGplyCRxDT+PYGIhOkjAMfECCJBK2L H3mw== 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=umHXKtaBUnR4wQfLuCYM01sHDUPMW2N6SDG+7zsV8Ro=; b=JV4F8EvBpNLtqysKwAoJ4ak2GfWlooEJpQfZGltwoUVckptnyiDf6wmsBlDrEx4gmZ z5k660Ctvj0m70EFl73+9qUOboyj2NBcUCirGCRXRL6jM1DcrEhN72ZYnDktvS8OTyCK MEHeR/lI3nOO9eQL/KcFlGKulHmnQZsYv0IXlu/fyM4jXMeULwn9hslKmidsf9BtmouX KLd5hrgRjF760OuLXpBgzcuwg/wz1ozHm3ezHFZkGmnRs2gnb/6RTJXGPWJaQSbtySYp 2M6vBsH/+rblXmu0+4cljFI0iXnGDy67ZWNsQLKxk5pZPFu3XiEsycfG1n0Co29XB5ld Os8w== X-Gm-Message-State: AJaThX6otIG/dox5RddoLRldZsLZUV3X1WN6QNuzDQX0PjxuC2zOdJRh JG81zW6unTzqi9kq0VjIpY29IUCz X-Google-Smtp-Source: ABhQp+Q0aMmrbiNi0KdBlZdAHzhzDjta14namnZyB3DH0xyc1BpJF+jbyhqObO8FDH2GQSMxHGx2nw== X-Received: by 10.55.124.7 with SMTP id x7mr892787qkc.54.1510101923670; Tue, 07 Nov 2017 16:45:23 -0800 (PST) Received: from fainelli-desktop.broadcom.com ([192.19.255.250]) by smtp.gmail.com with ESMTPSA id y9sm1862407qth.43.2017.11.07.16.45.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Nov 2017 16:45:22 -0800 (PST) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: Florian Fainelli , Matt Mackall , Herbert Xu , Rob Herring , Mark Rutland , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITE...), Eric Anholt , Stefan Wahren , PrasannaKumar Muralidharan , Russell King , Krzysztof Kozlowski , Harald Freudenberger , Sean Wang , Martin Kaiser , Steffen Trumtrar , linux-crypto@vger.kernel.org (open list:HARDWARE RANDOM NUMBER GENERATOR CORE), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-rpi-kernel@lists.infradead.org (moderated list:BROADCOM BCM2835 ARM ARCHITECTURE), linux-arm-kernel@lists.infradead.org (moderated list:BROADCOM BCM2835 ARM ARCHITECTURE) Subject: [PATCH v2 09/12] hwrng: bcm2835-rng: Add Broadcom MIPS I/O accessors Date: Tue, 7 Nov 2017 16:44:46 -0800 Message-Id: <20171108004449.32730-10-f.fainelli@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20171108004449.32730-1-f.fainelli@gmail.com> References: <20171108004449.32730-1-f.fainelli@gmail.com> 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 Broadcom MIPS HW is always strapped to match the system-wide endian such that all I/O access to this RNG block is done with the native CPU endian, account for that. Signed-off-by: Florian Fainelli --- drivers/char/hw_random/bcm2835-rng.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/char/hw_random/bcm2835-rng.c b/drivers/char/hw_random/bcm2835-rng.c index 3a607472687d..6dd8f48701b5 100644 --- a/drivers/char/hw_random/bcm2835-rng.c +++ b/drivers/char/hw_random/bcm2835-rng.c @@ -44,13 +44,22 @@ static inline struct bcm2835_rng_priv *to_rng_priv(struct hwrng *rng) static inline u32 rng_readl(struct bcm2835_rng_priv *priv, u32 offset) { - return readl(priv->base + offset); + /* MIPS chips strapped for BE will automagically configure the + * peripheral registers for CPU-native byte order. + */ + if (IS_ENABLED(CONFIG_MIPS) && IS_ENABLED(CONFIG_CPU_BIG_ENDIAN)) + return __raw_readl(priv->base + offset); + else + return readl(priv->base + offset); } static inline void rng_writel(struct bcm2835_rng_priv *priv, u32 val, u32 offset) { - writel(val, priv->base + offset); + if (IS_ENABLED(CONFIG_MIPS) && IS_ENABLED(CONFIG_CPU_BIG_ENDIAN)) + __raw_writel(val, priv->base + offset); + else + writel(val, priv->base + offset); } static int bcm2835_rng_read(struct hwrng *rng, void *buf, size_t max,