From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.61]) by mx.groups.io with SMTP id smtpd.web09.6898.1574866051644313514 for ; Wed, 27 Nov 2019 06:47:31 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=K7Dgv7xe; spf=pass (domain: redhat.com, ip: 205.139.110.61, mailfrom: philmd@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574866050; 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=RzORhvBH/kMDMd/NnVnIsS881uXSRUqTpN2AEBRdBAk=; b=K7Dgv7xevWE8uL8wnS7232EgWq1S4/smow7LOxaWtZhkPXgJP84MkUhOrkCSRtMFMKiCzp H3e6o2HSIM185dnlnRG0OakUzyLQSLnEnqx4OtgUrrydZt3cVt9pQ3FzS6DkeZOUUFCg1q 8+LsQzWI+rZZEJBezYPFJPP75rnvdG4= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-344-IbjjwTPGPLyBYjdTWUJo3g-1; Wed, 27 Nov 2019 09:47:29 -0500 Received: by mail-wm1-f72.google.com with SMTP id l23so2600239wmh.6 for ; Wed, 27 Nov 2019 06:47:29 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=RzORhvBH/kMDMd/NnVnIsS881uXSRUqTpN2AEBRdBAk=; b=sUBSPzkyw1ZbYYlPt7QNqRsAXPcBHTjvz5SSY5Srkrs0bFht/S1vmmZf9ysXBabvPV rLMsXs75ba+J2vLbyjzWbJBRwSTljBJerz4JDfK3rX3erprJy+Ur7WU/WG7CgpMkv3qg E130P9RHUw+s5gOFE7516o0iHRTN6hJwjATgKKM3nXINaJzY7duiWniQ1ruFnCtJnWAt THDunthOEuwo0GEHN8iA2f0S/bjX/i4vGMi1LHAo3H2cOmqiHmr2CBn3q7/LOvmk1l7/ w4INnT/fK7CUr5hrBA4QcXdEd4cQblMP5tEQhsgOH0qViSSSF2gIPA3aCvvk0aJL0TFU /E/Q== X-Gm-Message-State: APjAAAUU0cy9FbcfdE0Fn1oR8q3aF2RNFEDdBaJIJ9P6oHSoQOmRZLGW yxbiBzr7M9IRGZOmoscKi5iIkYz7WZ7EIyCRSL/oZfl1FbUrJe2iIPqhoTsSVJG0rA/9u0eMQLo UA1aH7YnXQgeAtA== X-Received: by 2002:a5d:4044:: with SMTP id w4mr6986939wrp.322.1574866048397; Wed, 27 Nov 2019 06:47:28 -0800 (PST) X-Google-Smtp-Source: APXvYqz+R9XY8N58d5cgSEOI79zqBKOrPnLiPV7sT1cBeHqMmozoXoir/xfNG67Cb3zSbBZHlXi4LA== X-Received: by 2002:a5d:4044:: with SMTP id w4mr6986925wrp.322.1574866048180; Wed, 27 Nov 2019 06:47:28 -0800 (PST) Return-Path: Received: from [192.168.1.35] (182.red-88-21-103.staticip.rima-tde.net. [88.21.103.182]) by smtp.gmail.com with ESMTPSA id k127sm838762wmk.31.2019.11.27.06.47.26 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 27 Nov 2019 06:47:27 -0800 (PST) Subject: Re: [edk2-platforms][PATCH 1/5] Silicon/Bcm283x: Clean up Bcm2836.h header To: Pete Batard , devel@edk2.groups.io Cc: ard.biesheuvel@linaro.org, leif.lindholm@linaro.org, samer.el-haj-mahmoud@arm.com, andrey.warkentin@gmail.com References: <20191127123706.4604-1-pete@akeo.ie> <20191127123706.4604-2-pete@akeo.ie> From: =?UTF-8?B?UGhpbGlwcGUgTWF0aGlldS1EYXVkw6k=?= Message-ID: <6832e7c5-5aa7-04e4-0ed6-91165ae900e8@redhat.com> Date: Wed, 27 Nov 2019 15:47:26 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.1.1 MIME-Version: 1.0 In-Reply-To: <20191127123706.4604-2-pete@akeo.ie> X-MC-Unique: IbjjwTPGPLyBYjdTWUJo3g-1 X-Mimecast-Spam-Score: 0 Content-Language: en-US Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit On 11/27/19 1:37 PM, Pete Batard wrote: > Add missing RNG registers, This is one change. > prefer reusing shorter define's > instead of PCDs and clean up spacing. This is another change. Why suddenly go back to fixed PERIPHERAL block base address? > > Signed-off-by: Pete Batard > --- > Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836.h | 23 ++++++++++++-------- > 1 file changed, 14 insertions(+), 9 deletions(-) > > diff --git a/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836.h b/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836.h > index 72c8e9dc4b14..744c7ac3b9f4 100644 > --- a/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836.h > +++ b/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836.h > @@ -24,8 +24,7 @@ > > /* watchdog constants */ > #define BCM2836_WDOG_OFFSET 0x00100000 > -#define BCM2836_WDOG_BASE_ADDRESS (FixedPcdGet64 (PcdBcm283xRegistersAddress) \ > - + BCM2836_WDOG_OFFSET) > +#define BCM2836_WDOG_BASE_ADDRESS (BCM2836_SOC_REGISTERS + BCM2836_WDOG_OFFSET) > #define BCM2836_WDOG_PASSWORD 0x5a000000 > #define BCM2836_WDOG_RSTC_OFFSET 0x0000001c > #define BCM2836_WDOG_WDOG_OFFSET 0x00000024 > @@ -34,8 +33,7 @@ > > /* mailbox interface constants */ > #define BCM2836_MBOX_OFFSET 0x0000b880 > -#define BCM2836_MBOX_BASE_ADDRESS (FixedPcdGet64 (PcdBcm283xRegistersAddress) \ > - + BCM2836_MBOX_OFFSET) > +#define BCM2836_MBOX_BASE_ADDRESS (BCM2836_SOC_REGISTERS + BCM2836_MBOX_OFFSET) > #define BCM2836_MBOX_READ_OFFSET 0x00000000 > #define BCM2836_MBOX_STATUS_OFFSET 0x00000018 > #define BCM2836_MBOX_CONFIG_OFFSET 0x0000001c > @@ -51,12 +49,19 @@ > #define BCM2836_INTC_TIMER_PENDING_OFFSET 0x00000060 > > /* random number generator */ > -#define RNG_BASE_ADDRESS (BCM2836_SOC_REGISTERS + 0x00104000) > +#define BCM2836_RNG_OFFSET 0x00104000 > +#define RNG_BASE_ADDRESS (BCM2836_SOC_REGISTERS + BCM2836_RNG_OFFSET) > > -#define RNG_CTRL (RNG_BASE_ADDRESS + 0x0) > -#define RNG_STATUS (RNG_BASE_ADDRESS + 0x4) > -#define RNG_DATA (RNG_BASE_ADDRESS + 0x8) > +#define RNG_CTRL (RNG_BASE_ADDRESS + 0x0) > +#define RNG_STATUS (RNG_BASE_ADDRESS + 0x4) > +#define RNG_DATA (RNG_BASE_ADDRESS + 0x8) > +#define RNG_BIT_COUNT (RNG_BASE_ADDRESS + 0xc) > +#define RNG_BIT_COUNT_THRESHOLD (RNG_BASE_ADDRESS + 0x10) > +#define RNG_INT_STATUS (RNG_BASE_ADDRESS + 0x18) > +#define RNG_INT_ENABLE (RNG_BASE_ADDRESS + 0x1c) > +#define RNG_FIFO_DATA (RNG_BASE_ADDRESS + 0x20) > +#define RNG_FIFO_COUNT (RNG_BASE_ADDRESS + 0x24) > > -#define RNG_CTRL_ENABLE 0x1 > +#define RNG_CTRL_ENABLE 0x1 > > #endif /*__BCM2836_H__ */ >