From patchwork Fri Aug 4 06:30:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 13341318 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 lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 98C6EC04A6A for ; Fri, 4 Aug 2023 06:30:28 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.576879.903529 (Exim 4.92) (envelope-from ) id 1qRoKI-0004nG-Bh; Fri, 04 Aug 2023 06:30:18 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 576879.903529; Fri, 04 Aug 2023 06:30:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qRoKI-0004n9-90; Fri, 04 Aug 2023 06:30:18 +0000 Received: by outflank-mailman (input) for mailman id 576879; Fri, 04 Aug 2023 06:30:16 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qRoKG-0004V1-L4 for xen-devel@lists.xenproject.org; Fri, 04 Aug 2023 06:30:16 +0000 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2053.outbound.protection.outlook.com [40.107.7.53]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 5fc27f67-3290-11ee-b26a-6b7b168915f2; Fri, 04 Aug 2023 08:30:16 +0200 (CEST) Received: from DU2PR04MB8790.eurprd04.prod.outlook.com (2603:10a6:10:2e1::23) by PA4PR04MB7549.eurprd04.prod.outlook.com (2603:10a6:102:e0::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.20; Fri, 4 Aug 2023 06:30:15 +0000 Received: from DU2PR04MB8790.eurprd04.prod.outlook.com ([fe80::e5cf:5743:ab60:b14e]) by DU2PR04MB8790.eurprd04.prod.outlook.com ([fe80::e5cf:5743:ab60:b14e%5]) with mapi id 15.20.6631.046; Fri, 4 Aug 2023 06:30:15 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 5fc27f67-3290-11ee-b26a-6b7b168915f2 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Gs04y2bRLoSOIC/O5daECMMYZc7FpA1V1x3wGUo1SAWv+j8Qv043wMdjgf2FGBYMnXhH3wSD9pbA/CI+u4DP1gdEtmr90MTVCrADqKDLaRC80mL68mnkkSLixnghX4cQCI6hqelY5X6L6niq4vTtYcw5J3laJ2/zIvJd3l9HkmOZDg0Hz8jIGtIhS6Q7k65y+V2sIE42ln74k8vmy6+rAQtTmI7u3FU/Mf2mL5BibHmfHwV03JcQUpaoipMH5r9wjNsHM3R3lbqw9fsjzS0kIpiYNpiaqAmntjvrafhg2WISjUQcMS9iFE/98MFrZBVceaLSyxsEM6ziDCQwC2/VVA== 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=R5BIsX4FSDC0bHsNPv5zyFFrdlOeD6u1F2sVkFP/hDk=; b=GCG6IOxZ/+3H5dB7nFMPA5uJ9Zybi1o3l8J076k3cAVpc9OtnnDAsStoRPd06ePxDQ2LimCwRHWx8vda5XAWSG/HoHv5aAT8UZold+xHpXV+U2USz+AAe+p1h6nOxokaHeRVlD2A4oyO93pIvo9VfeKwhQwPjhlIPRPhVQv/NSUuwxuknNk1RT/pUq3kkH8an4ZDOqFmk5SX4GMPaKyl1Mi0rHL8i1q3KdoxaGPNtEOMVtqwaJi6vH04Jhl+pzHhHVxOdCQgVrd74aZ7qK9oopd3A6zQXQbJ4k8/1W2kHv+lUa3A+HPMIpotn3exIcURSgLTLdT7k3jHo1obXSCqIQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=R5BIsX4FSDC0bHsNPv5zyFFrdlOeD6u1F2sVkFP/hDk=; b=REvIjxpOiQ9k8mQbOavFaTAXXZ0UJ8797VdaQkxMHxks/8SOYPghJhEQ+XRHwgJd4kzpi1k1QJqE0wLL9X30aNX10CgIAWfHNqwAM62EgHA8WrJyfr1iRKrZ+9xqiNINy8asF0SYWJCeYM1uSBc/xyVJX/CVRMBtZwiQAfcaiSSRmOIlpA3vYOoSTddxQVe3GH/w8exJHpp8W41Vz+T9YWflREFO5lbWeaHZmalysDBqkTtWPPHefiCwaw0CuR1Pmr6aJOb4lciunIY+JvgPLqkxPhNUkCBH5nXSFriSolbPoxhjstLULS0pVnnqH7XsBk3a7QKbCTSBM7PDJrnHeQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <7f855a0f-602f-910d-8fd9-956b379229f3@suse.com> Date: Fri, 4 Aug 2023 08:30:13 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.13.1 Subject: [PATCH v4 5/8] PPC: switch entry point annotations to common model Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: George Dunlap , Shawn Anastasio References: In-Reply-To: X-ClientProxiedBy: FR0P281CA0204.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:ad::13) To DU2PR04MB8790.eurprd04.prod.outlook.com (2603:10a6:10:2e1::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU2PR04MB8790:EE_|PA4PR04MB7549:EE_ X-MS-Office365-Filtering-Correlation-Id: 5586d770-0169-415c-d8a2-08db94b44373 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IY9cps9VzvlNY0zPpJCRsNSwd9y7evuPlYSh5JA5lnm+j3cCcjtgqPFH3G++IenLrEotc5BLNbrzIlbya89WPtjiXhHg2EyPmGRiDeUQ+OYfDHGjUsUmvtG8qdC9lA7cnSSeZ5sTYSPJiC3OYWwUatnxGHZ+uCCzLO2RjMc5Q+C48zRe7G8qoFT181P0+BUPU2DhxeB7qAFTVYym66cwWPUIzLhHqNROzvulL1niXVxSLqfKAzQODOD4AtEing6sVeSLW2TuPER8rlvagpeWemIwP8pJUZtvLdui0GqSzANoGdhLXglEYzk3gwTffzr9zgbsJAP024c8FH0ctSsTuIPQEo0ppew6D3qvUKz9XikJMQFzzL5r4tQQLEM8puMZ7mntm0kTOXnbm1Lsa3ln1HegiY4aVkyNADirZLfD3OSdMqn5rEjFjFzezs9x0CnevpciAP89Xr1GGJMYwkMfWUG233ld/rBTB8pDeceuo+X9HcaNH1FoKxvCUzhG0Y9dMDpkYmHlC43z92+kaOyOCL74PQPm0PwmpQS5e8pj8hE5FY3Zwmf2CVPG/prfpOT/2tL1dDh5EzbeTS+Vx4IobEcVbeklbKSo6KuLYx8HDsWktZcfA2qFRCi65wleZeA3aT9jNe5RzcVk/SNY3a9ecA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU2PR04MB8790.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(136003)(396003)(366004)(39860400002)(376002)(346002)(451199021)(1800799003)(186006)(4326008)(6916009)(316002)(2616005)(66946007)(66476007)(66556008)(5660300002)(26005)(41300700001)(6506007)(8676002)(8936002)(31696002)(54906003)(6512007)(6486002)(478600001)(31686004)(38100700002)(2906002)(86362001)(36756003)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?Q+5+vKj3W5EOt+XnRUN1Iwf4eBg6?= =?utf-8?q?uEKY9L7y1LBtEIY0qUvvpSunK1v9M/EMDqoHInBy6VTOrSdftKotdFQWSR/AZGAXk?= =?utf-8?q?GoJMEimwMmJH8SoHLiEYeo8I02hDOV16k6esXUk+f9jIpKMmC88M0Aq2oY1vAqd3U?= =?utf-8?q?qF2wb6Quaw82ZsK7S6iTKLWublDvkau2edHpaxsxa8e2PVtaRdtMCgBgUajf0KUo0?= =?utf-8?q?a5O/d1LSidhtEtnDcOVSfrGuDgqk581PtRxNI4JI5SXvCcQMwxjaBU/qwIrwAqQAn?= =?utf-8?q?PjK+bjBe+xUNmDy/oAOswrr8Eib4mKS6nixs+iyMED8aDiGnZU518NVhhNDWF4xoM?= =?utf-8?q?djCgfsjMw4bLtGaCOipEYpPMDwZRdFl9q663F1ubxOezDf+GPUdGDPNHFZCMj1f7D?= =?utf-8?q?aoHmuH+AQ2hS47Dj+KaA8aBnX0T3v/P0JstfigFpbfloRs6LfO0CrvfcLOZU53kQw?= =?utf-8?q?IVoS3YypipednmYtiX72rrymhiVBZ9mJBIKW2darMxV4Iq/YEIywTS5j4BSGG3KV7?= =?utf-8?q?HKmR7WUB1ZGti9U7/ooLDZNnL3D4kc/Y0SC0DBwZph3mf7mZ4oSVdr9V2gdXMtkrG?= =?utf-8?q?w+83qyKIQlftKMHT8WBkyEiUzJFMNSNCKKICyYjzTmKi4VPLnD5UpRHbcvuo/tuKW?= =?utf-8?q?dymZQ3+F+rSVNhlyNqLtfMG+wkm/BU0+oWXavu/6yVKiI95qPDTknVuC1S7nPkQV2?= =?utf-8?q?vzr4Ap50/siXd+SmRFQcNmBqobC9uQVZwoCvLS++hNZhaHElLXMHfH6meABjf+cLG?= =?utf-8?q?zRXFMNwqJ7kLefZR0RVztYawSiZn448FOiFRlM9oVDIze5uHdLEewowsUM3HKJO9/?= =?utf-8?q?jvQ2aj3lDeujuuUIozI/PO6qlMjos+rvqch8/lU1q2nKSuhCUa+PRxZK3LBSku5SS?= =?utf-8?q?irIOaEfVAA2BCZARpEcUittSv6EoY5LgCI2GgdZILjuzsZqtPCF3YhyHw91MwjURo?= =?utf-8?q?rh5k6IVgSwg68f1ZkPvrr9bGrJU/F0J8rqN8/NnzcjNQ9ulUAFuQsmhtLFSNZ+pbC?= =?utf-8?q?g+LaWSFDfh2x4POWw5IHp372LJwZsOjqKhdLdNXHl24wq/uIjPbsUAiKEQzMnVN1D?= =?utf-8?q?lOXzVYoYnM2cG4Oc+BIr434n7T3nCsgkk0HpLaEXfAtMTR2DdDTiMile5QLarfHZh?= =?utf-8?q?pq54nxq4RiyUnWdoTwicYkoC8aG1aNMdTMt5rBdvI8k7Qm5HV4zHE2xnlWKTQeHmh?= =?utf-8?q?PN9ziQ+GrVnOHpS7SQjzj4IKUVFVg/LyNhd7dR8b6fYcNA4Csl7DVFN1llNXNsS5r?= =?utf-8?q?c3WOJYoqZ2Gc+tXa96jK2Ck3s8apvyZ7sXjSPyFAT0mrb+oQSormD0KKVkYnt4so2?= =?utf-8?q?rqJhbmxZ2ldwEntq0Ay5wy5KeEkJNxygs55kOyLAn5/rvgkCOBKnGrd+0fThCzD8K?= =?utf-8?q?uN2llH04V0NXbwnYZpA8fRSI3EmtJm3qYPZqlqmQgaL4TSasum2GX881r2VbU9lXw?= =?utf-8?q?U/A8vh58aWX017tPvU4RfgoSdGTPzk53C3Wbs5vvS2o6aoCKPBBLH4cFnYWbA9K39?= =?utf-8?q?mdAQX7f+z0Iz?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5586d770-0169-415c-d8a2-08db94b44373 X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8790.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Aug 2023 06:30:15.0839 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 548XGWNPmS4WUxgWjBCr9m2i63ALLZf15s/z9SveaL5saH7UofCEGCCGwy+sX4Zp/X+r5TKBH93+UX/BUqs7KA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7549 Use the generic framework in xen/linkage.h. No change in generated code except of course the converted symbol changes to be a hidden one. Signed-off-by: Jan Beulich --- v4: Also drop #undef-s from linker script. Re-base. v3: New. --- a/xen/arch/ppc/include/asm/asm-defns.h +++ b/xen/arch/ppc/include/asm/asm-defns.h @@ -2,6 +2,8 @@ #ifndef _ASM_PPC_ASM_DEFNS_H #define _ASM_PPC_ASM_DEFNS_H +#include + /* * Load a 64-bit immediate value into the specified GPR. */ --- a/xen/arch/ppc/include/asm/config.h +++ b/xen/arch/ppc/include/asm/config.h @@ -31,12 +31,7 @@ /* Linkage for PPC */ #ifdef __ASSEMBLY__ -#define ALIGN .p2align 2 - -#define ENTRY(name) \ - .globl name; \ - ALIGN; \ - name: +#define CODE_ALIGN 4 #endif #define XEN_VIRT_START _AT(UL, 0xc000000000000000) --- a/xen/arch/ppc/ppc64/head.S +++ b/xen/arch/ppc/ppc64/head.S @@ -5,7 +5,7 @@ .section .text.header, "ax", %progbits -ENTRY(start) +FUNC(start) /* * NOTE: argument registers (r3-r9) must be preserved until the C entrypoint */ @@ -36,6 +36,4 @@ ENTRY(start) /* should never return */ trap - - .size start, . - start - .type start, %function +END(start) --- a/xen/arch/ppc/ppc64/of-call.S +++ b/xen/arch/ppc/ppc64/of-call.S @@ -23,7 +23,7 @@ .section .init.text, "ax", @progbits -ENTRY(enter_of) +FUNC(enter_of) mflr %r0 std %r0, 16(%r1) stdu %r1, -STACK_SWITCH_FRAME_SIZE(%r1) /* Save SP and create stack space */ @@ -78,6 +78,4 @@ ENTRY(enter_of) ld %r0, 16(%r1) mtlr %r0 blr - - .size enter_of, . - enter_of - .type enter_of, %function +END(enter_of) --- a/xen/arch/ppc/xen.lds.S +++ b/xen/arch/ppc/xen.lds.S @@ -1,9 +1,6 @@ #include #include -#undef ENTRY -#undef ALIGN - OUTPUT_ARCH(powerpc:common64) ENTRY(start)