From patchwork Wed Feb 23 17:12:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arunachalam Ganapathy X-Patchwork-Id: 4171 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 52F9DC433EF for ; Wed, 23 Feb 2022 17:15:11 +0000 (UTC) Received: from EUR03-DB5-obe.outbound.protection.outlook.com (EUR03-DB5-obe.outbound.protection.outlook.com [40.107.4.70]) by mx.groups.io with SMTP id smtpd.web08.10507.1645636505614357469 for ; Wed, 23 Feb 2022 09:15:07 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=Q9FjSzJw; spf=pass (domain: arm.com, ip: 40.107.4.70, mailfrom: arunachalam.ganapathy@arm.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7Hh+T6yPHSUUlIM6W/XAy5Sajq9x99xd7M3Vbz44QHE=; b=Q9FjSzJwMA6B1G2Ydp624P0XnNj7EPgXQUI832g4R0RUqdc4eOm1H42580pXKkAomzCu/muklg4xX954yC/C5WJlTEEcsNGhqN1o42cYUtdu52WjJAr6FqArt/y5FF7kvwuySkHWJR63zpr656wNUTR4WNaWr3sg4UHHGy9mQIk= Received: from AM6P191CA0025.EURP191.PROD.OUTLOOK.COM (2603:10a6:209:8b::38) by DB7PR08MB4604.eurprd08.prod.outlook.com (2603:10a6:10:34::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.18; Wed, 23 Feb 2022 17:15:00 +0000 Received: from VE1EUR03FT064.eop-EUR03.prod.protection.outlook.com (2603:10a6:209:8b:cafe::ff) by AM6P191CA0025.outlook.office365.com (2603:10a6:209:8b::38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5017.23 via Frontend Transport; Wed, 23 Feb 2022 17:15:00 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by VE1EUR03FT064.mail.protection.outlook.com (10.152.19.210) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.20 via Frontend Transport; Wed, 23 Feb 2022 17:15:00 +0000 Received: ("Tessian outbound 1f399c739551:v113"); Wed, 23 Feb 2022 17:14:59 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 2d5c575c6198950c X-CR-MTA-TID: 64aa7808 Received: from 3ecd27ee459b.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id F08B6905-79BB-45DA-804E-40F9ED2C8651.1; Wed, 23 Feb 2022 17:13:10 +0000 Received: from EUR05-AM6-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 3ecd27ee459b.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Wed, 23 Feb 2022 17:13:10 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PX9UtXyaJl/1B7psnKDrgqiMECTi5oNAuD6wDPaKSuwyhG7yzmZ60+MlusyjiiNr96oTiUk1NZgyUzuPiPJ2gxRuXQefE1wnSGwKkTOEA0ES6iP4o4Q5euHnOQXRYhb9tWWwrH3ZTp+lWT21aJRZrCs/YBAnLC31At7xONeTnrz5DSD8BRib1k8LoldGHdJPzxtttc1JJISnUQZQ9hQjqd7itmZDVk4RpNw3ZAd52z4KWTvsV2orMNJtUu20gJzr0iC567cIr7LmzrhjQ3r+nJ/ukS/XVZVHnbv7bBKqhZBwyzi5tAbIGDytwt/FSm+fXP0ofoJzs5DU2PPCN0VN4Q== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=7Hh+T6yPHSUUlIM6W/XAy5Sajq9x99xd7M3Vbz44QHE=; b=aagoy2w2gHXCkQc6T44FOxt1WSKpZiFdbFUrkUMPh1i+o7gIdeJDrUIR4MYVYhGvM715Gski130qFGpIKtAVGnPGK5Fx+EeLDnklqWFPnGh5vAkoN6YU4wU3/TqB1ZK7qF1q8wz/+JpyaNo2SRGeYRHyazcg8dMtiDvD8cqA8KlEjLOYTU5reJj3w3LIDGJGakwQwcNlMH2l+rBlNCN3YstuQM4snrLMAS6XAfQ0BgIFHdjT4iY/ldurbvLc3oUMl6eyak3AUPjVD8a1qVVl5zwCxt97fKDRoEFA3u9EluohhL+ms3Z++EP5ZifB1OJ7mtrLH0TVxTNLf6rZC42PDQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7Hh+T6yPHSUUlIM6W/XAy5Sajq9x99xd7M3Vbz44QHE=; b=Q9FjSzJwMA6B1G2Ydp624P0XnNj7EPgXQUI832g4R0RUqdc4eOm1H42580pXKkAomzCu/muklg4xX954yC/C5WJlTEEcsNGhqN1o42cYUtdu52WjJAr6FqArt/y5FF7kvwuySkHWJR63zpr656wNUTR4WNaWr3sg4UHHGy9mQIk= Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; Received: from PAXPR08MB6766.eurprd08.prod.outlook.com (2603:10a6:102:136::18) by VI1PR08MB5423.eurprd08.prod.outlook.com (2603:10a6:803:133::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5017.22; Wed, 23 Feb 2022 17:13:09 +0000 Received: from PAXPR08MB6766.eurprd08.prod.outlook.com ([fe80::30e1:4bc:62f3:7a4b]) by PAXPR08MB6766.eurprd08.prod.outlook.com ([fe80::30e1:4bc:62f3:7a4b%3]) with mapi id 15.20.4995.027; Wed, 23 Feb 2022 17:13:09 +0000 From: Arunachalam Ganapathy To: meta-arm@lists.yoctoproject.org CC: nd@arm.com, Arunachalam Ganapathy Subject: [PATCH 1/2] arm-bsp/linux-yocto: enable autofdo config only for TC1 Date: Wed, 23 Feb 2022 17:12:50 +0000 Message-ID: <20220223171251.3156859-1-arunachalam.ganapathy@arm.com> X-Mailer: git-send-email 2.30.2 X-ClientProxiedBy: LNXP265CA0094.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:76::34) To PAXPR08MB6766.eurprd08.prod.outlook.com (2603:10a6:102:136::18) MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 4191f6e6-c966-4027-8c77-08d9f6f005e9 X-MS-TrafficTypeDiagnostic: VI1PR08MB5423:EE_|VE1EUR03FT064:EE_|DB7PR08MB4604:EE_ X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: oL5e1nIzpQK7aQh+Y3pVgpIyeM0xYDeaLXQPrUet8GjPvlNABBN96i/4KaMk93QvnMipqn+hU3LTZNDB4Twr0v6kS6IfFhI+SQX2r6L33xO6DOK8bvRmN3kDkXUb6ZEKu+hT44BsxSH31WMAsm0aLnKJGO5qItb3b0F2XubY54PFgtAuJecLQzv9WeNXxGkm9gPg70/3xEMyi9Ma4nAOy/xuSeWnnLZE8B2B7ongcWLsYkTsi+MPkd8XwORDu+5B0zqQsa4+HtqvjDQEHAPHPGogni1ABvpBtxnLrDRG52MEHqXguhGIp06QEEx3ywK2u5YvxPo2pZUGyWMTpVf4PmzkQAbSPi9ygqIWosPA6U3K2kLHZrlXJUXtaqJyQ9LTOc3Gn29PEQlWAygvs6mg8R9apttuqSeBz/IEGA59CMVGFhdPvrYs0Lwmm65VoVCCEkUZkRbcuRa5UDeFkpjUaSye+Y5R9cLndVAC1owDcqdkLz6iBbnUdrfhKBAqIi4WFzJIXmCLfrCpY+6NEflIjZTNaoOu1m+wATMj3MFtkUCzxLdjyrjx4L5e7gYX+BaIqe8HcnFTBlBojvlC4y169vSnn+BEanPXY5DRcWLPmMfL3uDW0oE41YsGg586rApXt5qGoxJg+Ids/LvNB35lhOZuhgE8U2KFJHVHqFRPDQH6+/XrB4vGDV8MI+gXtJQtEQZrYCmUJhv0lgR5L44wSw== X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR08MB6766.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(4636009)(366004)(8936002)(6506007)(86362001)(6916009)(508600001)(52116002)(6486002)(36756003)(44832011)(2906002)(5660300002)(83380400001)(1076003)(66476007)(66556008)(8676002)(2616005)(316002)(26005)(66946007)(186003)(38100700002)(6512007)(6666004)(4326008)(38350700002);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB5423 Original-Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT064.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 791e6c32-2bda-455c-5fb2-08d9f6efc34c X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: j/BRzoX93146M9DEtbigB3/Tn8FmwWqG1qfGwjCvh+JG1NkFSuAQLNPOvXuWpfn9Hl7xePxIyDm5WpZkXi1lLgMYK7IzIgq8FvQ1k+6LrjA2gV24JvIM7Adp3fQ1t8UnLMh0Kvi31vHFoTV7nsrV0VUTklPLh9ZpOUXf8WPSRBvafx7xUr/9ZPiHN0lfJrEexTqT5siQEnYjVL3+sLQgllljfD/U8lmgMsIn6bKyUryQuUnHUaJG/3+g2C+VgbgLkqhEn9AcAMzWvcx9rIE5aVQK5gVZJo20tZ43HlqsoHUtbsqSkUlgNVgg0iP9HThqM1shRo+Qf6/fqgYaYvk1VYtoiaP5G7nZgMXmeX3YqTHQ1/iNp0g+MMNBXEBtkDP8u9vITjFjcJVRsAaYFvAY6sb7o8IyVIIPSKE3/rLuNAie4iLMT2j24NfIUHp6jdifHpze23MdT2L6CXSem4O/5VDvxKp07GlRiXzuwQJ9OhjaN5SBB4v1Z3QHh4p6kWkQYpcbD1CnlnX+zY1t2dMpxNRpJHzE0oL6UMouyq30Zd+YG2ZO9RQ80rYYvFwwemus57bCoZHGXVvUupHC/qrkBl3RKGSxlWOKLT8MFFwXLn/Yjj3NIEo534LQGO46H/eF5inxIVHBDWXuAOH8G3o27mpGMRfDaMS7zvEyhUazaaxu0Lw5YxQEdXZU9vu6EPj/ X-Forefront-Antispam-Report: CIP:63.35.35.123;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:64aa7808-outbound-1.mta.getcheckrecipient.com;PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com;CAT:NONE;SFS:(13230001)(4636009)(46966006)(36840700001)(40470700004)(8676002)(8936002)(86362001)(6916009)(356005)(44832011)(4326008)(40460700003)(5660300002)(316002)(82310400004)(336012)(36756003)(6506007)(6512007)(36860700001)(2906002)(186003)(1076003)(83380400001)(26005)(2616005)(70586007)(70206006)(508600001)(6666004)(6486002)(47076005)(81166007);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Feb 2022 17:15:00.0318 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4191f6e6-c966-4027-8c77-08d9f6f005e9 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR03FT064.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR08MB4604 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 23 Feb 2022 17:15:11 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/3045 Signed-off-by: Arunachalam Ganapathy Change-Id: I75219f174f2fd0a9fa67007a4bc45acecc324390 --- .../linux/arm-platforms-kmeta/bsp/arm-platforms/tc-autofdo.scc | 1 + .../linux/arm-platforms-kmeta/bsp/arm-platforms/tc.scc | 1 - meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/tc-autofdo.scc diff --git a/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/tc-autofdo.scc b/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/tc-autofdo.scc new file mode 100644 index 00000000..5b20b6c0 --- /dev/null +++ b/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/tc-autofdo.scc @@ -0,0 +1 @@ +kconf non-hardware tc/autofdo.cfg diff --git a/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/tc.scc b/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/tc.scc index 62748e1c..86e450c6 100644 --- a/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/tc.scc +++ b/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/tc.scc @@ -5,4 +5,3 @@ kconf non-hardware tc/gralloc.cfg kconf non-hardware tc/mali.cfg kconf non-hardware tc/tee.cfg kconf non-hardware tc/virtio.cfg -kconf non-hardware tc/autofdo.cfg diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc b/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc index 6db68b1b..c68060af 100644 --- a/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc +++ b/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc @@ -190,3 +190,4 @@ SRC_URI:append:tc = " \ file://0023-coresight-etm4x-Use-Trace-Filtering-controls-dynamic.patch \ " KERNEL_FEATURES:append:tc = " bsp/arm-platforms/tc.scc" +KERNEL_FEATURES:append:tc1 = " bsp/arm-platforms/tc-autofdo.scc" From patchwork Wed Feb 23 17:12:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arunachalam Ganapathy X-Patchwork-Id: 4172 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5F0ECC433FE for ; Wed, 23 Feb 2022 17:15:11 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (EUR02-AM5-obe.outbound.protection.outlook.com [40.107.0.57]) by mx.groups.io with SMTP id smtpd.web12.10523.1645636508967027062 for ; Wed, 23 Feb 2022 09:15:10 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=CdTPig6f; spf=pass (domain: arm.com, ip: 40.107.0.57, mailfrom: arunachalam.ganapathy@arm.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4CP+JPn1gyD6euVX+lRwXPhClazJrdg/45jOeUHTme8=; b=CdTPig6fXBY78J4wwivOySb1lgQYWAejWw1Pr6VoUmLZ2qqdGOcZMgUL7ryEnC4KyAQWtpFmzKeWFcQBiJex+JSC4nEyyuRTj6Pm1lflkidbWJVd3VQ6l5pHKVS/Nl+UkqM8nONUgeLjsArz2rhzsPNqvjZM+K2N2O/t2ZSpJTY= Received: from AM7PR04CA0002.eurprd04.prod.outlook.com (2603:10a6:20b:110::12) by AS8PR08MB5896.eurprd08.prod.outlook.com (2603:10a6:20b:294::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5017.21; Wed, 23 Feb 2022 17:15:05 +0000 Received: from VE1EUR03FT029.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:110:cafe::fc) by AM7PR04CA0002.outlook.office365.com (2603:10a6:20b:110::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.26 via Frontend Transport; Wed, 23 Feb 2022 17:15:05 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by VE1EUR03FT029.mail.protection.outlook.com (10.152.18.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5017.22 via Frontend Transport; Wed, 23 Feb 2022 17:15:04 +0000 Received: ("Tessian outbound 741ca6c82739:v113"); Wed, 23 Feb 2022 17:15:04 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: d1a9f0740ee034af X-CR-MTA-TID: 64aa7808 Received: from 45b7b2378c99.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 13CDA49D-D315-44AE-A552-C1622652DE07.1; Wed, 23 Feb 2022 17:13:15 +0000 Received: from EUR05-AM6-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 45b7b2378c99.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Wed, 23 Feb 2022 17:13:15 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ClntBxS9gizLg2d/y86K4TUyj4CIdG8bXVBjqaOmGUIxhBB7+rNZJ1yvaMle7us/NY7j2lL9U4PX6mLhJf0GOGkcU8G/fobGnelylBodwkqJ1GtATJm8nMo+MLNUrQ8jbPXTbGAqWNt6w27OURYlmF25akRQdLdI7K0iGj+OLb8x398AZpaNlpmtjxCoo1m3A7H64CR7DpjmlfY0yz41/iru8nOWYw+HdGGwUAS9inO7cNukDtgv6W0lFyQx3KC50FxcR5Cd+4q6RhYPzkLc4NbmYg0irynrzp42Udp3x+ogfu2rS++QMc798sk6/sUF8OV3ON656k13sxKqRMrApQ== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=4CP+JPn1gyD6euVX+lRwXPhClazJrdg/45jOeUHTme8=; b=KBDxe/fmf1GPf1EOHq2Pqksg9h+RTcvSbv9447E5YFpfb99GVnNmXJ8R2JiItayNS7FXW23rtrpwA9FQFTqBZFJoxlvqROlUmjGOYWrpZX6L7lNYWXvPkYpW+9FDfriECDfG19zruAXBHnDLL3uMMCyByQVxV5S7gYZrQ7abv77TSZ6NG28EinwEbsLxDI5d/KO6zdOx2xn4SnuWytjRo5qBbdLoh4ChAg9yEkoWDDZN6kZvLUzflmAhUxNqAX1bM1clYTlQjTDo/iNJ/R7CODpfawjAPTUxHrai8TM5XUcp2nz8FTrD9wrlHaMpLHMiEI9zP3n1+1u8hGfkraOX2A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4CP+JPn1gyD6euVX+lRwXPhClazJrdg/45jOeUHTme8=; b=CdTPig6fXBY78J4wwivOySb1lgQYWAejWw1Pr6VoUmLZ2qqdGOcZMgUL7ryEnC4KyAQWtpFmzKeWFcQBiJex+JSC4nEyyuRTj6Pm1lflkidbWJVd3VQ6l5pHKVS/Nl+UkqM8nONUgeLjsArz2rhzsPNqvjZM+K2N2O/t2ZSpJTY= Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; Received: from PAXPR08MB6766.eurprd08.prod.outlook.com (2603:10a6:102:136::18) by VI1PR08MB4511.eurprd08.prod.outlook.com (2603:10a6:803:f9::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.24; Wed, 23 Feb 2022 17:13:12 +0000 Received: from PAXPR08MB6766.eurprd08.prod.outlook.com ([fe80::30e1:4bc:62f3:7a4b]) by PAXPR08MB6766.eurprd08.prod.outlook.com ([fe80::30e1:4bc:62f3:7a4b%3]) with mapi id 15.20.4995.027; Wed, 23 Feb 2022 17:13:12 +0000 From: Arunachalam Ganapathy To: meta-arm@lists.yoctoproject.org CC: nd@arm.com, Arunachalam Ganapathy Subject: [PATCH 2/2] arm-bsp/scp-firmware: add patches related to MPMM for TC0 Date: Wed, 23 Feb 2022 17:12:51 +0000 Message-ID: <20220223171251.3156859-2-arunachalam.ganapathy@arm.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220223171251.3156859-1-arunachalam.ganapathy@arm.com> References: <20220223171251.3156859-1-arunachalam.ganapathy@arm.com> X-ClientProxiedBy: LNXP265CA0094.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:76::34) To PAXPR08MB6766.eurprd08.prod.outlook.com (2603:10a6:102:136::18) MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: cc993ba9-8ee2-458b-ed45-08d9f6f008ab X-MS-TrafficTypeDiagnostic: VI1PR08MB4511:EE_|VE1EUR03FT029:EE_|AS8PR08MB5896:EE_ X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: 7p0eZ6ZT11Syn3VvH3TxdZWuA7qCi/+rwtxZNcQYjqf6nq6/AI8DgXV+HKVG83du22+JOW3ymGdCwfTaBuoFm1uuLHoYn32W6jTWVTDWFvS2ukywoHqvg9sswCPSY1kLoW7GuoNiSVk8LEI/s75QyoKnVZppQNfAJ6HgzTnNdscdmTAc9++MMEAT86KfxNot3c/7kIPGC0Nflvv7PliDF/RdTzpv/zgIDkHlZSPqsGAhYYvNosOQQpSck08NTY4OpmCITYXKvNB2tk3gsFbucgqseIeOC60Ev+4kjTpKeZ7FaNIbB5+GfH5cvaFgKgK94mIxiZizsttkj6KUEmm0PUz7qN2wvE+RLeuDkVBn+qBqvf0FFXJufZVLoriFnQ8cW/vmryT5fmKAvlixWX0vzf0ylSLRUHj+8yx7TFnLMcLyfP/MgGONf8qtK+f6UoD5r3y27hXkZFpGEX/vPmL+fA4faJ+AYGpFxqgrfMJ8k+bH2jbl+oPeBl1MRDgvhPJcsp/qzPnxsrkNG0hOOR2nOsPXNAcQIUCR2PZknOZbX0BRQOwbmNx7dP1J0Cuy8/EVrRv6UY6etulXpzGa5aHrARLRdbzkeM5YiMAi3wkrCwJH8W6BdEaJDJbrU2iiBCc0BnUvYNsSWP4nV71rUuXD4x2CHUbVJv6FXdRao/RVBcqQbjzkXPkZpWr6RNi0WR/+px/jRtPDsVMEJ3rh3K1ozA== X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR08MB6766.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(4636009)(366004)(36756003)(6666004)(52116002)(6486002)(6512007)(6506007)(508600001)(2616005)(2906002)(38350700002)(38100700002)(8676002)(66476007)(5660300002)(19627235002)(26005)(66946007)(8936002)(6916009)(4326008)(316002)(44832011)(186003)(30864003)(83380400001)(1076003)(86362001)(66556008);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB4511 Original-Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT029.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: e14ba2df-cc09-4ef8-cb09-08d9f6efc57c X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yjp4o+CXRmkE6LIBOmvM8e5PgWUF6tWcyMlDwo7WRwEqr0D/YdVZ3wQndJhvy3l9ZlvFIc9BUUch9Y/1bMl6Z/E/EMeQ9Diqf908gdKMu6DfPD7qp/RQ89EJQ8ymwddg7Jxam3vApjtubMMRa6bF1he2oVtesU0y6aeNvrGpSMm5Bb6IlWOpH2xymeGrfVjEXkFrZ9Jbv5OOhmY9Z7FA8FJv57sUAf8NYSvW4vWOXbTmAB2rwBX5Zio1CjcnY0zQ+H4lCns92UzZzEu75xahIMpCaOy0cNsDkCfcYAmpn8R7E/6e9RcW7NZz+/qX4wpiloyTFh2BjrMX0iknlQztJOmdXnDIFnGkk4sOIFBgjOOwjUCHRtHHE9xMtkiLi0P6KEdf/2vz3XbxRVDqSo39m8WqWAJ98/tfglZQvF3ZMmJlYG22T7QSa3vOIxRSDQxsgwRkI6csMaTtW96SW7+rr0IzBdc1cBcQmfKOIYD8LBoumFsYfGqsXoGlmBmu0alHGDCSMmHxoQeMu7JOOv2c2gX+6F6sre3dye9bnnWkPTtNlSeMdDDIMULGrqatKZu4WqWyMflGSNzNMBpD8vwpG2DQvLKrBjTjz2bvxeM92gq23Uedxa78a+/7Wa86FhBjlGS3dX09f6XBm6n/NrYKbr8W8My+gqvJuszuCNGMKUDuC1Qntbz72yRfGDo2Rz05 X-Forefront-Antispam-Report: CIP:63.35.35.123;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:64aa7808-outbound-1.mta.getcheckrecipient.com;PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com;CAT:NONE;SFS:(13230001)(4636009)(40470700004)(36840700001)(46966006)(6666004)(81166007)(2616005)(82310400004)(6506007)(356005)(30864003)(44832011)(6512007)(5660300002)(8676002)(86362001)(1076003)(316002)(6916009)(4326008)(19627235002)(6486002)(70586007)(508600001)(70206006)(40460700003)(336012)(47076005)(2906002)(83380400001)(26005)(36860700001)(186003)(36756003)(8936002);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Feb 2022 17:15:04.6297 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cc993ba9-8ee2-458b-ed45-08d9f6f008ab X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR03FT029.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB5896 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 23 Feb 2022 17:15:11 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/3046 This commits updates the SHA of SCP-firmware and include required patches to build SCP firmware with experimental features MPMM/POWER/PERFORMANCE for TC0 platform. Signed-off-by: Arunachalam Ganapathy Change-Id: I263b484a467636154b70805f920bb53c6fe2026c --- .../0001-tc0-fix-sensor-data-api-call.patch | 65 ++++++ .../files/tc/0002-tc0-fix-mpmm-config.patch | 92 ++++++++ ...form-variant-to-platform-feature-set.patch | 202 ++++++++++++++++++ ...form-feature-set-options-in-firmware.patch | 114 ++++++++++ .../scp-firmware/scp-firmware-tc.inc | 15 +- 5 files changed, 487 insertions(+), 1 deletion(-) create mode 100644 meta-arm-bsp/recipes-bsp/scp-firmware/files/tc/0001-tc0-fix-sensor-data-api-call.patch create mode 100644 meta-arm-bsp/recipes-bsp/scp-firmware/files/tc/0002-tc0-fix-mpmm-config.patch create mode 100644 meta-arm-bsp/recipes-bsp/scp-firmware/files/tc/0003-tc0-rename-platform-variant-to-platform-feature-set.patch create mode 100644 meta-arm-bsp/recipes-bsp/scp-firmware/files/tc/0004-tc0-support-platform-feature-set-options-in-firmware.patch diff --git a/meta-arm-bsp/recipes-bsp/scp-firmware/files/tc/0001-tc0-fix-sensor-data-api-call.patch b/meta-arm-bsp/recipes-bsp/scp-firmware/files/tc/0001-tc0-fix-sensor-data-api-call.patch new file mode 100644 index 00000000..227d9112 --- /dev/null +++ b/meta-arm-bsp/recipes-bsp/scp-firmware/files/tc/0001-tc0-fix-sensor-data-api-call.patch @@ -0,0 +1,65 @@ +From 33a2173e13453ecc4f766f0e69302524401df1b0 Mon Sep 17 00:00:00 2001 +From: Arunachalam Ganapathy +Date: Mon, 14 Feb 2022 08:28:46 +0000 +Subject: [PATCH 1/4] tc0: fix sensor data api call + +Signed-off-by: Arunachalam Ganapathy +Change-Id: I827abeeac8317e4dd466cc0c4d493cdc90e7e39d +Upstream-Status: Pending [Not submitted to upstream yet] +--- + module/thermal_mgmt/src/mod_thermal_mgmt.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/module/thermal_mgmt/src/mod_thermal_mgmt.c b/module/thermal_mgmt/src/mod_thermal_mgmt.c +index dbd45c74..6e2ff5ba 100644 +--- a/module/thermal_mgmt/src/mod_thermal_mgmt.c ++++ b/module/thermal_mgmt/src/mod_thermal_mgmt.c +@@ -20,7 +20,7 @@ + #include + #include + #include +-#include ++#include + + #include + #include +@@ -372,7 +372,7 @@ static int read_temperature(void) + .id = mod_thermal_event_id_read_temp, + }; + +- return fwk_thread_put_event(&event); ++ return fwk_put_event(&event); + #else + int status; + uint64_t value; +@@ -574,22 +574,22 @@ static int thermal_mgmt_process_event( + struct fwk_event *resp_event) + { + struct mod_sensor_event_params *params; +- uint64_t value; ++ struct mod_sensor_data ms_data; + int status; + + if (fwk_id_is_equal(event->id, mod_thermal_event_id_read_temp)) { + /* Temperature-reading event */ + status = +- mod_ctx.sensor_api->get_value(mod_ctx.config->sensor_id, &value); ++ mod_ctx.sensor_api->get_data(mod_ctx.config->sensor_id, &ms_data); + if (status == FWK_SUCCESS) { +- mod_ctx.cur_temp = (uint32_t)value; ++ mod_ctx.cur_temp = (uint32_t)ms_data.value; + } + } else if (fwk_id_is_equal(event->id, mod_sensor_event_id_read_request)) { + /* Response event from Sensor HAL */ + params = (struct mod_sensor_event_params *)event->params; + +- if (params->status == FWK_SUCCESS) { +- mod_ctx.cur_temp = (uint32_t)params->value; ++ if (params->sensor_data->status == FWK_SUCCESS) { ++ mod_ctx.cur_temp = (uint32_t)params->sensor_data->value; + status = FWK_SUCCESS; + } else { + status = FWK_E_DEVICE; +-- +2.30.2 + diff --git a/meta-arm-bsp/recipes-bsp/scp-firmware/files/tc/0002-tc0-fix-mpmm-config.patch b/meta-arm-bsp/recipes-bsp/scp-firmware/files/tc/0002-tc0-fix-mpmm-config.patch new file mode 100644 index 00000000..f2044a95 --- /dev/null +++ b/meta-arm-bsp/recipes-bsp/scp-firmware/files/tc/0002-tc0-fix-mpmm-config.patch @@ -0,0 +1,92 @@ +From 736bd8aeceefd474c15a97e4a4ec99f07ef9a82c Mon Sep 17 00:00:00 2001 +From: Arunachalam Ganapathy +Date: Fri, 11 Feb 2022 18:28:43 +0000 +Subject: [PATCH 2/4] tc0: fix mpmm config + +Do not enable MPMM in standard features set. + +Signed-off-by: Arunachalam Ganapathy +Change-Id: I7b273a2055452e2e8cd78a0d932514a6f2947ec5 +Upstream-Status: Pending [Not submitted to upstream yet] +--- + product/tc0/scp_ramfw/config_mpmm.c | 15 --------------- + 1 file changed, 15 deletions(-) + +diff --git a/product/tc0/scp_ramfw/config_mpmm.c b/product/tc0/scp_ramfw/config_mpmm.c +index 3bfe99d3..13d866a5 100644 +--- a/product/tc0/scp_ramfw/config_mpmm.c ++++ b/product/tc0/scp_ramfw/config_mpmm.c +@@ -27,7 +27,6 @@ enum core_pd_idx { + CORE7_IDX + }; + +-#if defined(PLATFORM_VARIANT) && (PLATFORM_VARIANT == TC0_VARIANT_STD) + static struct mod_mpmm_pct_table k_pct[] = { + { .cores_online = 4, + .default_perf_limit = 1153 * 1000000UL, +@@ -115,7 +114,6 @@ static struct mod_mpmm_pct_table m_pct[] = { + }, + } }, + }; +-#endif + + static struct mod_mpmm_pct_table m_elp_pct[] = { + { .cores_online = 1, +@@ -132,7 +130,6 @@ static struct mod_mpmm_pct_table m_elp_pct[] = { + } }, + }; + +-#if defined(PLATFORM_VARIANT) && (PLATFORM_VARIANT == TC0_VARIANT_STD) + static const struct mod_mpmm_core_config k_core_config[] = { + [0] = { + .pd_id = FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_POWER_DOMAIN, CORE0_IDX), +@@ -180,7 +177,6 @@ static const struct mod_mpmm_core_config m_core_config[] = { + .core_starts_online = false, + }, + }; +-#endif + + static const struct mod_mpmm_core_config m_elp_core_config[] = { + [0] = { +@@ -191,7 +187,6 @@ static const struct mod_mpmm_core_config m_elp_core_config[] = { + }, + }; + +-#if defined(PLATFORM_VARIANT) && (PLATFORM_VARIANT == TC0_VARIANT_STD) + static const struct mod_mpmm_domain_config k_domain_conf[] = { + [0] = { + .perf_id = FWK_ID_ELEMENT_INIT( +@@ -219,7 +214,6 @@ static const struct mod_mpmm_domain_config m_domain_conf[] = { + }, + [1] = {0}, + }; +-#endif + + static const struct mod_mpmm_domain_config m_elp_domain_conf[] = { + [0] = { +@@ -236,14 +230,6 @@ static const struct mod_mpmm_domain_config m_elp_domain_conf[] = { + }; + + static const struct fwk_element element_table[] = { +-#if defined(PLATFORM_VARIANT) && (PLATFORM_VARIANT == TC0_VAR_EXPERIMENT_POWER) +- [0] = { +- .name = "MPMM_MATTERHORN_ELP_ARM_ELEM", +- .sub_element_count = 1, +- .data = m_elp_domain_conf, +- }, +- [1] = { 0 }, +-#else + [0] = { + .name = "MPMM_KLEIN_ELEM", + .sub_element_count = 4, +@@ -260,7 +246,6 @@ static const struct fwk_element element_table[] = { + .data = m_elp_domain_conf, + }, + [3] = { 0 }, +-#endif + }; + + static const struct fwk_element *mpmm_get_element_table(fwk_id_t module_id) +-- +2.30.2 + diff --git a/meta-arm-bsp/recipes-bsp/scp-firmware/files/tc/0003-tc0-rename-platform-variant-to-platform-feature-set.patch b/meta-arm-bsp/recipes-bsp/scp-firmware/files/tc/0003-tc0-rename-platform-variant-to-platform-feature-set.patch new file mode 100644 index 00000000..5e995253 --- /dev/null +++ b/meta-arm-bsp/recipes-bsp/scp-firmware/files/tc/0003-tc0-rename-platform-variant-to-platform-feature-set.patch @@ -0,0 +1,202 @@ +From 50e63f11762348bcd95d809af248f620f03d9ce4 Mon Sep 17 00:00:00 2001 +From: Arunachalam Ganapathy +Date: Fri, 11 Feb 2022 18:16:54 +0000 +Subject: [PATCH 3/4] tc0: rename platform variant to platform feature set + +THe PLATFORM_VARIANT flag was added to differentiate the software +features enabled in SCP firmware. But this flag misleads to a new +variant of same platform. This commits renames PLATFORM_VARIANT to +PLATFORM_FEATURE_SET + +Signed-off-by: Arunachalam Ganapathy +Change-Id: I93c0bc3e11fe18192bb8246df851345bdc473974 +Upstream-Status: Pending [Not submitted to upstream yet] +--- + product/tc0/doc/{variants.md => features.md} | 28 +++++++++----------- + product/tc0/scp_ramfw/CMakeLists.txt | 26 +++--------------- + product/tc0/scp_ramfw/Firmware.cmake | 2 +- + product/tc0/scp_ramfw/config_scmi_perf.c | 8 +++--- + product/tc0/scp_romfw/CMakeLists.txt | 6 ++--- + product/tc0/scp_romfw/Firmware.cmake | 2 +- + 6 files changed, 25 insertions(+), 47 deletions(-) + rename product/tc0/doc/{variants.md => features.md} (77%) + +diff --git a/product/tc0/doc/variants.md b/product/tc0/doc/features.md +similarity index 77% +rename from product/tc0/doc/variants.md +rename to product/tc0/doc/features.md +index fbf616db..3ef520e2 100644 +--- a/product/tc0/doc/variants.md ++++ b/product/tc0/doc/features.md +@@ -1,4 +1,4 @@ +-# TC0 Platform Variants ++# TC0 Platform Features + + Copyright (c) 2022, Arm Limited. All rights reserved. + +@@ -7,30 +7,27 @@ Copyright (c) 2022, Arm Limited. All rights reserved. + + Documentation for TC0 platform can be found at [1]. + ++### Standard ++ ++The standard build provides all the features described in [1]. ++For this default features, it's not required to provide any extra parameters in ++the build commands. ++ ++### MPMM/Power/Performance (Experimental) ++ + For the purpose of experimenting some of the software features that have been +-introduced in SCP-firmware a new variant of TC0 has been created. +-The variant(s) can be chosen at build time by adding: ++introduced in SCP-firmware of TC0. This can be enabled at build time, by adding: + + ```sh + + make -f Makefile.cmake \ + PRODUCT=tc0 \ + MODE= \ +- EXTRA_CONFIG_ARGS+=-DSCP_PLATFORM_VARIANT=<0,1> ++ EXTRA_CONFIG_ARGS+=-DSCP_PLATFORM_FEATURE_SET=1 + + ``` + +- +-### Variant 0 (Standard build) +- +-The standard build provides all the features described in [1]. +-For this default variant, it's not required to provide any extra parameters in +-the build commands. +- +- +-### Variant 1 (Power/Performance testing) +- +-This variant adds support for the following software features: ++This adds support for the following software features: + - Traffic Cop + - MPMM (Maximum Power Mitigation Mechanism) + - Thermal Management +@@ -63,7 +60,6 @@ Once built, the features above will act as: + + ## Limitations + +-- The "variant" option is available only with the CMake build. + - The Thermal functionality is limited at this time cause the constant + temperature being sampled. + +diff --git a/product/tc0/scp_ramfw/CMakeLists.txt b/product/tc0/scp_ramfw/CMakeLists.txt +index 96310320..ce3178ee 100644 +--- a/product/tc0/scp_ramfw/CMakeLists.txt ++++ b/product/tc0/scp_ramfw/CMakeLists.txt +@@ -11,25 +11,13 @@ + + add_executable(tc0-bl2) + ++set(SCP_PLATFORM_FEATURE_SET ${SCP_PLATFORM_FEATURE_SET_INIT} CACHE STRING "1") + +-# SCP_PLATFORM_VARIANT options: +-# - 'TC0_VARIANT_STD' for TC0 standard build +-# - 'TC0_VAR_EXPERIMENT_POWER' for TC0 with power/performance plugins used for +-# evaluation purposes +- +- +-target_compile_definitions(tc0-bl2 PUBLIC -DTC0_VARIANT_STD=0) +-target_compile_definitions(tc0-bl2 PUBLIC -DTC0_VAR_EXPERIMENT_POWER=1) +- +- +-set(SCP_PLATFORM_VARIANT ${SCP_PLATFORM_VARIANT_INIT} CACHE STRING "1") +- +- +-if (SCP_PLATFORM_VARIANT STREQUAL "1") +- message(NOTICE "SCP_PLATFORM_VARIANT set to EXPERIMENT_POWER (tc0-bl2)\n") ++if (SCP_PLATFORM_FEATURE_SET STREQUAL "1") ++ message(NOTICE "TC0 platform features MPMM/POWER/PERFORMANCE is experimental (tc0-bl2)\n") + + target_compile_definitions(tc0-bl2 +- PUBLIC -DPLATFORM_VARIANT=TC0_VAR_EXPERIMENT_POWER) ++ PUBLIC -DTC0_FEATURES_MPMM_POWER_PERF) + + set(SCP_ENABLE_PLUGIN_HANDLER TRUE PARENT_SCOPE) + set(SCP_ENABLE_FAST_CHANNELS TRUE PARENT_SCOPE) +@@ -56,12 +44,6 @@ if (SCP_PLATFORM_VARIANT STREQUAL "1") + list(PREPEND SCP_MODULE_PATHS + "${CMAKE_CURRENT_LIST_DIR}/../module/tc0_power_model") + target_sources(tc0-bl2 PRIVATE "config_tc0_power_model.c") +- +-else() +- message(NOTICE "SCP_PLATFORM_VARIANT set to STANDARD (tc0-bl2)\n") +- +- target_compile_definitions(tc0-bl2 +- PUBLIC -DPLATFORM_VARIANT=TC0_VARIANT_STD) + endif() + + +diff --git a/product/tc0/scp_ramfw/Firmware.cmake b/product/tc0/scp_ramfw/Firmware.cmake +index 11d8eaab..4a555296 100644 +--- a/product/tc0/scp_ramfw/Firmware.cmake ++++ b/product/tc0/scp_ramfw/Firmware.cmake +@@ -27,7 +27,7 @@ set(SCP_ENABLE_FAST_CHANNELS_INIT FALSE) + + set(SCP_ENABLE_PLUGIN_HANDLER_INIT FALSE) + +-set(SCP_PLATFORM_VARIANT_INIT 0) ++set(SCP_PLATFORM_FEATURE_SET_INIT 0) + + set(SCP_ARCHITECTURE "armv7-m") + +diff --git a/product/tc0/scp_ramfw/config_scmi_perf.c b/product/tc0/scp_ramfw/config_scmi_perf.c +index a4a47b3a..3e91939a 100644 +--- a/product/tc0/scp_ramfw/config_scmi_perf.c ++++ b/product/tc0/scp_ramfw/config_scmi_perf.c +@@ -129,7 +129,7 @@ static const struct mod_scmi_perf_domain_config domains[] = { + }, + }; + +-#if defined(PLATFORM_VARIANT) && (PLATFORM_VARIANT == TC0_VAR_EXPERIMENT_POWER) ++#ifdef TC0_FEATURES_MPMM_POWER_PERF + static const struct mod_scmi_plugin_config plugins_table[] = { + [0] = { + .id = FWK_ID_MODULE_INIT(FWK_MODULE_IDX_TRAFFIC_COP), +@@ -156,9 +156,9 @@ const struct fwk_module_config config_scmi_perf = { + #else + .fast_channels_alarm_id = FWK_ID_NONE_INIT, + #endif +-#if defined(PLATFORM_VARIANT) && (PLATFORM_VARIANT == TC0_VAR_EXPERIMENT_POWER) +- .plugins = plugins_table, +- .plugins_count = FWK_ARRAY_SIZE(plugins_table), ++#ifdef TC0_FEATURES_MPMM_POWER_PERF ++ .plugins = plugins_table, ++ .plugins_count = FWK_ARRAY_SIZE(plugins_table), + #endif + }) + }; +diff --git a/product/tc0/scp_romfw/CMakeLists.txt b/product/tc0/scp_romfw/CMakeLists.txt +index f9f40ad3..09cd2f5d 100644 +--- a/product/tc0/scp_romfw/CMakeLists.txt ++++ b/product/tc0/scp_romfw/CMakeLists.txt +@@ -48,6 +48,6 @@ target_include_directories(tc0-bl1 + PUBLIC $) + + cmake_dependent_option( +- SCP_PLATFORM_VARIANT "Choose platform software variant?" +- "${SCP_PLATFORM_VARIANT_INIT}" "DEFINED SCP_PLATFORM_VARIANT_INIT" +- "${SCP_PLATFORM_VARIANT}") ++ SCP_PLATFORM_FEATURE_SET "Choose platform software features?" ++ "${SCP_PLATFORM_FEATURE_SET_INIT}" "DEFINED SCP_PLATFORM_FEATURE_SET_INIT" ++ "${SCP_PLATFORM_FEATURE_SET}") +diff --git a/product/tc0/scp_romfw/Firmware.cmake b/product/tc0/scp_romfw/Firmware.cmake +index ab4468be..e1360159 100644 +--- a/product/tc0/scp_romfw/Firmware.cmake ++++ b/product/tc0/scp_romfw/Firmware.cmake +@@ -21,7 +21,7 @@ set(SCP_ENABLE_NOTIFICATIONS_INIT TRUE) + + set(SCP_ENABLE_IPO_INIT FALSE) + +-set(SCP_PLATFORM_VARIANT_INIT 0) ++set(SCP_PLATFORM_FEATURE_SET_INIT 0) + + set(SCP_ARCHITECTURE "armv7-m") + +-- +2.30.2 + diff --git a/meta-arm-bsp/recipes-bsp/scp-firmware/files/tc/0004-tc0-support-platform-feature-set-options-in-firmware.patch b/meta-arm-bsp/recipes-bsp/scp-firmware/files/tc/0004-tc0-support-platform-feature-set-options-in-firmware.patch new file mode 100644 index 00000000..aa83332b --- /dev/null +++ b/meta-arm-bsp/recipes-bsp/scp-firmware/files/tc/0004-tc0-support-platform-feature-set-options-in-firmware.patch @@ -0,0 +1,114 @@ +From 3e737dd47b228bdeffb06e39bffec7a4a436b244 Mon Sep 17 00:00:00 2001 +From: Arunachalam Ganapathy +Date: Wed, 9 Feb 2022 16:02:10 +0000 +Subject: [PATCH 4/4] tc0: support platform feature set options in firmware.mk + +Support existing platform feature set options that is in cmake to +firmware.mk. Two feature set for TC0 are +0. Standard +1. MPMM/Power/Performance (Experimental) + +Build option to select the feature set is using: +make PRODUCT=tc0 MODE= SCP_PLATFORM_FEATURE_SET=<0,1> + +The default value is set to 0 (Standard). +Refer product/tc0/doc/features.md for more details. + +Signed-off-by: Arunachalam Ganapathy +Change-Id: I4028686a8f8461e0e2c29e15d5e52eb1d37ca60a +Upstream-Status: Pending [Not submitted to upstream yet] +--- + product/tc0/scp_ramfw/firmware.mk | 41 +++++++++++++++++++++++++++++-- + product/tc0/scp_romfw/firmware.mk | 12 +++++++++ + 2 files changed, 51 insertions(+), 2 deletions(-) + +diff --git a/product/tc0/scp_ramfw/firmware.mk b/product/tc0/scp_ramfw/firmware.mk +index ec6e6679..d7515f5b 100644 +--- a/product/tc0/scp_ramfw/firmware.mk ++++ b/product/tc0/scp_ramfw/firmware.mk +@@ -9,8 +9,24 @@ BS_FIRMWARE_CPU := cortex-m3 + BS_FIRMWARE_HAS_NOTIFICATION := yes + BS_FIRMWARE_HAS_RESOURCE_PERMISSIONS := yes + BS_FIRMWARE_USE_NEWLIB_NANO_SPECS := yes +-BS_FIRMWARE_HAS_FAST_CHANNELS := no +-BS_FIRMWARE_HAS_PERF_PLUGIN_HANDLER := no ++ ++DEFAULT_SCP_PLATFORM_FEATURE_SET := 0 ++ ++export SCP_PLATFORM_FEATURE_SET ?= $(DEFAULT_SCP_PLATFORM_FEATURE_SET) ++ifneq ($(filter-out 0 1, $(SCP_PLATFORM_FEATURE_SET)),) ++ $(error "Invalid for SCP_PLATFORM_FEATURE_SET parameter. Valid options are \ ++ 0 or 1. Aborting...") ++endif ++ ++ifeq ($(SCP_PLATFORM_FEATURE_SET),0) ++ BS_FIRMWARE_HAS_PERF_PLUGIN_HANDLER := no ++ BS_FIRMWARE_HAS_FAST_CHANNELS := no ++else ++ DEFINES += TC0_FEATURES_MPMM_POWER_PERF ++ BS_FIRMWARE_HAS_PERF_PLUGIN_HANDLER := yes ++ BS_FIRMWARE_HAS_FAST_CHANNELS := yes ++ $(info "TC0 platform features POWER/PERFORMANCE is experimental") ++endif + + BS_FIRMWARE_MODULES := \ + armv7m_mpu \ +@@ -44,6 +60,16 @@ ifeq ($(BS_FIRMWARE_HAS_RESOURCE_PERMISSIONS),yes) + BS_FIRMWARE_MODULES += resource_perms + endif + ++ifeq ($(SCP_PLATFORM_FEATURE_SET),1) ++BS_FIRMWARE_MODULES += \ ++ traffic_cop \ ++ mpmm \ ++ sensor \ ++ reg_sensor \ ++ thermal_mgmt \ ++ tc0_power_model ++endif ++ + BS_FIRMWARE_SOURCES := \ + config_system_power.c \ + config_armv7m_mpu.c \ +@@ -75,4 +101,15 @@ ifeq ($(BS_FIRMWARE_HAS_RESOURCE_PERMISSIONS),yes) + BS_FIRMWARE_SOURCES += config_resource_perms.c + endif + ++ifeq ($(SCP_PLATFORM_FEATURE_SET),1) ++ BS_FIRMWARE_SOURCES += \ ++ config_traffic_cop.c \ ++ config_mpmm.c \ ++ config_sensor.c \ ++ config_reg_sensor.c \ ++ config_thermal_mgmt.c \ ++ config_tc0_power_model.c ++endif ++ ++ + include $(BS_DIR)/firmware.mk +diff --git a/product/tc0/scp_romfw/firmware.mk b/product/tc0/scp_romfw/firmware.mk +index 9977712f..0012b9fa 100644 +--- a/product/tc0/scp_romfw/firmware.mk ++++ b/product/tc0/scp_romfw/firmware.mk +@@ -9,6 +9,18 @@ BS_FIRMWARE_CPU := cortex-m3 + BS_FIRMWARE_HAS_NOTIFICATION := yes + BS_FIRMWARE_USE_NEWLIB_NANO_SPECS := yes + ++DEFAULT_SCP_PLATFORM_FEATURE_SET := 0 ++ ++export SCP_PLATFORM_FEATURE_SET ?= $(DEFAULT_SCP_PLATFORM_FEATURE_SET) ++ifneq ($(filter-out 0 1, $(SCP_PLATFORM_FEATURE_SET)),) ++ $(error "Invalid for SCP_PLATFORM_FEATURE_SET parameter. Valid options are \ ++ 0 or 1. Aborting...") ++endif ++ ++ifeq ($(SCP_PLATFORM_FEATURE_SET),1) ++ $(info "TC0 platform features POWER/PERFORMANCE is experimental") ++endif ++ + BS_FIRMWARE_MODULE_HEADERS_ONLY := \ + power_domain \ + timer +-- +2.30.2 + diff --git a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-tc.inc b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-tc.inc index cdf1bb6a..7b304322 100644 --- a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-tc.inc +++ b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-tc.inc @@ -1,4 +1,17 @@ -# TC0 specific SCP configuration +# TC specific SCP configuration + +# Intermediate SHA with 2.9 baseline version +# This has support for SCP features MPMM/POWER/PERFORMANCE for TC0 +SRCREV = "027b567fde5e3767fb1678bda28cf59fa7aac06d" +PV = "2.9+git${SRCPV}" + +FILESEXTRAPATHS:prepend := "${THISDIR}/files/tc:" +SRC_URI:append:tc = " \ + file://0001-tc0-fix-sensor-data-api-call.patch \ + file://0002-tc0-fix-mpmm-config.patch \ + file://0003-tc0-rename-platform-variant-to-platform-feature-set.patch \ + file://0004-tc0-support-platform-feature-set-options-in-firmware.patch \ + " COMPATIBLE_MACHINE = "(tc?)"