From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (EUR05-DB8-obe.outbound.protection.outlook.com [40.107.20.54]) by mx.groups.io with SMTP id smtpd.web10.2051.1588225883455972718 for ; Wed, 29 Apr 2020 22:51:23 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@nxp1.onmicrosoft.com header.s=selector2-nxp1-onmicrosoft-com header.b=ZrbuL6tR; spf=pass (domain: oss.nxp.com, ip: 40.107.20.54, mailfrom: pankaj.bansal@oss.nxp.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LuWb1epdVRQmNOyCp6BGYep6blpivcF3nn5NYacbKV2Pfe80S4fFaxn/z8CCk0DtRBhcqamwsic0LbBdO8PNzE35ITMYEDdD0Uv9E6a0lIzvEc6M63QWWve2aaNTKvIJrJvizf5LiRhr31HrwiKarnwa7O1HHRsi7/aN8Ek7WOgFrytcywJvSM7RLhwZXFw7S+FBjHoGYmW3BhaX2xai9cFPlXZIPOE/gA/d/j1yeegsgICoMGyDv3dQCtQcTertqYxAlaBV64SSkq32EdiDqBKTk43qz7KcJvXsdjctf2hvK18DCwoFb9N4R6lFSsuGYI2egYMoNosJWvW0qgiKwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4sWCfeQDojkKkY7M6c0l/JSQEjQqLzoNoIwKQCEy0Ss=; b=LtckyhJ2oRfwQ/yLkTqaq06C9iGlnfSDlQaAWO1V5vxDKLzIbOWU5P5HRe8fMoQqZWUqcgll4Bv5gxrz6ZLTZuiYsTSK+LsKMWTeuRdJN29VE8BlKWd6MYsTx+lq2uUp2TwVBFqKeQYm/fA9+UC/HAPIjRBjymXSLjiQp4bInWGC8O8TlMOXPjEJTrOM54cg/EEbwFJMix9hR1hrRtlS4dhr27ujwouXCARLq7Evx/gqdXrQ5+N0XfiGjnVOczePkBODXEJvJ+KDm/e28yQfqOTseLBcBG/l03NSo9KBNWqQ6029C9xHWtkb4Byfa7wvpXbJjtHFj6bqapYqLHIOAQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4sWCfeQDojkKkY7M6c0l/JSQEjQqLzoNoIwKQCEy0Ss=; b=ZrbuL6tRlNYVdVi1ozlPvzx+yyEuqPv3iGSl4d7qjEI9CltG+nKsHsGFsmp5dQWwg5m7sWouxPCE+FOxSBVx5O7eYL3if5QVPc6Vnuz4e5c9qan0kr3PnGhPN8MGWUUGbrlsc6KwvsUADowLlkyREImInXRObEPV6ae2sPjmMr8= Authentication-Results: nuviainc.com; dkim=none (message not signed) header.d=none;nuviainc.com; dmarc=none action=none header.from=oss.nxp.com; Received: from VI1PR04MB5933.eurprd04.prod.outlook.com (2603:10a6:803:ec::16) by VI1PR04MB4429.eurprd04.prod.outlook.com (2603:10a6:803:6e::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.13; Thu, 30 Apr 2020 05:51:21 +0000 Received: from VI1PR04MB5933.eurprd04.prod.outlook.com ([fe80::45c4:8846:5327:9513]) by VI1PR04MB5933.eurprd04.prod.outlook.com ([fe80::45c4:8846:5327:9513%7]) with mapi id 15.20.2958.020; Thu, 30 Apr 2020 05:51:21 +0000 From: "Pankaj Bansal" To: Leif Lindholm , Meenakshi Aggarwal , Michael D Kinney , devel@edk2.groups.io, Varun Sethi , Samer El-Haj-Mahmoud , Jon Nettleton , Ard Biesheuvel Subject: [PATCH edk2-platforms v4 07/24] Silicon/NXP: remove print information from Soc lib Date: Fri, 1 May 2020 11:19:38 +0530 Message-ID: <20200501054955.13025-8-pankaj.bansal@oss.nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200501054955.13025-1-pankaj.bansal@oss.nxp.com> References: <20200501054955.13025-1-pankaj.bansal@oss.nxp.com> X-ClientProxiedBy: SG2PR03CA0131.apcprd03.prod.outlook.com (2603:1096:4:91::35) To VI1PR04MB5933.eurprd04.prod.outlook.com (2603:10a6:803:ec::16) Return-Path: pankaj.bansal@oss.nxp.com MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from uefi-workstation.ap.freescale.net (92.120.0.69) by SG2PR03CA0131.apcprd03.prod.outlook.com (2603:1096:4:91::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.14 via Frontend Transport; Thu, 30 Apr 2020 05:51:18 +0000 X-Mailer: git-send-email 2.17.1 X-Originating-IP: [92.120.0.69] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 4bb4ab6c-b9c8-4bbb-566f-08d7ecca8256 X-MS-TrafficTypeDiagnostic: VI1PR04MB4429:|VI1PR04MB4429: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-Forefront-PRVS: 0389EDA07F X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5933.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(136003)(376002)(39860400002)(346002)(366004)(396003)(6512007)(26005)(16526019)(5660300002)(6666004)(478600001)(186003)(2906002)(110136005)(52116002)(6486002)(316002)(8676002)(6506007)(66476007)(19627235002)(86362001)(2616005)(66946007)(44832011)(956004)(66556008)(1076003)(8936002);DIR:OUT;SFP:1101; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cy+5MJfqHodwmGMZgY8D1WM/2YHsKnXTCA5P1MISdeFLEJbcNpvdzW0R9PKxv4oFSqQ4sWU9teqXlpGfpN1QtObAh44f6rq4Z/NvfbfrdGsRZA4FoZ87c8AZkBE3m4ufm5LaS5DMxaMAuFPCv/qq/ncQao27I5yILBWAxRYoINM3EnjSVMqlLPuNNv/Lg0mEBW/mkqgVKnuYe45dxKc/OeqayFu3VQyqqV/kABpqgPpGREUJnWnbcXcOG4fYh1tI7/AdC9gj3bp/caFY3ESwKiBIAnFQ2i9dkzMDN4gqkAxDxxw7aEs7Y+wbyxpQbOf5y8Upq9QUaEXBJpvy81Oq622KTH/7AWKl4BXE6MS6HdPQuy6tCbTcHfReZTC06dsLSUg3QR5A/h5duZcM8Yj7OdIGnSUQpVHdZd0YEz0wLooB5Els1I1UkMV7crse7rQf X-MS-Exchange-AntiSpam-MessageData: iai+r6RQQoXdoscj1vXZf6utcaYyFMTUwYbSfUAQdvTjVP38ngzdqoz/esodX3G4TpjB2MFODTzvub4vFgs580kYvLtY8HZy+HA6Aime8kga+JIG7ZpZJXqyN3KEFJYQqFL4Eqb1IXMXwNYSmMJWO0ei3pCUgtAADc9uV45cJYRsi+MVT9DQcuhscpckJceANtWvfJnQ35fMZ9qoJVNCBpwdiMX3gMMJXvyDCIxkFgNLeSz7rFMz4hzIKDPCQ64OapntdanoW4r3/XcpgXm18Xc4HBb6sVCzA/Xf7oEHXEC5tOeM2qdWHXvS18g1eGwoxjOmV9sKzdk4EzG4iK5IMYHBhKOLNNKulHVueSTfHXBFfYK56wEb2a/Hooi9wXjlX4Gic3p+r8H+YAvhJLfY6QCgYDVkYwe7opLDQajaQklsbjoev2Bi872iIH+fMNS8k+NFTKHpZ9gEdz2HnLuGtOHiC9nE0JTT2Pa7aMshxaQxTyeh+m4K6yL+C3PM3km89codevt2gVTOFejYiLkJ9cLmxMd0YiETKJK9tCbSwcqvlRS0Fd9a0an2sL6uw/ouy7pmcy4QFdluFLr4ZrwwPiQSZUf/ij6PYTkYux9IBrSxyV5Hk4mDnicmnH4a349us3ybogHOaYxjxxKhXhYA6gAGLVQy5WWZ+4Y0XI6z0yLhZdc8nOS6U6MWKianSI1FZiimoAgfGPQrYtpHHtoAy7Kubsw4Qmg2zCtDv+oQ4757qdsBzJo2mPn6TaVTf9kdvYjyrI4GrrW3NhL0GDSmPeYoDSDfcuHx5OSnA9SwqKY= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4bb4ab6c-b9c8-4bbb-566f-08d7ecca8256 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Apr 2020 05:51:21.2528 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: NwA+53g023jorfH1zjFroIOoBmhJEExP2CgADY0EyOEpqG9kEFa61DMDP+Ty/3+xH5v7E0HqY4NjFYdfePrlzQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4429 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain From: Pankaj Bansal The Soc info being printed can be removed from SOC lib. We are in the process of implementing PEI Phase. After PEI phase implementation this info would be printed in common PEIM based on the information retrieved from PPIs. e.g. gArmMpCoreInfoPpiGuid can be used to print cluster and core info. Signed-off-by: Pankaj Bansal Reviewed-by: Leif Lindholm --- Notes: V4: - cluser -> cluster =20 V3: - remove CpuMaskNext from this patch and put in previous patch Silicon/NXP/Library/SocLib/NxpChassis.h | 26 +--- Silicon/NXP/Library/SocLib/Chassis.c | 144 -------------------- Silicon/NXP/Library/SocLib/Chassis2/Soc.c | 16 +-- 3 files changed, 2 insertions(+), 184 deletions(-) diff --git a/Silicon/NXP/Library/SocLib/NxpChassis.h b/Silicon/NXP/Library/= SocLib/NxpChassis.h index 99f6439d8f35..a11acf71563e 100644 --- a/Silicon/NXP/Library/SocLib/NxpChassis.h +++ b/Silicon/NXP/Library/SocLib/NxpChassis.h @@ -1,7 +1,7 @@ /** @file * 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 * @@ -54,14 +54,6 @@ typedef struct { UINTN SdhcClk; } SOC_CLOCK_INFO; =20 -/* - * Print Soc information - */ -VOID -PrintSoc ( - VOID - ); - /* * Initialize Clock structure */ @@ -79,22 +71,6 @@ SmmuInit ( VOID ); =20 -/* - * Print CPU information - */ -VOID -PrintCpuInfo ( - VOID - ); - -/* - * Dump RCW (Reset Control Word) on console - */ -VOID -PrintRCW ( - VOID - ); - UINT32 InitiatorType ( IN UINT32 Cluster, diff --git a/Silicon/NXP/Library/SocLib/Chassis.c b/Silicon/NXP/Library/Soc= Lib/Chassis.c index b8a8118c5e24..adca7b8dd413 100644 --- a/Silicon/NXP/Library/SocLib/Chassis.c +++ b/Silicon/NXP/Library/SocLib/Chassis.c @@ -204,79 +204,6 @@ QoriqCoreToType ( return EFI_NOT_FOUND; /* cannot identify the cluster */ } =20 -STATIC -UINTN -CpuMaskNext ( - IN UINTN Cpu, - IN UINTN Mask - ) -{ - for (Cpu++; !((1 << Cpu) & Mask); Cpu++); - - return Cpu; -} - -/* - * Print CPU information - */ -VOID -PrintCpuInfo ( - VOID - ) -{ - SYS_INFO SysInfo; - UINTN CoreIndex; - UINTN Core; - UINT32 Type; - UINT32 NumCpus; - UINT32 Mask; - CHAR8 *CoreName; - - GetSysInfo (&SysInfo); - DEBUG ((DEBUG_INIT, "Clock Configuration:")); - - NumCpus =3D CpuNumCores (); - Mask =3D CpuMask (); - - for (CoreIndex =3D 0, Core =3D CpuMaskNext(-1, Mask); - CoreIndex < NumCpus; - CoreIndex++, Core =3D CpuMaskNext(Core, Mask)) - { - if (!(CoreIndex % 3)) { - DEBUG ((DEBUG_INIT, "\n ")); - } - - Type =3D TP_ITYP_VERSION (QoriqCoreToType (Core)); - switch (Type) { - case TY_ITYP_VERSION_A7: - CoreName =3D "A7"; - break; - case TY_ITYP_VERSION_A53: - CoreName =3D "A53"; - break; - case TY_ITYP_VERSION_A57: - CoreName =3D "A57"; - break; - case TY_ITYP_VERSION_A72: - CoreName =3D "A72"; - break; - default: - CoreName =3D " Unknown Core "; - } - DEBUG ((DEBUG_INIT, "CPU%d(%a):%-4d MHz ", - Core, CoreName, SysInfo.FreqProcessor[Core] / MHZ)); - } - - DEBUG ((DEBUG_INIT, "\n Bus: %-4d MHz ", SysInfo.FreqSystemBu= s / MHZ)); - DEBUG ((DEBUG_INIT, "DDR: %-4d MT/s", SysInfo.FreqDdrBus / MHZ)); - - if (SysInfo.FreqFman[0] !=3D 0) { - DEBUG ((DEBUG_INIT, "\n FMAN: %-4d MHz ", SysInfo.FreqFman[= 0] / MHZ)); - } - - DEBUG ((DEBUG_INIT, "\n")); -} - /* * Return system bus frequency */ @@ -307,77 +234,6 @@ GetSdxcFrequency ( return SocSysInfo.FreqSdhc; } =20 -/* - * Print Soc information - */ -VOID -PrintSoc ( - VOID - ) -{ - CHAR8 Buf[20]; - CCSR_GUR *GurBase; - UINTN Count; - // - // Svr : System Version Register - // - UINTN Svr; - UINTN Ver; - - GurBase =3D (VOID *)PcdGet64 (PcdGutsBaseAddr); - - Svr =3D GurRead ((UINTN)&GurBase->Svr); - Ver =3D SVR_SOC_VER (Svr); - - for (Count =3D 0; Count < ARRAY_SIZE (mCpuTypeList); Count++) { - if ((mCpuTypeList[Count].SocVer & SVR_WO_E) =3D=3D Ver) { - AsciiStrCpyS (Buf, sizeof (Buf), mCpuTypeList[Count].Name); - - if (IS_E_PROCESSOR (Svr)) { - AsciiStrCatS (Buf, sizeof (Buf), "E"); - } - break; - } - } - - DEBUG ((DEBUG_INFO, "SoC: %a (0x%x); Rev %d.%d\n", - Buf, Svr, SVR_MAJOR (Svr), SVR_MINOR (Svr))); - - return; -} - -/* - * Dump RCW (Reset Control Word) on console - */ -VOID -PrintRCW ( - VOID - ) -{ - CCSR_GUR *Base; - UINTN Count; - - Base =3D (VOID *)PcdGet64 (PcdGutsBaseAddr); - - /* - * Display the RCW, so that no one gets confused as to what RCW - * we're actually using for this boot. - */ - - DEBUG ((DEBUG_INIT, "Reset Configuration Word (RCW):")); - for (Count =3D 0; Count < ARRAY_SIZE (Base->RcwSr); Count++) { - UINT32 Rcw =3D SwapMmioRead32 ((UINTN)&Base->RcwSr[Count]); - - if ((Count % 4) =3D=3D 0) { - DEBUG ((DEBUG_INIT, "\n %08x:", Count * 4)); - } - - DEBUG ((DEBUG_INIT, " %08x", Rcw)); - } - - DEBUG ((DEBUG_INIT, "\n")); -} - /* * Setup SMMU in bypass mode * and also set its pagesize diff --git a/Silicon/NXP/Library/SocLib/Chassis2/Soc.c b/Silicon/NXP/Librar= y/SocLib/Chassis2/Soc.c index bfb8b8cb339a..687a1d940066 100644 --- a/Silicon/NXP/Library/SocLib/Chassis2/Soc.c +++ b/Silicon/NXP/Library/SocLib/Chassis2/Soc.c @@ -1,7 +1,7 @@ /** @Soc.c SoC specific Library containg functions to initialize various SoC compon= ents =20 - Copyright 2017-2019 NXP + Copyright 2017-2020 NXP =20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -131,10 +131,6 @@ GetSysInfo ( =20 /** Function to initialize SoC specific constructs - CPU Info - SoC Personality - Board Personality - RCW prints **/ VOID SocInit ( @@ -147,16 +143,6 @@ SocInit ( // Early init serial Port to get board information. // SerialPortInitialize (); - DEBUG ((DEBUG_INIT, "\nUEFI firmware (version %s built at %a on %a)\n", - (CHAR16*)PcdGetPtr (PcdFirmwareVersionString), __TIME__, __DATE_= _)); - - PrintCpuInfo (); - - // - // Print Reset control Word - // - PrintRCW (); - PrintSoc (); =20 return; } --=20 2.17.1