From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by mx.groups.io with SMTP id smtpd.web12.496.1582225539360793076 for ; Thu, 20 Feb 2020 11:05:39 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@nuviainc-com.20150623.gappssmtp.com header.s=20150623 header.b=nXgLImXT; spf=pass (domain: nuviainc.com, ip: 209.85.221.67, mailfrom: leif@nuviainc.com) Received: by mail-wr1-f67.google.com with SMTP id n10so5907682wrm.1 for ; Thu, 20 Feb 2020 11:05:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nuviainc-com.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=0EmMbnZPXWQExP3eV4g30l/sAcV+NGLDvoeFNsy0jOw=; b=nXgLImXTA99xhuxPYXOHdKRQUvXtCEaBekIwmtAb/OX1nqtxYKWCqS5VUk8z5ieEKe laaTQmv8plw2gi8VGtG9G/tX7nnevl6uQXN74b1VxMg8dE70jOAnnhUiTQ9FPTNV2zzr 3HJ+Ab9JgLuIk0QBBMZKZ8jHePn1YhPeR+2kf8X16MtA9V7ZdCGu9zoEMfAeW9+2Ige6 a00zW0aTIpYnnaOWSs1mjNsGaMR9VY7XW/pl7iNmAHC5AXIGwGS0ADDkilDl8rmyI9F2 lChSHa21q5LsWgpLwkQlqXmrqkpDoq4vhPgc2y+uy9LLaCdzTkn9oxayyOFgkOenb7sW y7pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=0EmMbnZPXWQExP3eV4g30l/sAcV+NGLDvoeFNsy0jOw=; b=EorqDobhb8GWOxKHrgrzRpgZ7AQxgxq+kvXezT/FVMp446TsjI9Ebb7mGoRJ0+II2H DE/PeWCaLPexS240Mivu545vlxK0wylcxJ5OEQyRgepmfmQwElJZnHgPRMfn3jUNCJqp N88PE7hZlVT7DUUClMoWdoCMTvoBXfbvUTVH7xOoiCQKLD8GqWmH0YqR0CVRwl475USj oy9cJvSCc35UP+wJpAgV3zkn/BD7yIK4OebsKTHkzwwUatXGVi/r06fUEJdbNDPQf75v YVUIOygZcvtwE650nRxWMuoN7SNjZyQmO1sQva/S8MwdW1HKzXcE9w1hADqIK1X1Uuyt lcJA== X-Gm-Message-State: APjAAAVlYpvQXU8MAtcbLgxGqyI8+7WchI21VCUxTNAS7aDQUheWPEwf tx3Rzcxt0Sr9jYshsUprGjDSFw== X-Google-Smtp-Source: APXvYqwfWv7UhQZSfOJriaDArB43h1IMOQ9z6/L4QZibQoGT/6AmUxW4uSUyfY0HyU3CdgtHmdVb2g== X-Received: by 2002:adf:de86:: with SMTP id w6mr45554824wrl.115.1582225537637; Thu, 20 Feb 2020 11:05:37 -0800 (PST) Return-Path: Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id c15sm626488wrt.1.2020.02.20.11.05.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2020 11:05:37 -0800 (PST) Date: Thu, 20 Feb 2020 19:05:35 +0000 From: "Leif Lindholm" To: Pankaj Bansal Cc: Meenakshi Aggarwal , Michael D Kinney , Varun Sethi , "devel@edk2.groups.io" Subject: Re: [PATCH 07/19] Silicon/NXP: remove not needed components Message-ID: <20200220190535.GI23627@bivouac.eciton.net> References: <20200207124328.8723-1-pankaj.bansal@nxp.com> <20200207124328.8723-8-pankaj.bansal@nxp.com> <20200210171141.GL23627@bivouac.eciton.net> MIME-Version: 1.0 In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Tue, Feb 11, 2020 at 07:24:04 +0000, Pankaj Bansal wrote: > > On Fri, Feb 07, 2020 at 18:13:16 +0530, Pankaj Bansal wrote: > > > We are changing the directory structure of code. > > > After PEI phase impelmentation this info would be put back into > > > appropriate location. > > > > The message needs clarifying: > > What is being deleted, why is this not a problem, and what is being put back? > > The structures elements and functions that are not necessary for > booting are being deleted. Once the directory structure has been > changed (i.e. we have clear distinction between chassis code and > header files and SOC code and header files), we will put back the > code and structure components back at their appropriate respective > place. I'm going to be honest here. I'm not super happy about code just merged (after 3 years) being pulled back out to simplify further upstreaming... > Also right now all the elements are being defined in structures, > which are not being used right now. So to simplify the review, I > have removed those for now. When we need to use those elements, we > can define those one by one. ...to then be put back afterwards. To be blunt, this looks like extra effort for me in order to keep your project managers happy... (yes, I realise it is also extra effort for you). ...but I can go along with this if you remain as responsive and receptive to feedback as you have so far. Let's just not do this again. Best Regards, Leif > > > > / > > Leif > > > > > Signed-off-by: Pankaj Bansal > > > --- > > > Silicon/NXP/Include/Chassis2/NxpSoc.h | 314 +--------------------- > > > Silicon/NXP/Library/SocLib/Chassis.c | 15 -- > > > Silicon/NXP/Library/SocLib/Chassis2/Soc.c | 79 ------ > > > 3 files changed, 2 insertions(+), 406 deletions(-) > > > > > > diff --git a/Silicon/NXP/Include/Chassis2/NxpSoc.h > > > b/Silicon/NXP/Include/Chassis2/NxpSoc.h > > > index f05a813750..74330b6205 100644 > > > --- a/Silicon/NXP/Include/Chassis2/NxpSoc.h > > > +++ b/Silicon/NXP/Include/Chassis2/NxpSoc.h > > > @@ -1,7 +1,7 @@ > > > /** Soc.h > > > * Header defining the Base addresses, sizes, flags etc for chassis 1 > > > * > > > -* Copyright 2017-2019 NXP > > > +* Copyright 2017-2020 NXP > > > * > > > * SPDX-License-Identifier: BSD-2-Clause-Patent > > > * > > > @@ -10,22 +10,7 @@ > > > #ifndef NXP_SOC_H_ > > > #define NXP_SOC_H_ > > > > > > -#define HWA_CGA_M1_CLK_SEL 0xe0000000 > > > -#define HWA_CGA_M1_CLK_SHIFT 29 > > > - > > > -#define TP_CLUSTER_EOC_MASK 0xc0000000 /* end of clusters mask */ > > > -#define NUM_CC_PLLS 2 > > > #define CLK_FREQ 100000000 > > > -#define MAX_CPUS 4 > > > -#define NUM_FMAN 1 > > > -#define CHECK_CLUSTER(Cluster) ((Cluster & TP_CLUSTER_EOC_MASK) == > > 0x0) > > > - > > > -/* RCW SERDES MACRO */ > > > -#define RCWSR_INDEX 4 > > > -#define RCWSR_SRDS1_PRTCL_MASK 0xffff0000 > > > -#define RCWSR_SRDS1_PRTCL_SHIFT 16 > > > -#define RCWSR_SRDS2_PRTCL_MASK 0x0000ffff > > > -#define RCWSR_SRDS2_PRTCL_SHIFT 0 > > > > > > /* SMMU Defintions */ > > > #define SMMU_BASE_ADDR 0x09000000 > > > @@ -41,312 +26,17 @@ > > > #define IDR1_PAGESIZE_MASK 0x80000000 > > > > > > typedef struct { > > > - UINTN FreqProcessor[MAX_CPUS]; > > > UINTN FreqSystemBus; > > > - UINTN FreqDdrBus; > > > - UINTN FreqLocalBus; > > > - UINTN FreqSdhc; > > > - UINTN FreqFman[NUM_FMAN]; > > > - UINTN FreqQman; > > > } SYS_INFO; > > > > > > /* Device Configuration and Pin Control */ typedef struct { > > > - UINT32 PorSr1; /* POR status 1 */ > > > -#define CHASSIS2_CCSR_PORSR1_RCW_MASK 0xFF800000 > > > - UINT32 PorSr2; /* POR status 2 */ > > > - UINT8 Res008[0x20-0x8]; > > > - UINT32 GppOrCr1; /* General-purpose POR configuration */ > > > - UINT32 GppOrCr2; > > > - UINT32 DcfgFuseSr; /* Fuse status register */ > > > - UINT8 Res02c[0x70-0x2c]; > > > - UINT32 DevDisr; /* Device disable control */ > > > - UINT32 DevDisr2; /* Device disable control 2 */ > > > - UINT32 DevDisr3; /* Device disable control 3 */ > > > - UINT32 DevDisr4; /* Device disable control 4 */ > > > - UINT32 DevDisr5; /* Device disable control 5 */ > > > - UINT32 DevDisr6; /* Device disable control 6 */ > > > - UINT32 DevDisr7; /* Device disable control 7 */ > > > - UINT8 Res08c[0x94-0x8c]; > > > - UINT32 CoreDisrU; /* uppper portion for support of 64 cores */ > > > - UINT32 CoreDisrL; /* lower portion for support of 64 cores */ > > > - UINT8 Res09c[0xa0-0x9c]; > > > - UINT32 Pvr; /* Processor version */ > > > - UINT32 Svr; /* System version */ > > > - UINT32 Mvr; /* Manufacturing version */ > > > - UINT8 Res0ac[0xb0-0xac]; > > > - UINT32 RstCr; /* Reset control */ > > > - UINT32 RstRqPblSr; /* Reset request preboot loader status */ > > > - UINT8 Res0b8[0xc0-0xb8]; > > > - UINT32 RstRqMr1; /* Reset request mask */ > > > - UINT8 Res0c4[0xc8-0xc4]; > > > - UINT32 RstRqSr1; /* Reset request status */ > > > - UINT8 Res0cc[0xd4-0xcc]; > > > - UINT32 RstRqWdTmrL; /* Reset request WDT mask */ > > > - UINT8 Res0d8[0xdc-0xd8]; > > > - UINT32 RstRqWdtSrL; /* Reset request WDT status */ > > > - UINT8 Res0e0[0xe4-0xe0]; > > > - UINT32 BrrL; /* Boot release */ > > > - UINT8 Res0e8[0x100-0xe8]; > > > + UINT8 Res0[0x100-0x00]; > > > UINT32 RcwSr[16]; /* Reset control word status */ > > > #define CHASSIS2_RCWSR0_SYS_PLL_RAT_SHIFT 25 #define > > > CHASSIS2_RCWSR0_SYS_PLL_RAT_MASK 0x1f -#define > > > CHASSIS2_RCWSR0_MEM_PLL_RAT_SHIFT 16 -#define > > > CHASSIS2_RCWSR0_MEM_PLL_RAT_MASK 0x3f > > > - UINT8 Res140[0x200-0x140]; > > > - UINT32 ScratchRw[4]; /* Scratch Read/Write */ > > > - UINT8 Res210[0x300-0x210]; > > > - UINT32 ScratcHw1R[4]; /* Scratch Read (Write once) */ > > > - UINT8 Res310[0x400-0x310]; > > > - UINT32 CrstSr[12]; > > > - UINT8 Res430[0x500-0x430]; > > > - /* PCI Express n Logical I/O Device Number register */ > > > - UINT32 DcfgCcsrPex1LiodNr; > > > - UINT32 DcfgCcsrPex2LiodNr; > > > - UINT32 DcfgCcsrPex3LiodNr; > > > - UINT32 DcfgCcsrPex4LiodNr; > > > - /* RIO n Logical I/O Device Number register */ > > > - UINT32 DcfgCcsrRio1LiodNr; > > > - UINT32 DcfgCcsrRio2LiodNr; > > > - UINT32 DcfgCcsrRio3LiodNr; > > > - UINT32 DcfgCcsrRio4LiodNr; > > > - /* USB Logical I/O Device Number register */ > > > - UINT32 DcfgCcsrUsb1LiodNr; > > > - UINT32 DcfgCcsrUsb2LiodNr; > > > - UINT32 DcfgCcsrUsb3LiodNr; > > > - UINT32 DcfgCcsrUsb4LiodNr; > > > - /* SD/MMC Logical I/O Device Number register */ > > > - UINT32 DcfgCcsrSdMmc1LiodNr; > > > - UINT32 DcfgCcsrSdMmc2LiodNr; > > > - UINT32 DcfgCcsrSdMmc3LiodNr; > > > - UINT32 DcfgCcsrSdMmc4LiodNr; > > > - /* RIO Message Unit Logical I/O Device Number register */ > > > - UINT32 DcfgCcsrRiomaintLiodNr; > > > - UINT8 Res544[0x550-0x544]; > > > - UINT32 SataLiodNr[4]; > > > - UINT8 Res560[0x570-0x560]; > > > - UINT32 DcfgCcsrMisc1LiodNr; > > > - UINT32 DcfgCcsrMisc2LiodNr; > > > - UINT32 DcfgCcsrMisc3LiodNr; > > > - UINT32 DcfgCcsrMisc4LiodNr; > > > - UINT32 DcfgCcsrDma1LiodNr; > > > - UINT32 DcfgCcsrDma2LiodNr; > > > - UINT32 DcfgCcsrDma3LiodNr; > > > - UINT32 DcfgCcsrDma4LiodNr; > > > - UINT32 DcfgCcsrSpare1LiodNr; > > > - UINT32 DcfgCcsrSpare2LiodNr; > > > - UINT32 DcfgCcsrSpare3LiodNr; > > > - UINT32 DcfgCcsrSpare4LiodNr; > > > - UINT8 Res5a0[0x600-0x5a0]; > > > - UINT32 DcfgCcsrPblSr; > > > - UINT32 PamuBypENr; > > > - UINT32 DmaCr1; > > > - UINT8 Res60c[0x610-0x60c]; > > > - UINT32 DcfgCcsrGenSr1; > > > - UINT32 DcfgCcsrGenSr2; > > > - UINT32 DcfgCcsrGenSr3; > > > - UINT32 DcfgCcsrGenSr4; > > > - UINT32 DcfgCcsrGenCr1; > > > - UINT32 DcfgCcsrGenCr2; > > > - UINT32 DcfgCcsrGenCr3; > > > - UINT32 DcfgCcsrGenCr4; > > > - UINT32 DcfgCcsrGenCr5; > > > - UINT32 DcfgCcsrGenCr6; > > > - UINT32 DcfgCcsrGenCr7; > > > - UINT8 Res63c[0x658-0x63c]; > > > - UINT32 DcfgCcsrcGenSr1; > > > - UINT32 DcfgCcsrcGenSr0; > > > - UINT8 Res660[0x678-0x660]; > > > - UINT32 DcfgCcsrcGenCr1; > > > - UINT32 DcfgCcsrcGenCr0; > > > - UINT8 Res680[0x700-0x680]; > > > - UINT32 DcfgCcsrSrIoPstecr; > > > - UINT32 DcfgCcsrDcsrCr; > > > - UINT8 Res708[0x740-0x708]; /* add more registers when needed */ > > > - UINT32 TpItyp[64]; /* Topology Initiator Type Register */ > > > - struct { > > > - UINT32 Upper; > > > - UINT32 Lower; > > > - } TpCluster[16]; > > > - UINT8 Res8c0[0xa00-0x8c0]; /* add more registers when needed */ > > > - UINT32 DcfgCcsrQmBmWarmRst; > > > - UINT8 Resa04[0xa20-0xa04]; /* add more registers when needed */ > > > - UINT32 DcfgCcsrReserved0; > > > - UINT32 DcfgCcsrReserved1; > > > } CCSR_GUR; > > > > > > -/* Supplemental Configuration Unit */ -typedef struct { > > > - UINT8 Res000[0x070-0x000]; > > > - UINT32 Usb1Prm1Cr; > > > - UINT32 Usb1Prm2Cr; > > > - UINT32 Usb1Prm3Cr; > > > - UINT32 Usb2Prm1Cr; > > > - UINT32 Usb2Prm2Cr; > > > - UINT32 Usb2Prm3Cr; > > > - UINT32 Usb3Prm1Cr; > > > - UINT32 Usb3Prm2Cr; > > > - UINT32 Usb3Prm3Cr; > > > - UINT8 Res094[0x100-0x094]; > > > - UINT32 Usb2Icid; > > > - UINT32 Usb3Icid; > > > - UINT8 Res108[0x114-0x108]; > > > - UINT32 DmaIcid; > > > - UINT32 SataIcid; > > > - UINT32 Usb1Icid; > > > - UINT32 QeIcid; > > > - UINT32 SdhcIcid; > > > - UINT32 EdmaIcid; > > > - UINT32 EtrIcid; > > > - UINT32 Core0SftRst; > > > - UINT32 Core1SftRst; > > > - UINT32 Core2SftRst; > > > - UINT32 Core3SftRst; > > > - UINT8 Res140[0x158-0x140]; > > > - UINT32 AltCBar; > > > - UINT32 QspiCfg; > > > - UINT8 Res160[0x180-0x160]; > > > - UINT32 DmaMcr; > > > - UINT8 Res184[0x188-0x184]; > > > - UINT32 GicAlign; > > > - UINT32 DebugIcid; > > > - UINT8 Res190[0x1a4-0x190]; > > > - UINT32 SnpCnfGcr; > > > -#define CCSR_SCFG_SNPCNFGCR_SECRDSNP BIT31 > > > -#define CCSR_SCFG_SNPCNFGCR_SECWRSNP BIT30 > > > -#define CCSR_SCFG_SNPCNFGCR_SATARDSNP BIT23 > > > -#define CCSR_SCFG_SNPCNFGCR_SATAWRSNP BIT22 > > > -#define CCSR_SCFG_SNPCNFGCR_USB1RDSNP BIT21 > > > -#define CCSR_SCFG_SNPCNFGCR_USB1WRSNP BIT20 > > > -#define CCSR_SCFG_SNPCNFGCR_USB2RDSNP BIT15 > > > -#define CCSR_SCFG_SNPCNFGCR_USB2WRSNP BIT16 > > > -#define CCSR_SCFG_SNPCNFGCR_USB3RDSNP BIT13 > > > -#define CCSR_SCFG_SNPCNFGCR_USB3WRSNP BIT14 > > > - UINT8 Res1a8[0x1ac-0x1a8]; > > > - UINT32 IntpCr; > > > - UINT8 Res1b0[0x204-0x1b0]; > > > - UINT32 CoreSrEnCr; > > > - UINT8 Res208[0x220-0x208]; > > > - UINT32 RvBar00; > > > - UINT32 RvBar01; > > > - UINT32 RvBar10; > > > - UINT32 RvBar11; > > > - UINT32 RvBar20; > > > - UINT32 RvBar21; > > > - UINT32 RvBar30; > > > - UINT32 RvBar31; > > > - UINT32 LpmCsr; > > > - UINT8 Res244[0x400-0x244]; > > > - UINT32 QspIdQScr; > > > - UINT32 EcgTxcMcr; > > > - UINT32 SdhcIoVSelCr; > > > - UINT32 RcwPMuxCr0; > > > - /**Setting RCW PinMux Register bits 17-19 to select USB2_DRVVBUS > > > - *Setting RCW PinMux Register bits 21-23 to select USB2_PWRFAULT > > > - *Setting RCW PinMux Register bits 25-27 to select USB3_DRVVBUS > > > - Setting RCW PinMux Register bits 29-31 to select USB3_DRVVBUS*/ > > > -#define CCSR_SCFG_RCWPMUXCRO_SELCR_USB 0x3333 > > > - /**Setting RCW PinMux Register bits 17-19 to select USB2_DRVVBUS > > > - *Setting RCW PinMux Register bits 21-23 to select USB2_PWRFAULT > > > - *Setting RCW PinMux Register bits 25-27 to select IIC4_SCL > > > - Setting RCW PinMux Register bits 29-31 to select IIC4_SDA*/ > > > -#define CCSR_SCFG_RCWPMUXCRO_NOT_SELCR_USB 0x3300 > > > - UINT32 UsbDrvVBusSelCr; > > > -#define CCSR_SCFG_USBDRVVBUS_SELCR_USB1 0x00000000 > > > -#define CCSR_SCFG_USBDRVVBUS_SELCR_USB2 0x00000001 > > > -#define CCSR_SCFG_USBDRVVBUS_SELCR_USB3 0x00000003 > > > - UINT32 UsbPwrFaultSelCr; > > > -#define CCSR_SCFG_USBPWRFAULT_INACTIVE 0x00000000 > > > -#define CCSR_SCFG_USBPWRFAULT_SHARED 0x00000001 > > > -#define CCSR_SCFG_USBPWRFAULT_DEDICATED 0x00000002 > > > -#define CCSR_SCFG_USBPWRFAULT_USB3_SHIFT 4 > > > -#define CCSR_SCFG_USBPWRFAULT_USB2_SHIFT 2 > > > -#define CCSR_SCFG_USBPWRFAULT_USB1_SHIFT 0 > > > - UINT32 UsbRefclkSelcr1; > > > - UINT32 UsbRefclkSelcr2; > > > - UINT32 UsbRefclkSelcr3; > > > - UINT8 Res424[0x600-0x424]; > > > - UINT32 ScratchRw[4]; > > > - UINT8 Res610[0x680-0x610]; > > > - UINT32 CoreBCr; > > > - UINT8 Res684[0x1000-0x684]; > > > - UINT32 Pex1MsiIr; > > > - UINT32 Pex1MsiR; > > > - UINT8 Res1008[0x2000-0x1008]; > > > - UINT32 Pex2; > > > - UINT32 Pex2MsiR; > > > - UINT8 Res2008[0x3000-0x2008]; > > > - UINT32 Pex3MsiIr; > > > - UINT32 Pex3MsiR; > > > -} CCSR_SCFG; > > > - > > > -#define USB_TXVREFTUNE 0x9 > > > -#define USB_SQRXTUNE 0xFC7FFFFF > > > -#define USB_PCSTXSWINGFULL 0x47 > > > -#define USB_PHY_RX_EQ_VAL_1 0x0000 > > > -#define USB_PHY_RX_EQ_VAL_2 0x8000 > > > -#define USB_PHY_RX_EQ_VAL_3 0x8003 > > > -#define USB_PHY_RX_EQ_VAL_4 0x800b > > > - > > > -/*USB_PHY_SS memory map*/ > > > -typedef struct { > > > - UINT16 IpIdcodeLo; > > > - UINT16 SupIdcodeHi; > > > - UINT8 Res4[0x0006-0x0004]; > > > - UINT16 RtuneDebug; > > > - UINT16 RtuneStat; > > > - UINT16 SupSsPhase; > > > - UINT16 SsFreq; > > > - UINT8 ResE[0x0020-0x000e]; > > > - UINT16 Ateovrd; > > > - UINT16 MpllOvrdInLo; > > > - UINT8 Res24[0x0026-0x0024]; > > > - UINT16 SscOvrdIn; > > > - UINT8 Res28[0x002A-0x0028]; > > > - UINT16 LevelOvrdIn; > > > - UINT8 Res2C[0x0044-0x002C]; > > > - UINT16 ScopeCount; > > > - UINT8 Res46[0x0060-0x0046]; > > > - UINT16 MpllLoopCtl; > > > - UINT8 Res62[0x006C-0x0062]; > > > - UINT16 SscClkCntrl; > > > - UINT8 Res6E[0x2002-0x006E]; > > > - UINT16 Lane0TxOvrdInHi; > > > - UINT16 Lane0TxOvrdDrvLo; > > > - UINT8 Res2006[0x200C-0x2006]; > > > - UINT16 Lane0RxOvrdInHi; > > > - UINT8 Res200E[0x2022-0x200E]; > > > - UINT16 Lane0TxCmWaitTimeOvrd; > > > - UINT8 Res2024[0x202A-0x2024]; > > > - UINT16 Lane0TxLbertCtl; > > > - UINT16 Lane0RxLbertCtl; > > > - UINT16 Lane0RxLbertErr; > > > - UINT8 Res2030[0x205A-0x2030]; > > > - UINT16 Lane0TxAltBlock; > > > -} CCSR_USB_PHY; > > > - > > > -/* Clocking */ > > > -typedef struct { > > > - struct { > > > - UINT32 ClkCnCSr; /* core cluster n clock control status */ > > > - UINT8 Res004[0x0c]; > > > - UINT32 ClkcGHwAcSr; /* Clock generator n hardware accelerator */ > > > - UINT8 Res014[0x0c]; > > > - } ClkcSr[4]; > > > - UINT8 Res040[0x780]; /* 0x100 */ > > > - struct { > > > - UINT32 PllCnGSr; > > > - UINT8 Res804[0x1c]; > > > - } PllCgSr[NUM_CC_PLLS]; > > > - UINT8 Res840[0x1c0]; > > > - UINT32 ClkPCSr; /* 0xa00 Platform clock domain control/status */ > > > - UINT8 Resa04[0x1fc]; > > > - UINT32 PllPGSr; /* 0xc00 Platform PLL General Status */ > > > - UINT8 Resc04[0x1c]; > > > - UINT32 PllDGSr; /* 0xc20 DDR PLL General Status */ > > > - UINT8 Resc24[0x3dc]; > > > -} CCSR_CLOCK; > > > - > > > VOID > > > GetSysInfo ( > > > OUT SYS_INFO * > > > diff --git a/Silicon/NXP/Library/SocLib/Chassis.c > > > b/Silicon/NXP/Library/SocLib/Chassis.c > > > index 18a1f5e4e1..847331a631 100644 > > > --- a/Silicon/NXP/Library/SocLib/Chassis.c > > > +++ b/Silicon/NXP/Library/SocLib/Chassis.c > > > @@ -53,21 +53,6 @@ GetBusFrequency ( > > > return SocSysInfo.FreqSystemBus; > > > } > > > > > > -/* > > > - * Return SDXC bus frequency > > > - */ > > > -UINT64 > > > -GetSdxcFrequency ( > > > - VOID > > > - ) > > > -{ > > > - SYS_INFO SocSysInfo; > > > - > > > - GetSysInfo (&SocSysInfo); > > > - > > > - return SocSysInfo.FreqSdhc; > > > -} > > > - > > > /* > > > * Setup SMMU in bypass mode > > > * and also set its pagesize > > > diff --git a/Silicon/NXP/Library/SocLib/Chassis2/Soc.c > > > b/Silicon/NXP/Library/SocLib/Chassis2/Soc.c > > > index 3d803716c9..9baeb17ecf 100644 > > > --- a/Silicon/NXP/Library/SocLib/Chassis2/Soc.c > > > +++ b/Silicon/NXP/Library/SocLib/Chassis2/Soc.c > > > @@ -32,38 +32,14 @@ GetSysInfo ( > > > ) > > > { > > > CCSR_GUR *GurBase; > > > - CCSR_CLOCK *ClkBase; > > > - UINTN CpuIndex; > > > - UINT32 TempRcw; > > > - UINT32 CPllSel; > > > - UINT32 CplxPll; > > > - CONST UINT8 CoreCplxPll[8] = { > > > - [0] = 0, /* CC1 PPL / 1 */ > > > - [1] = 0, /* CC1 PPL / 2 */ > > > - [4] = 1, /* CC2 PPL / 1 */ > > > - [5] = 1, /* CC2 PPL / 2 */ > > > - }; > > > - > > > - CONST UINT8 CoreCplxPllDivisor[8] = { > > > - [0] = 1, /* CC1 PPL / 1 */ > > > - [1] = 2, /* CC1 PPL / 2 */ > > > - [4] = 1, /* CC2 PPL / 1 */ > > > - [5] = 2, /* CC2 PPL / 2 */ > > > - }; > > > - > > > - UINTN PllCount; > > > - UINTN FreqCPll[NUM_CC_PLLS]; > > > - UINTN PllRatio[NUM_CC_PLLS]; > > > UINTN SysClk; > > > > > > GurBase = (VOID *)PcdGet64 (PcdGutsBaseAddr); > > > - ClkBase = (VOID *)PcdGet64 (PcdClkBaseAddr); > > > SysClk = CLK_FREQ; > > > > > > SetMem (PtrSysInfo, sizeof (SYS_INFO), 0); > > > > > > PtrSysInfo->FreqSystemBus = SysClk; > > > - PtrSysInfo->FreqDdrBus = SysClk; > > > > > > // > > > // selects the platform clock:SYSCLK ratio and calculate @@ -72,61 > > > +48,6 @@ GetSysInfo ( > > > PtrSysInfo->FreqSystemBus *= (GurRead ((UINTN)&GurBase->RcwSr[0]) >> > > > CHASSIS2_RCWSR0_SYS_PLL_RAT_SHIFT) & > > > CHASSIS2_RCWSR0_SYS_PLL_RAT_MASK; > > > - // > > > - // selects the DDR PLL:SYSCLK Ratio and calculate DDR frequency > > > - // > > > - PtrSysInfo->FreqDdrBus *= (GurRead ((UINTN)&GurBase->RcwSr[0]) >> > > > - CHASSIS2_RCWSR0_MEM_PLL_RAT_SHIFT) & > > > - CHASSIS2_RCWSR0_MEM_PLL_RAT_MASK; > > > - > > > - for (PllCount = 0; PllCount < NUM_CC_PLLS; PllCount++) { > > > - PllRatio[PllCount] = (GurRead ((UINTN)&ClkBase- > > >PllCgSr[PllCount].PllCnGSr) >> 1) & 0xff; > > > - if (PllRatio[PllCount] > 4) { > > > - FreqCPll[PllCount] = SysClk * PllRatio[PllCount]; > > > - } else { > > > - FreqCPll[PllCount] = PtrSysInfo->FreqSystemBus * PllRatio[PllCount]; > > > - } > > > - } > > > - > > > - // > > > - // Calculate Core frequency > > > - // > > > - for (CpuIndex = 0; CpuIndex < MAX_CPUS; CpuIndex++) { > > > - CPllSel = (GurRead ((UINTN)&ClkBase->ClkcSr[CpuIndex].ClkCnCSr) >> 27) & > > 0xf; > > > - CplxPll = CoreCplxPll[CPllSel]; > > > - > > > - PtrSysInfo->FreqProcessor[CpuIndex] = FreqCPll[CplxPll] / > > CoreCplxPllDivisor[CPllSel]; > > > - } > > > - > > > - // > > > - // Calculate FMAN frequency > > > - // > > > - TempRcw = GurRead ((UINTN)&GurBase->RcwSr[7]); > > > - switch ((TempRcw & HWA_CGA_M1_CLK_SEL) >> HWA_CGA_M1_CLK_SHIFT) > > { > > > - case 2: > > > - PtrSysInfo->FreqFman[0] = FreqCPll[0] / 2; > > > - break; > > > - case 3: > > > - PtrSysInfo->FreqFman[0] = FreqCPll[0] / 3; > > > - break; > > > - case 4: > > > - PtrSysInfo->FreqFman[0] = FreqCPll[0] / 4; > > > - break; > > > - case 5: > > > - PtrSysInfo->FreqFman[0] = PtrSysInfo->FreqSystemBus; > > > - break; > > > - case 6: > > > - PtrSysInfo->FreqFman[0] = FreqCPll[1] / 2; > > > - break; > > > - case 7: > > > - PtrSysInfo->FreqFman[0] = FreqCPll[1] / 3; > > > - break; > > > - default: > > > - DEBUG ((DEBUG_WARN, "Error: Unknown FMan1 clock select!\n")); > > > - break; > > > - } > > > - PtrSysInfo->FreqSdhc = PtrSysInfo->FreqSystemBus/PcdGet32 > > > (PcdPlatformFreqDiv); > > > - PtrSysInfo->FreqQman = PtrSysInfo->FreqSystemBus/PcdGet32 > > > (PcdPlatformFreqDiv); } > > > > > > /** > > > -- > > > 2.17.1 > > >