From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qt0-x22b.google.com (mail-qt0-x22b.google.com [IPv6:2607:f8b0:400d:c0d::22b]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 0568321CE73E7 for ; Thu, 6 Jul 2017 07:53:11 -0700 (PDT) Received: by mail-qt0-x22b.google.com with SMTP id i2so4272805qta.3 for ; Thu, 06 Jul 2017 07:54:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=XJSeUUdj2z8QDlRhQ9Mi6OGOE86rJ0yN6nBccTATcfA=; b=AuKM1zfo+7wdoCN81T+DwaLS2FxT5lVuxSJ5YoSrVRuCirrWUCA6fSR2fUHDdNW6wL 5DwMxP2Ls7quTZc4L5lbOAX0mCE0zYLjE7+Yt8H1OBBXblrmf1pVfntMBA10ttRQuT+b 8Sem4ePpqhYXyrcn1TvMctgwpbrhDGZJKHgUI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=XJSeUUdj2z8QDlRhQ9Mi6OGOE86rJ0yN6nBccTATcfA=; b=EaSnKP93nvirNLBqEEfczHufeMU6M1RSgW5Q9RB9+EDmQaAUb0eZCtsWEuBwi+Ux7l k0LQ3TSvVrZ+MVLszgFJLtUj33lHmbzWFV3SLV336ZxtOPENHo3nG32WxPI2Jrd2AiJZ PQw503AOnWYt2a3rySSGZwyLr79Bdg8cL6xZsrJhBM4Sx3ohKCIbB6Xw3ryGKIWrxCDs uc1s1/HfzG+b2pa4GUtRq8EfQBcnEPqgwISvWPCvRbSeqDA+n0SCgl98guznFdwo5Gxo 326BjANAOXLP9ifaCoOk13zOHrhKEkTiQkf+086gg9D5FvMn7Ji9kPGIheEzmcYJmpbp G3qg== X-Gm-Message-State: AKS2vOzBfFXkgnlU5aJt1YfkoSUJYs8mKkBTQYtd7H8rCwzovw70jQtW ATbkCVpvZ+apoziRNP0/FDrz5RzSmvKf X-Received: by 10.200.54.38 with SMTP id m35mr64163854qtb.220.1499352890504; Thu, 06 Jul 2017 07:54:50 -0700 (PDT) MIME-Version: 1.0 Received: by 10.55.110.66 with HTTP; Thu, 6 Jul 2017 07:54:49 -0700 (PDT) In-Reply-To: <20170705163625.GH26676@bivouac.eciton.net> References: <1499183018-16297-1-git-send-email-jun.nie@linaro.org> <20170705163625.GH26676@bivouac.eciton.net> From: Jun Nie Date: Thu, 6 Jul 2017 22:54:49 +0800 Message-ID: To: Leif Lindholm Cc: Ard Biesheuvel , edk2-devel@lists.01.org, Evan Lloyd , Alexei.Fedorov@arm.com, Shawn Guo , Jason Liu Subject: Re: [PATCH v2] ArmPlatformPkg: Support different PL011 reg offset X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Jul 2017 14:53:11 -0000 Content-Type: text/plain; charset="UTF-8" 2017-07-06 0:36 GMT+08:00 Leif Lindholm : > On Tue, Jul 04, 2017 at 11:43:38PM +0800, Jun Nie wrote: >> ZTE/SanChip version pl011 has different reg offset and bit offset >> for some registers. >> >> Contributed-under: TianoCore Contribution Agreement 1.0 >> Signed-off-by: Jun Nie >> --- >> ArmPlatformPkg/ArmPlatformPkg.dec | 1 + >> ArmPlatformPkg/Drivers/PL011Uart/PL011Uart.inf | 1 + >> ArmPlatformPkg/Include/Drivers/PL011Uart.h | 29 ++++++++++++++++++++++++++ >> 3 files changed, 31 insertions(+) >> >> diff --git a/ArmPlatformPkg/ArmPlatformPkg.dec b/ArmPlatformPkg/ArmPlatformPkg.dec >> index d756fd2..3dd613c 100644 >> --- a/ArmPlatformPkg/ArmPlatformPkg.dec >> +++ b/ArmPlatformPkg/ArmPlatformPkg.dec >> @@ -97,6 +97,7 @@ >> gArmPlatformTokenSpaceGuid.PL011UartInteger|0|UINT32|0x00000020 >> gArmPlatformTokenSpaceGuid.PL011UartFractional|0|UINT32|0x0000002D >> gArmPlatformTokenSpaceGuid.PL011UartInterrupt|0x00000000|UINT32|0x0000002F >> + gArmPlatformTokenSpaceGuid.PL011UartZxRegOffset|0|UINT8|0 > > I'm basically OK with this patch, but if we have multiple variants of > this, as the Linux driver suggests, I think we're looking at something > more like PL011UartRegOffsetVariant, with a numerical value for each > special flavour. > >> >> ## PL011 Serial Debug UART >> gArmPlatformTokenSpaceGuid.PcdSerialDbgRegisterBase|0x00000000|UINT64|0x00000030 >> diff --git a/ArmPlatformPkg/Drivers/PL011Uart/PL011Uart.inf b/ArmPlatformPkg/Drivers/PL011Uart/PL011Uart.inf >> index 0154f3b..257fbc7 100644 >> --- a/ArmPlatformPkg/Drivers/PL011Uart/PL011Uart.inf >> +++ b/ArmPlatformPkg/Drivers/PL011Uart/PL011Uart.inf >> @@ -39,3 +39,4 @@ >> >> gArmPlatformTokenSpaceGuid.PL011UartInteger >> gArmPlatformTokenSpaceGuid.PL011UartFractional >> + gArmPlatformTokenSpaceGuid.PL011UartZxRegOffset >> diff --git a/ArmPlatformPkg/Include/Drivers/PL011Uart.h b/ArmPlatformPkg/Include/Drivers/PL011Uart.h >> index d5e88e8..09d548b 100644 >> --- a/ArmPlatformPkg/Include/Drivers/PL011Uart.h >> +++ b/ArmPlatformPkg/Include/Drivers/PL011Uart.h >> @@ -19,6 +19,7 @@ >> #include >> >> // PL011 Registers >> +#if !FixedPcdGet8 (PL011UartZxRegOffset) > > And as such, more a test like... > #if FixedPcdGet8 (PL011UartRegOffsetVariant) == PL011_VARIANT_ZTE Yes, it is more generic. Which header is proper file to add value definition of PL011_VARIANT_ZTE that can be included by platform.dsc? Jun > > / > Leif > >> #define UARTDR 0x000 >> #define UARTRSR 0x004 >> #define UARTECR 0x004 >> @@ -34,6 +35,22 @@ >> #define UARTMIS 0x040 >> #define UARTICR 0x044 >> #define UARTDMACR 0x048 >> +#else >> +#define UARTDR 0x004 >> +#define UARTRSR 0x010 >> +#define UARTECR 0x010 >> +#define UARTFR 0x014 >> +#define UARTIBRD 0x024 >> +#define UARTFBRD 0x028 >> +#define UARTLCR_H 0x030 >> +#define UARTCR 0x034 >> +#define UARTIFLS 0x038 >> +#define UARTIMSC 0x040 >> +#define UARTRIS 0x044 >> +#define UARTMIS 0x048 >> +#define UARTICR 0x04c >> +#define UARTDMACR 0x050 >> +#endif >> >> #define UARTPID0 0xFE0 >> #define UARTPID1 0xFE4 >> @@ -47,6 +64,7 @@ >> #define UART_STATUS_ERROR_MASK 0x0F >> >> // Flag reg bits >> +#if !FixedPcdGet8 (PL011UartZxRegOffset) >> #define PL011_UARTFR_RI (1 << 8) // Ring indicator >> #define PL011_UARTFR_TXFE (1 << 7) // Transmit FIFO empty >> #define PL011_UARTFR_RXFF (1 << 6) // Receive FIFO full >> @@ -56,6 +74,17 @@ >> #define PL011_UARTFR_DCD (1 << 2) // Data carrier detect >> #define PL011_UARTFR_DSR (1 << 1) // Data set ready >> #define PL011_UARTFR_CTS (1 << 0) // Clear to send >> +#else >> +#define PL011_UARTFR_RI (1 << 0) // Ring indicator >> +#define PL011_UARTFR_TXFE (1 << 7) // Transmit FIFO empty >> +#define PL011_UARTFR_RXFF (1 << 6) // Receive FIFO full >> +#define PL011_UARTFR_TXFF (1 << 5) // Transmit FIFO full >> +#define PL011_UARTFR_RXFE (1 << 4) // Receive FIFO empty >> +#define PL011_UARTFR_BUSY (1 << 8) // UART busy >> +#define PL011_UARTFR_DCD (1 << 2) // Data carrier detect >> +#define PL011_UARTFR_DSR (1 << 3) // Data set ready >> +#define PL011_UARTFR_CTS (1 << 1) // Clear to send >> +#endif >> >> // Flag reg bits - alternative names >> #define UART_TX_EMPTY_FLAG_MASK PL011_UARTFR_TXFE >> -- >> 1.9.1 >>