From patchwork Sun Feb 21 09:37:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 386009 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CF9F3C433DB for ; Sun, 21 Feb 2021 09:40:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A27DE61494 for ; Sun, 21 Feb 2021 09:40:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229905AbhBUJkA (ORCPT ); Sun, 21 Feb 2021 04:40:00 -0500 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:6901 "EHLO esa6.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229502AbhBUJjw (ORCPT ); Sun, 21 Feb 2021 04:39:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1613900391; x=1645436391; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=GBHNYLFSgHrPHgAP9qAEtDddLOQrpHzftD5Z6q08w7M=; b=X2xNoSWwAe3fhB1AolqnwECpsaWig6yRbn0dnALmjHpJK/LIosvbjUe8 ivi8c2IOjgzg6uklRlRb72byRs5MMCq/1P6HHO6//E/VXQh23zTj1LSZ7 8gPXVQL1jf6XbOVWxHdt8JpDZzU2GYM6s6O9t6Y9OwyiYBTcA3PXhOVEX eNK5RHSUgbWZQJFi5fe96HcMQROPcOSbsK4UaxccWbT/4nbt/QxjhkEjf psYpjuheCo7iJCL2sFBEq5efDKwbiirNbzBVCUrNY2lyQ4/ieiBdDoQ0k rUBHUgO8IqoVxFk+eIys7WrBmcBFANmh6txgaEyhkFdBGGVb8SuhrrZKz w==; IronPort-SDR: eKO9BAFVI3opodv4dzvHpU/gYNchp10g33TXRy77UE5TZdzWp5bpZKZAUSFWYwdZwg/NprzR9n RrdKnJUbs+mWIn99iew9xT3s7+EkkVRmC3PrjC/3ZbbD+cjcbHViDUQDUczSjRG5Q/zohc6YZi lQ5LLbUaekSvEKZdYFhN4/8QyMdAIj1fbLXmggfTB0hGkcNlY5LpyMYDtTw1wYZDBXdHyluoJ+ RJ+LBB2TFroXBEdYFUsEdDIUkCT32dlg6NOiIzYctlajWX15DyA5hUmcMMv+LQSfxB+u9AizK2 4Zs= X-IronPort-AV: E=Sophos;i="5.81,194,1610380800"; d="scan'208";a="161607383" Received: from mail-mw2nam10lp2109.outbound.protection.outlook.com (HELO NAM10-MW2-obe.outbound.protection.outlook.com) ([104.47.55.109]) by ob1.hgst.iphmx.com with ESMTP; 21 Feb 2021 17:38:44 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QJmAk6NiiXLw86CbO8aQmf2nXmHZcfffFTsP/4KvcStu86z9KQzWinstozzYKO9bC+PW8Z2hzdUXxg8njnuPtrgEIJ9lrhdKyc5MtHhm49jmaI30Mb9Nkd0c3b5RRE8AOyzwqhen3W72rB9dZUaZ//5Yw/VQzkKIvXgID3hdYMEmzgCn5gSCX9Yt4V2ea3yDkUOh7lZMVWBTokYbxbe3+2FJzFgA3z8p8OchpSuNm1ck4FOnByHA4GQb6PuiIPwdOkp2ykVzOCh8VvNvnHPQdo68IWZtE/Gn29uiVHP09EMT9vLiwYgcEUTW2e0St4krpQ5cxbtYStrmszeVSTmMvA== 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=YB6mekUajIexQv/P0cRJODxHHP6BBibTXdbXt19jT9Y=; b=MV9La7BV42W+ze7O3iCVkNQ6e8dztX90nf+oRgnXLxFCgQK/XBMCOKlihPg1DuTeM8tXG17SnzaPdyaIJ61ghhQv9kvUEP1Txm+6hsELS/4C1GA8KuYMb5HXLFbHUbmb3VD4qPU9SzgOOlcHVRoIbQqbqcfEETRH9KscUYV7fYYPoOWVrkGi7+1pzTdvzv2gzXn/pbvowfC6ciDToqtDrCV1nbipD20DrziXgd+Tn4nk14uLz4iVu3d3tF9uhVOIHIRmoCl2QHTtBf14eUib+/vsXyjKECyhr+bBwwUPJL3cXLYMIoj8mQsgNqaRY6qH0jE6082y6pJD8R6s3r0yVQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wdc.com; dmarc=pass action=none header.from=wdc.com; dkim=pass header.d=wdc.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector2-sharedspace-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YB6mekUajIexQv/P0cRJODxHHP6BBibTXdbXt19jT9Y=; b=ZT8uD2MiwYXJ2xhPydGnvqZwzlDzT9S4ynzZQk5to38w6ePCjBJ5MKzaOz32mxAwqsyzktyKl1tOrW9226Ot5rF/oa2UzQMCMzd+MxQXkrrUxxeAH2hQfOWfYQ69iZAtv3fCSrcrbFo8lLlDxDo9e3l0tg63extYf+emcDuR0L4= Authentication-Results: dabbelt.com; dkim=none (message not signed) header.d=none; dabbelt.com; dmarc=none action=none header.from=wdc.com; Received: from DM6PR04MB6201.namprd04.prod.outlook.com (2603:10b6:5:127::32) by DM5PR04MB0459.namprd04.prod.outlook.com (2603:10b6:3:9d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3846.25; Sun, 21 Feb 2021 09:38:42 +0000 Received: from DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::38c0:cc46:192b:1868]) by DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::38c0:cc46:192b:1868%7]) with mapi id 15.20.3868.029; Sun, 21 Feb 2021 09:38:42 +0000 From: Anup Patel To: Palmer Dabbelt , Palmer Dabbelt , Paul Walmsley , Albert Ou , Daniel Lezcano , Ulf Hansson , "Rafael J . Wysocki" , Pavel Machek , Rob Herring Cc: Sandeep Tripathy , Atish Patra , Alistair Francis , Liush , Anup Patel , devicetree@vger.kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Anup Patel Subject: [RFC PATCH 2/8] RISC-V: Rename relocate() and make it global Date: Sun, 21 Feb 2021 15:07:52 +0530 Message-Id: <20210221093758.210981-3-anup.patel@wdc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210221093758.210981-1-anup.patel@wdc.com> References: <20210221093758.210981-1-anup.patel@wdc.com> X-Originating-IP: [122.171.171.12] X-ClientProxiedBy: MA1PR0101CA0009.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:21::19) To DM6PR04MB6201.namprd04.prod.outlook.com (2603:10b6:5:127::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from wdc.com (122.171.171.12) by MA1PR0101CA0009.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:21::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.27 via Frontend Transport; Sun, 21 Feb 2021 09:38:36 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: c361fe70-97ca-4ad6-1423-08d8d64c79b6 X-MS-TrafficTypeDiagnostic: DM5PR04MB0459: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: WDCIPOUTBOUND: EOP-TRUE X-MS-Oob-TLC-OOBClassifiers: OLM:3276; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nKoL4Fy4uw2LW2LJHkImi70uve6kp0RGBC6f24mUXBgNUaKUBdPXnD8f6NQijaUiTknq9wdrj1NfgPX1jHKHvyFndbODNarBgOrVL0tnzxBkh3JW0/IJ+xxw4s8a5o8l48xfZP78tbK0VlHIfGWcy7P565g7tAmgAKYaP2Ilqv6ViTce1DByzSW7OBul8ZjkC0Nnkr7FkiAK/R1TR7nIu2MzuzaHV51K71pI398rMsdsOBjWNk2ryUiFiQR0DkXs1aYip8jWb2LdgcQ6akawoQHvB0G7Al3RLaa83gULfwa338iJceLsgSJokQ3kQqawRquRlUeGWmSIPh2gt0oSMdLXZpZB+8YitZd6vA8tQrmRKGHe9vIhqA54uq1++7mKhGvh3g5BctxH/BdEXayVe66Jls7r2R4YJxi3Sr7l0huOl547rAKwF1WZot82v6CS6zcRPPA8gxekqQgvebDxe+KWuQBdSdECrOXkMgpCrDdiZoE8hoAedVyauoKED2smFL7rcRtN1K6Mw2yzOz6t4Q== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM6PR04MB6201.namprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(376002)(396003)(346002)(39860400002)(136003)(55016002)(44832011)(66556008)(8676002)(2616005)(6666004)(16526019)(7696005)(5660300002)(54906003)(110136005)(4326008)(66476007)(36756003)(83380400001)(478600001)(1076003)(956004)(8886007)(316002)(2906002)(66946007)(86362001)(52116002)(7416002)(8936002)(26005)(186003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: R7Hsp9XJ4IwdR3HQJKoay7z0bKBDNi3SyAbcg9Nelmb9MLK4vJV/ilsbLIrYKrMoagjOl3IRJ2l/wDJqBox4NxV0j1DpmvEpLeKwZIazAmhDiGoeukoDObDq05SDipXbcm5jnrwqEoHE7ZxxPZKpvVqltgUaHjwYafIQkdHHzxsN4XJCj8PYWOJNLu3uF9ldywcrCmkkXKgcj0uZhkGoUbmmQT/iOuMjv1J5EfSHzd8aLFDbhd3oCbnZaKFQR9/YHVdI5Q0/OHskD0Ny3cyx80t1uwDO3s17dRxpuKvJJ+7G1QQZLqVU86q7prwa6ZmPpQf/Apl9UFxNKhc/6gS9q32dzAwcIIe48+w+ETLMOjU7eIxNUUbjLeX5t6wsc9ALwiUysHlYZNyZcJnda5q7k5azgFjQydfuhFGagl0VwASmmlI8h3gRvdoSPYR/+YYKSVtQm0DZc/w2frg5cYrsgnelhxj1DY78WbPkyeRLS+POFrNS/NehyU1dX1tR11zEiHryuGFpetAI4vl2vq53ac3FnI+NjiluJzU6Xnv9dyzZiZCbQq37GessBIoIzJoLXzR5Xn8dlHKvfznWJW5MbXUGvvgOc1/YMFIHtgYrKbGzuqM86N1TSCwnTXRNctaj1kJM9eKYuQi76iB+pAAd74ax+VTCuFWSDRy9AZNj22QE58G/cTK2OkN8k3aWDDxWqM2s0QIZ+j9Kuxci7etGcjkR0lG86o2evKfuLrlsd5nM0QFKLwRso7UIo0qRj3HSatijth7f7qVoidLeiFLz8KLiFxTjr8v+TCDDIEIWddmUEq1xpRO4JYUrsKSJHTRVilVhu93US97+M7u45eV7VnJYZBcnzpns7Ive1uMHKcgcHdCa9r8jjiPha/FBN9l9Or9yqF6CmPLlJDTPUWFXrRg8HzclobTP8iGJOGFoteSno/LIYU2E04T9DP9pTG5CawDgGJJRrIX4EaMSZHrv9bGpOoPdEuaIOpgCH37GNUEVgmsC4lYN6nkOXZRYyAxW1VS9RVPQw9FN7F6SPSXep67Pd2DI1CA9l9Br5H44nKi9z1OPZCWfofG+quaoKFCYFfvy1lA5zERtoBljC7NDg+Z23XhxKfZf6iJbL9jJZP04p03fX7Smok36a6Bu8eL6KBqlaBqWITAjaMx8w3/H/2DMTny2sF8ljzwVBKY+A2OAVnaO5wE6uAoFaH0kW+L2Yz2AYjdzlRytEhdKI6ASi4KAC2iwILq5eHstZN7Q2p032EVc1Ug35V7kvqekkjShqsYZJSc/5HeDXcxHFvzwcUeh7nRsirY5J0ogKW00MDPyx7NpAkW/l5iuMPCqJv8g X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: c361fe70-97ca-4ad6-1423-08d8d64c79b6 X-MS-Exchange-CrossTenant-AuthSource: DM6PR04MB6201.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Feb 2021 09:38:42.4856 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 1i9RUUV8wbeGn0Z6PfVttWmLVFP7MTzQ7WD+nyETz8I6OTgXx1Umsa7a/GbwipcwJQG138QnicjCOqjBuuRnlg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR04MB0459 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org The low-level relocate() function enables mmu and relocates execution to link-time addresses. We rename relocate() function to relocate_enable_mmu() function which is more informative. Also, the relocate_enable_mmu() function will be used in the resume path when a CPU wakes-up from a non-retentive suspend so we make it global symbol. Signed-off-by: Anup Patel --- arch/riscv/kernel/head.S | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/riscv/kernel/head.S b/arch/riscv/kernel/head.S index 16e9941900c4..a8aca43929d8 100644 --- a/arch/riscv/kernel/head.S +++ b/arch/riscv/kernel/head.S @@ -67,7 +67,8 @@ pe_head_start: .align 2 #ifdef CONFIG_MMU -relocate: + .global relocate_enable_mmu +relocate_enable_mmu: /* Relocate return address */ li a1, PAGE_OFFSET la a2, _start @@ -156,7 +157,7 @@ secondary_start_common: #ifdef CONFIG_MMU /* Enable virtual memory and relocate to virtual address */ la a0, swapper_pg_dir - call relocate + call relocate_enable_mmu #endif call setup_trap_vector tail smp_callin @@ -264,7 +265,7 @@ clear_bss_done: call setup_vm #ifdef CONFIG_MMU la a0, early_pg_dir - call relocate + call relocate_enable_mmu #endif /* CONFIG_MMU */ call setup_trap_vector