From nobody Mon Feb 9 02:08:19 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1690191792; cv=none; d=zohomail.com; s=zohoarc; b=DQ4ni6AADM+8Ckow7pFfEZRcdqXaQAqcb3mkguiu45L9gsPNas/3EI++pg+MlywrXE5GsK1qHO+B3om5usQxgDeeRcbreXdb2IxxB+i/XFh86BUBax3TGO7+WuDTcA7xTZ7Uq64mBml3IZejnzpj0uROC40yubhrGT+ezofFNTo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1690191792; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Nfcp7c7c/3n6CY6kNcbVjdnQ1GyqRTk1VyoAU9RnpnM=; b=oICTL379xX9wUehclvrWhDdQt2fZ+bfpJ+pFAOtgNzCkxMRhxuI/ErFfxWfxRaxOu0hvumAmycEEmvT+n58vEu2sAWb+VQlVsTdlV2MH0MMCOZ0HnIP8QkQXUjpNV4p2mOZbn26U4Z9qUSp1WrPwrgO02Hq+17+CNK3j4esAstc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 169019179236213.985503666810928; Mon, 24 Jul 2023 02:43:12 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.568525.887913 (Exim 4.92) (envelope-from ) id 1qNs5Z-0005iX-Pg; Mon, 24 Jul 2023 09:42:49 +0000 Received: by outflank-mailman (output) from mailman id 568525.887913; Mon, 24 Jul 2023 09:42:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qNs5Z-0005iM-Lw; Mon, 24 Jul 2023 09:42:49 +0000 Received: by outflank-mailman (input) for mailman id 568525; Mon, 24 Jul 2023 09:42:48 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qNs5Y-0005hi-ST for xen-devel@lists.xenproject.org; Mon, 24 Jul 2023 09:42:48 +0000 Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [2a00:1450:4864:20::134]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 7176ec9a-2a06-11ee-8612-37d641c3527e; Mon, 24 Jul 2023 11:42:45 +0200 (CEST) Received: by mail-lf1-x134.google.com with SMTP id 2adb3069b0e04-4fb5bcb9a28so6189322e87.3 for ; Mon, 24 Jul 2023 02:42:46 -0700 (PDT) Received: from fedora.. ([94.75.70.14]) by smtp.gmail.com with ESMTPSA id k10-20020aa7c04a000000b0050488d1d376sm6020958edo.0.2023.07.24.02.42.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jul 2023 02:42:44 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version 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: 7176ec9a-2a06-11ee-8612-37d641c3527e DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690191765; x=1690796565; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Nfcp7c7c/3n6CY6kNcbVjdnQ1GyqRTk1VyoAU9RnpnM=; b=Csan28GVnhjQUoXT1yMjYnfboJRQfsiggTVzjPbFpapz3fKWnv0vzSmzUc1EY+7oOC z36BGfFwcPVee9rEWkh0XaYxpIUKr5VUvvynqB3z+fYIa9YsDbuRFX4x+1LCFW4TXs+Z PGJred5yGMjnEoUZS0HJt8dOl8koS/OccWvg6rkbl5cKXvtYFc76seXYsHB2RgyfjadE 0qajHsS31XBdhlaV728LcMV3i8G2NmYNG2kUal+HCLYqgfxOFco/8cE3xlFuyTMzy4rG mhliVvUtHjMCAumQuvXOVRIlyEx6WKRd0V8sl/HReYBb07J5uVwYMCuChvoFu9jlQYGj HHvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690191765; x=1690796565; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Nfcp7c7c/3n6CY6kNcbVjdnQ1GyqRTk1VyoAU9RnpnM=; b=bTDYkjoJuAitv2H7e+MpbtsL4WiFGyEWYoTdX77sCREyiwvjl+Vi51JK4T/bWCJrsw Cfj24sGein3StDCTzcMOzN4gyddNlg8gpv/B081beRHYHfiM9rGS7yN+0lVCAHD887xT K21qnJn6X1FtUlmqgl6P1op7JXxS3zVar6OQEEdmC4G3ezRlyrQMlvYKZXMw5fDzR1ep 0mefr5wvdm865Wf3Jy37dqD7QBftxDr1O7dVFJR4j6B9DXSRnCbvK9yvYzU7GkdDU/se 8FqpSYlJoTKfqaT6jbKBsP2KP/cJjm8BqVMVm2QMZrKHwe1cApXtVEc3YrDTC4VDvOcR iFaQ== X-Gm-Message-State: ABy/qLbzVe+PSyOa5IcyCRgSXBAjjQdA7JzfZZdtXTOLUWfomde3ppKS yEZw9J2idpyDQyVjr7FfBhAChosfJAA= X-Google-Smtp-Source: APBJJlFtnpAKSRB9j61eraO6i0crSM/fmYILB1TIwDXPOcVEiyOaXs5GHgpCMPJAokcnijBiK865xQ== X-Received: by 2002:a05:6512:23a5:b0:4fd:d517:fbd8 with SMTP id c37-20020a05651223a500b004fdd517fbd8mr6682242lfv.9.1690191765227; Mon, 24 Jul 2023 02:42:45 -0700 (PDT) From: Oleksii Kurochko To: xen-devel@lists.xenproject.org Cc: Jan Beulich , Andrew Cooper , Oleksii Kurochko , Bob Eshleman , Alistair Francis , Connor Davis Subject: [PATCH v4 1/2] xen/riscv: introduce function for physical offset calculation Date: Mon, 24 Jul 2023 12:42:40 +0300 Message-ID: <19817eca0b7d4e8dee7eb5d5e7d3812133925eb3.1690191480.git.oleksii.kurochko@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1690191792676100001 Content-Type: text/plain; charset="utf-8" The function was introduced to calculate and save physical offset before MMU is enabled because access to start() is PC-relative and in case of linker_addr !=3D load_addr it will result in incorrect value in phys_offset. Signed-off-by: Oleksii Kurochko --- Changes in V4: - update the comment messages in head.S related to save/restore of a0/a1 r= egs. --- Changes in V3: - save/restore of a0/a1 registers before C first function call. --- Changes in V2: - add __ro_after_init for phys_offset variable. - remove double blank lines. - add __init for calc_phys_offset(). - update the commit message. - declaring variable phys_off as non static as it will be used in head.S. --- xen/arch/riscv/include/asm/mm.h | 2 ++ xen/arch/riscv/mm.c | 18 +++++++++++++++--- xen/arch/riscv/riscv64/head.S | 13 +++++++++++++ 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/xen/arch/riscv/include/asm/mm.h b/xen/arch/riscv/include/asm/m= m.h index 5e3ac5cde3..d9c4205103 100644 --- a/xen/arch/riscv/include/asm/mm.h +++ b/xen/arch/riscv/include/asm/mm.h @@ -15,4 +15,6 @@ void setup_initial_pagetables(void); void enable_mmu(void); void cont_after_mmu_is_enabled(void); =20 +void calc_phys_offset(void); + #endif /* _ASM_RISCV_MM_H */ diff --git a/xen/arch/riscv/mm.c b/xen/arch/riscv/mm.c index fddb3cd0bd..c84a8a7c3c 100644 --- a/xen/arch/riscv/mm.c +++ b/xen/arch/riscv/mm.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ =20 +#include #include #include #include @@ -19,9 +20,10 @@ struct mmu_desc { pte_t *pgtbl_base; }; =20 -#define PHYS_OFFSET ((unsigned long)_start - XEN_VIRT_START) -#define LOAD_TO_LINK(addr) ((addr) - PHYS_OFFSET) -#define LINK_TO_LOAD(addr) ((addr) + PHYS_OFFSET) +unsigned long __ro_after_init phys_offset; + +#define LOAD_TO_LINK(addr) ((unsigned long)(addr) - phys_offset) +#define LINK_TO_LOAD(addr) ((unsigned long)(addr) + phys_offset) =20 /* * It is expected that Xen won't be more then 2 MB. @@ -273,3 +275,13 @@ void __init noreturn noinline enable_mmu() switch_stack_and_jump((unsigned long)cpu0_boot_stack + STACK_SIZE, cont_after_mmu_is_enabled); } + +/* + * calc_phys_offset() should be used before MMU is enabled because access = to + * start() is PC-relative and in case when load_addr !=3D linker_addr phys= _offset + * will have an incorrect value + */ +void __init calc_phys_offset(void) +{ + phys_offset =3D (unsigned long)start - XEN_VIRT_START; +} diff --git a/xen/arch/riscv/riscv64/head.S b/xen/arch/riscv/riscv64/head.S index 2c0304646a..a28714e0ef 100644 --- a/xen/arch/riscv/riscv64/head.S +++ b/xen/arch/riscv/riscv64/head.S @@ -29,6 +29,19 @@ ENTRY(start) =20 jal reset_stack =20 + /* + * save hart_id ( bootcpu_id ) and dtb_base as a0 and a1 register = can + * be used by C code + */ + mv s0, a0 + mv s1, a1 + + jal calc_phys_offset + + /* restore hart_id ( bootcpu_id ) and dtb address */ + mv a0, s0 + mv a1, s1 + tail start_xen =20 .section .text, "ax", %progbits --=20 2.41.0