From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.81]) by mx.groups.io with SMTP id smtpd.web11.12737.1583148100458098206 for ; Mon, 02 Mar 2020 03:21:40 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=NH/XluUW; spf=pass (domain: redhat.com, ip: 207.211.31.81, mailfrom: philmd@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583148099; 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=7p3odLf8Il5Lz+pG+0jrq/pn1NwGJZnujYQnSRjUXjs=; b=NH/XluUW70wIFdexR3xaCY/DlfPjY0qvZkYXAiJdfsVrGixPgAvJ/ja8GVCoz3JIXgszZj 9ko+5n2TRUW1y/M0fSq9hmqo9Bh1nWMTzDoSiwIioc83ecytGk7ui6qZk1BNV/zYIgMJxa sqZ/6WIkRb+Vu83PjBUKlY4eVhIVXpE= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-171-WCvzRxtYPdymv2F3EG2jqQ-1; Mon, 02 Mar 2020 06:21:37 -0500 X-MC-Unique: WCvzRxtYPdymv2F3EG2jqQ-1 Received: by mail-wr1-f69.google.com with SMTP id p11so5656104wrn.10 for ; Mon, 02 Mar 2020 03:21:37 -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=7p3odLf8Il5Lz+pG+0jrq/pn1NwGJZnujYQnSRjUXjs=; b=YZjcGtTEe1oTtx/vZka2LKtycyP+eGgGjJl8vtpDfm9ImzVEIxKwS/q7N3xTm/IzBA D63mfeZxh/w9XKXoL5sCGKVGRM4OTd2E3HmZo7kjV/G5Nyjmzqkl2itrRuP480I0Wm85 PfMvEi+qhSGq8wv4/R56peWBIMs12Lh285JDf2WlhLrtRTDdGaPXOKNDb6L/XuZFnSm2 MP6u1SfMez/d/SJmlgwTomurBgBtFG43JL7f9s0xpo72Uo7pJfAqcSDGCxQOfKFHr2CX ESCBsjT9b5TqAsI71TiCOcj9jkJFu0/sH4NV3s73CQ5x5jsVONjhB3HlmYSljinvI8No x+Eg== X-Gm-Message-State: APjAAAUsid8e9Ry9jKh0cTvAIPCEe5iSoaHqc9x99TAFjrV3KSTI8Lmp mPRjkywH+BxF1jhyATGjLy39/3m6nIjdYa13SYozboX6xcKCzP47LL1ZYajvL/5CRxqOpvzFuGb oF21d+FWjlRadoQ== X-Received: by 2002:a7b:c183:: with SMTP id y3mr19263975wmi.0.1583148096838; Mon, 02 Mar 2020 03:21:36 -0800 (PST) X-Google-Smtp-Source: APXvYqyaKzdThsUPGFdVzJkaRemaSZRYI7LQoc74NdrDvq1otgvA2oD6qFleWwJOUaZ1oDlO/o1Caw== X-Received: by 2002:a7b:c183:: with SMTP id y3mr19263964wmi.0.1583148096572; Mon, 02 Mar 2020 03:21:36 -0800 (PST) Return-Path: Received: from ?IPv6:2a01:e35:2fb0:49e0:3f7b:4b69:b9c:cdc0? ([2a01:e35:2fb0:49e0:3f7b:4b69:b9c:cdc0]) by smtp.gmail.com with ESMTPSA id f15sm9547483wru.83.2020.03.02.03.21.35 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 02 Mar 2020 03:21:36 -0800 (PST) Subject: Re: [edk2-platforms][PATCH 01/15] Platform/RPi: Move DW USB base address to Silicon To: Pete Batard , devel@edk2.groups.io Cc: ard.biesheuvel@linaro.org, leif@nuviainc.com References: <20200228103855.11352-1-pete@akeo.ie> <20200228103855.11352-2-pete@akeo.ie> From: =?UTF-8?B?UGhpbGlwcGUgTWF0aGlldS1EYXVkw6k=?= Message-ID: Date: Mon, 2 Mar 2020 12:21:35 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.4.1 MIME-Version: 1.0 In-Reply-To: <20200228103855.11352-2-pete@akeo.ie> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit On 2/28/20 11:38 AM, Pete Batard wrote: > The official BCM2835 ARM Peripherals guide lists the DW USB > controller as standard SoC device. > Treat is as such by adding its base address to Silicon. > > Signed-off-by: Pete Batard > --- > Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwUsbHostDxe.c | 3 ++- > Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwcHw.h | 6 +----- > Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836.h | 5 +++++ > 3 files changed, 8 insertions(+), 6 deletions(-) > > diff --git a/Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwUsbHostDxe.c b/Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwUsbHostDxe.c > index 37ebf503fd60..4f6f60b1eb5f 100644 > --- a/Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwUsbHostDxe.c > +++ b/Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwUsbHostDxe.c > @@ -7,6 +7,7 @@ > * > **/ > > +#include > #include "DwUsbHostDxe.h" > #include "DwcHw.h" > > @@ -1548,7 +1549,7 @@ CreateDwUsbHc ( > DwHc->DwUsbOtgHc.ClearRootHubPortFeature = DwHcClearRootHubPortFeature; > DwHc->DwUsbOtgHc.MajorRevision = 0x02; > DwHc->DwUsbOtgHc.MinorRevision = 0x00; > - DwHc->DwUsbBase = DW2_USB_BASE_ADDRESS; > + DwHc->DwUsbBase = BCM2836_USB_BASE_ADDRESS; > > Pages = EFI_SIZE_TO_PAGES (DWC2_STATUS_BUF_SIZE); > DwHc->StatusBuffer = AllocatePages (Pages); > diff --git a/Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwcHw.h b/Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwcHw.h > index ddbf69a1d608..12fbde9ff6f2 100644 > --- a/Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwcHw.h > +++ b/Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwcHw.h > @@ -10,11 +10,7 @@ > #ifndef __DWCHW_H__ > #define __DWCHW_H__ > > -#define DW2_USB_OFFSET 0x00980000 > -#define DW2_USB_BASE_ADDRESS (FixedPcdGet64 (PcdBcm283xRegistersAddress) \ > - + DW2_USB_OFFSET) > - > -#define HSOTG_REG(x) (x) > +#define HSOTG_REG(x) (x) > > #define HCCHAR(_ch) HSOTG_REG(0x0500 + 0x20 * (_ch)) > #define HCSPLT(_ch) HSOTG_REG(0x0504 + 0x20 * (_ch)) > diff --git a/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836.h b/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836.h > index 7ba4877337a8..cee5fb6a4e15 100644 > --- a/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836.h > +++ b/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836.h > @@ -70,6 +70,11 @@ > #define BCM2836_INTC_TIMER_CONTROL_OFFSET 0x00000040 > #define BCM2836_INTC_TIMER_PENDING_OFFSET 0x00000060 > > +/* usb constants */ > +#define BCM2836_USB_OFFSET 0x00980000 > +#define BCM2836_USB_BASE_ADDRESS (BCM2836_SOC_REGISTERS + BCM2836_USB_OFFSET) > +#define BCM2836_USB_LENGTH 0x00010000 > + > /* uart constants */ > #define BCM2836_PL011_UART_OFFSET 0x00201000 > #define BCM2836_PL011_UART_BASE_ADDRESS (BCM2836_SOC_REGISTERS + BCM2836_PL011_UART_OFFSET) > Reviewed-by: Philippe Mathieu-Daude