From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mx.groups.io with SMTP id smtpd.web10.10145.1574163510573493545 for ; Tue, 19 Nov 2019 03:38:31 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@akeo-ie.20150623.gappssmtp.com header.s=20150623 header.b=HclzFo2w; spf=none, err=permanent DNS error (domain: akeo.ie, ip: 209.85.221.42, mailfrom: pete@akeo.ie) Received: by mail-wr1-f42.google.com with SMTP id a15so23410975wrf.9 for ; Tue, 19 Nov 2019 03:38:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akeo-ie.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PaoQb60q4mJHkghYx9zI2MQUI0KdhEll5c9DuN16n5k=; b=HclzFo2wTJub0lMlPsm4UXGxWgRhIV7NLn/EJvkb6xmXEg++jmeowu0OMf3Swp8FsH oL4sB5E3aBj68GkqN8dbDglRJQCeMa6y4cysWIBOTJACWS4rTAt6yuLZkhC/nr5mUwPg ytQwGe7frHFPcyulBnzvp9yHxlN8xG4wvTbmmW+pK3xDW93oevyA9k9vR2qeMHLETtiT 0wVw0y5dH4aHZH6zIWbVIMcp0/gfwEhfxTFVY8xbYjB4Mau8qqFkZlLMb9Gf1a2/eRle vNXZCg5XWPRYB/T2Mw4N7kRLk9LEGO800XR8z4CwmruSDZm6ah4ukbtfaSzOAR3exbqh KsWw== 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:mime-version:content-transfer-encoding; bh=PaoQb60q4mJHkghYx9zI2MQUI0KdhEll5c9DuN16n5k=; b=bI3P9FNcmfxgI2WtqOWR8XRfc9T7y38iKZky0+miVYXxFBEBp5rVfkq5kID8XPLyIT XYkG982AvDrDA5OYQM04j4/P8OGopaP600RQA6zXocu9/RlLdu/CZJsMO4M5bxLGasfa GkVinESAcHQhOSQjS9GEQBmu1M8m6cJmKLtMXOeiNgKdfsoOoXSwP1YgvFnnSGv7JbYf aewqTVTCOGV85g3aiMTy5hVl8N+rEsdeXrS7a7Vnk4chRAtEAlzEBlC0AB24/ScrP6b9 gJxAb+xp8Gh9mdhqUVYHzToErfqZw3F2wHDIaFGUWeNNQcXoVt0B5ug/yptgtfICHQ/Q 5S3w== X-Gm-Message-State: APjAAAWM/qVvkKcyaAI0Kf1XmHBJ7HrkMw+8VekKBMlbjn1TU9vgZ4oZ 71U+x5hK7Ce+pcyZ0z7hBQ5md1ERj1s= X-Google-Smtp-Source: APXvYqyAu3xE1frE+pqOQcrOjS+VzHh1/DQct4L4L65uyR3aic4jA9ikYR9Dob2/wQ6j1+odpynpvg== X-Received: by 2002:a05:6000:10c5:: with SMTP id b5mr38519976wrx.121.1574163508806; Tue, 19 Nov 2019 03:38:28 -0800 (PST) Return-Path: Received: from localhost.localdomain ([84.203.67.47]) by smtp.gmail.com with ESMTPSA id j66sm2608273wma.19.2019.11.19.03.38.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Nov 2019 03:38:28 -0800 (PST) From: "Pete Batard" To: devel@edk2.groups.io Cc: ard.biesheuvel@linaro.org, leif.lindholm@linaro.org, philmd@redhat.com, samer.el-haj-mahmoud@arm.com Subject: [edk2-platforms][PATCH v2 4/7] Platform/RPi: Use offsets for Bcm238x SoC register addresses Date: Tue, 19 Nov 2019 11:38:06 +0000 Message-Id: <20191119113809.2472-5-pete@akeo.ie> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20191119113809.2472-1-pete@akeo.ie> References: <20191119113809.2472-1-pete@akeo.ie> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Samer El-Haj-Mahmoud Remove hardcoded base addresses for Mailbox, Watchdog, SDIO and DW2 USB and use an offset indexed on PcdBcm283xRegistersAddress instead. This is needed in preparation for adding Raspberry Pi 4 support. Signed-off-by: Pete Batard --- Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwcHw.h | 4 +++- Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836.h | 8 ++++++-- Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836Sdio.h | 4 +++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwcHw.h b/Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwcHw.h index 88fd93934fd3..ddbf69a1d608 100644 --- a/Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwcHw.h +++ b/Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwcHw.h @@ -10,7 +10,9 @@ #ifndef __DWCHW_H__ #define __DWCHW_H__ -#define DW2_USB_BASE_ADDRESS 0x3f980000 +#define DW2_USB_OFFSET 0x00980000 +#define DW2_USB_BASE_ADDRESS (FixedPcdGet64 (PcdBcm283xRegistersAddress) \ + + DW2_USB_OFFSET) #define HSOTG_REG(x) (x) diff --git a/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836.h b/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836.h index 8bd68c234bfd..72c8e9dc4b14 100644 --- a/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836.h +++ b/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836.h @@ -23,7 +23,9 @@ #define BCM2836_DMA_DEVICE_OFFSET 0xc0000000 /* watchdog constants */ -#define BCM2836_WDOG_BASE_ADDRESS 0x3f100000 +#define BCM2836_WDOG_OFFSET 0x00100000 +#define BCM2836_WDOG_BASE_ADDRESS (FixedPcdGet64 (PcdBcm283xRegistersAddress) \ + + BCM2836_WDOG_OFFSET) #define BCM2836_WDOG_PASSWORD 0x5a000000 #define BCM2836_WDOG_RSTC_OFFSET 0x0000001c #define BCM2836_WDOG_WDOG_OFFSET 0x00000024 @@ -31,7 +33,9 @@ #define BCM2836_WDOG_RSTC_WRCFG_FULL_RESET 0x00000020 /* mailbox interface constants */ -#define BCM2836_MBOX_BASE_ADDRESS 0x3f00b880 +#define BCM2836_MBOX_OFFSET 0x0000b880 +#define BCM2836_MBOX_BASE_ADDRESS (FixedPcdGet64 (PcdBcm283xRegistersAddress) \ + + BCM2836_MBOX_OFFSET) #define BCM2836_MBOX_READ_OFFSET 0x00000000 #define BCM2836_MBOX_STATUS_OFFSET 0x00000018 #define BCM2836_MBOX_CONFIG_OFFSET 0x0000001c diff --git a/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836Sdio.h b/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836Sdio.h index fb0d02904156..708a1d7a4f47 100644 --- a/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836Sdio.h +++ b/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836Sdio.h @@ -10,7 +10,9 @@ #define __BCM2836_SDIO_H__ //MMC/SD/SDIO1 register definitions. -#define MMCHS1BASE 0x3F300000 +#define MMCHS1_OFFSET 0x00300000 +#define MMCHS1BASE (FixedPcdGet64 (PcdBcm283xRegistersAddress) \ + + MMCHS1_OFFSET) #define MMCHS_BLK (MMCHS1BASE + 0x4) #define BLEN_512BYTES (0x200UL << 0) -- 2.21.0.windows.1