From patchwork Sat Mar 1 05:26:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Cain X-Patchwork-Id: 13997303 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.gnu.org (lists.gnu.org [209.51.188.17]) (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 878B7C282D0 for ; Sat, 1 Mar 2025 05:28:18 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1toFOJ-0004K0-Py; Sat, 01 Mar 2025 00:28:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1toFOF-0003z7-J1 for qemu-devel@nongnu.org; Sat, 01 Mar 2025 00:27:55 -0500 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1toFOC-0008BY-MW for qemu-devel@nongnu.org; Sat, 01 Mar 2025 00:27:55 -0500 Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5214jQp6007534 for ; Sat, 1 Mar 2025 05:27:42 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= x3Hhsdu3ARt1Cpm7Zgmtm+GcTJbtOBJIiB0WlCtI3Q8=; b=L7U3z/+YikjtGw/J iiirZ+Boz/BfH05C5apZc36PYIJGmKyUFhw0W+XeDNji5Waj/Qt1YWvxOsd44Okf h2MWXO+aJbR8g7DdYaLuB3bbd3bgqJwlTGV0LFVh0fL0JSvqTkhlecWtHjezHDwj 4yvjbT3JgscwKp0y+xuRA49x5qRd3pXe1lnOC4Rpxbo9Y75CGKUqhMHAEznJ87S4 lGPJIIzGWeWaph4a5EnvbpujhQZ0OsbHEWubUQoUGKyT7cWr7PEzFZQWBdkwRDAv Mg4CqoVYp2ZsfoQ1flg+JevBtwTHR2xko/lH8rnaLL0GUBZdReWCNAYN20tuI5jq S6Nexw== Received: from mail-pj1-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 453t89r64n-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sat, 01 Mar 2025 05:27:41 +0000 (GMT) Received: by mail-pj1-f72.google.com with SMTP id 98e67ed59e1d1-2feb47c6757so3927713a91.3 for ; Fri, 28 Feb 2025 21:27:41 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740806847; x=1741411647; 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=x3Hhsdu3ARt1Cpm7Zgmtm+GcTJbtOBJIiB0WlCtI3Q8=; b=FT6//e5BEcwIM6iLNmZbyZl8nv5zJZw3dY/lIYWT+KHmA6nyipfv2xkuK9DtUOuGdr +u1LjelChO1RBsqTwJQSOvHGsSBxCh3mlAWuys1ncwC1kHRPG/LouKu/0LpYAhrjRfKo lNVie5hXCOk1xhsMKhD2ovDBc7VhR/50qrsoiHxoum+GoxKZ+9g+dfy+QYscB9IiSCAs Wlvo7aFg2we04fnY2YNsoUjti97KHdgqBm7Moq4seWRYfFcGGLSkHE7qY18N0TqaHtgM r/26PAAnk9PB8Sp37BweP0Wn3nNNeqbq4/EbgJmjtN1JiCn7g033Ma91yV0VsgZJk4Gb Q5wg== X-Gm-Message-State: AOJu0Yxz442EBzaiD/Ap010MisL4avJaHjpnghO0VaPC+C1lwSSdkrJK ObQpbawsA7FyOMsdbFWZV9IUELi1zg4PEVqlr3yXH6pFwhT5ZcnE2HIEQJRcyZ6Y7p+ghlqDug2 e3VpTbS1P9dm5vx9VQ+3w8Tn60MbxCEuXo0eFU8Iwrvqh3bKAThTZYEoBaBiARw== X-Gm-Gg: ASbGncszV9BuDjzXqjHZO7JMntCH4I9Y0O7W+1pa2uYw1cnUF2yYH7m5S+8JlePHIc4 CVAUTxNOOELjj5SP3IkrQ8mDZ4Bwscx4/69qzSVe2slPfwFA87YIwS0Dhus8lfc3CQzyjJU5ATh oax2jA4gV3iknBuvf3mmYTc333yrP0o88SrTrKCvKOnE5yRNHxH5DKF8ZJPLUgXDz7CMkuy7gvc hb06DMYuSVzqUd1MumuLWu2yjRO/13B+ZSC7RvbBNGRl2U3I+8C7MzEgggFAmzzqCOOT6QPQwYL SPjVZFeRJPDXrG/eIRT4Bp0rxiHmCPbv2rDY3aY/t1ca6eFcSQ3rbSfDBV+RU+ig X-Received: by 2002:a17:90a:d448:b0:2fe:b907:3b05 with SMTP id 98e67ed59e1d1-2febabda04amr9596133a91.29.1740806846616; Fri, 28 Feb 2025 21:27:26 -0800 (PST) X-Google-Smtp-Source: AGHT+IGcfzW9a1JSBbOFcyIKkefrl8MHrws0+TY+DMTgOKaMoLrnyoRubdXFjzbxEDEVlNvOAozyBA== X-Received: by 2002:a17:90a:d448:b0:2fe:b907:3b05 with SMTP id 98e67ed59e1d1-2febabda04amr9596102a91.29.1740806846245; Fri, 28 Feb 2025 21:27:26 -0800 (PST) Received: from hu-bcain-lv.qualcomm.com (Global_NAT1.qualcomm.com. [129.46.96.20]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2fe825bb346sm6930596a91.18.2025.02.28.21.27.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Feb 2025 21:27:25 -0800 (PST) From: Brian Cain To: qemu-devel@nongnu.org Cc: brian.cain@oss.qualcomm.com, richard.henderson@linaro.org, philmd@linaro.org, quic_mathbern@quicinc.com, ale@rev.ng, anjo@rev.ng, quic_mliebel@quicinc.com, ltaylorsimpson@gmail.com, alex.bennee@linaro.org, quic_mburton@quicinc.com, sidneym@quicinc.com, Brian Cain Subject: [PATCH 29/38] target/hexagon: Add locks, id, next_PC to state Date: Fri, 28 Feb 2025 21:26:19 -0800 Message-Id: <20250301052628.1011210-30-brian.cain@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250301052628.1011210-1-brian.cain@oss.qualcomm.com> References: <20250301052628.1011210-1-brian.cain@oss.qualcomm.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: SIPx1dpIKHfRcjynQIH2Rqx3I8M8jxZR X-Proofpoint-GUID: SIPx1dpIKHfRcjynQIH2Rqx3I8M8jxZR X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-03-01_01,2025-02-28_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 lowpriorityscore=0 impostorscore=0 priorityscore=1501 spamscore=0 phishscore=0 suspectscore=0 malwarescore=0 clxscore=1015 adultscore=0 bulkscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2502100000 definitions=main-2503010040 Received-SPF: pass client-ip=205.220.180.131; envelope-from=brian.cain@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Brian Cain Signed-off-by: Brian Cain --- target/hexagon/cpu.h | 37 +++++++++++++++++++++++++++++++++++-- target/hexagon/cpu.c | 6 ++++++ target/hexagon/machine.c | 4 ++++ 3 files changed, 45 insertions(+), 2 deletions(-) diff --git a/target/hexagon/cpu.h b/target/hexagon/cpu.h index b7789a3c90..fb66151ac9 100644 --- a/target/hexagon/cpu.h +++ b/target/hexagon/cpu.h @@ -40,10 +40,37 @@ #define PRED_WRITES_MAX 5 /* 4 insns + endloop */ #define VSTORES_MAX 2 +#ifndef CONFIG_USER_ONLY +#define CPU_INTERRUPT_SWI CPU_INTERRUPT_TGT_INT_0 +#define CPU_INTERRUPT_K0_UNLOCK CPU_INTERRUPT_TGT_INT_1 +#define CPU_INTERRUPT_TLB_UNLOCK CPU_INTERRUPT_TGT_INT_2 + +#define HEX_CPU_MODE_USER 1 +#define HEX_CPU_MODE_GUEST 2 +#define HEX_CPU_MODE_MONITOR 3 + +#define HEX_EXE_MODE_OFF 1 +#define HEX_EXE_MODE_RUN 2 +#define HEX_EXE_MODE_WAIT 3 +#define HEX_EXE_MODE_DEBUG 4 +#endif + +#define MMU_USER_IDX 0 +#ifndef CONFIG_USER_ONLY +#define MMU_GUEST_IDX 1 +#define MMU_KERNEL_IDX 2 + +typedef enum { + HEX_LOCK_UNLOCKED = 0, + HEX_LOCK_WAITING = 1, + HEX_LOCK_OWNER = 2, + HEX_LOCK_QUEUED = 3 +} hex_lock_state_t; +#endif + + #define CPU_RESOLVING_TYPE TYPE_HEXAGON_CPU -#define MMU_USER_IDX 0 - typedef struct { target_ulong va; uint8_t width; @@ -89,6 +116,12 @@ typedef struct CPUArchState { target_ulong *g_sreg; target_ulong greg[NUM_GREGS]; + + /* This alias of CPUState.cpu_index is used by imported sources: */ + target_ulong threadId; + hex_lock_state_t tlb_lock_state; + hex_lock_state_t k0_lock_state; + target_ulong next_PC; #endif target_ulong new_value_usr; diff --git a/target/hexagon/cpu.c b/target/hexagon/cpu.c index 2b6a707fca..908339c052 100644 --- a/target/hexagon/cpu.c +++ b/target/hexagon/cpu.c @@ -303,6 +303,12 @@ static void hexagon_cpu_reset_hold(Object *obj, ResetType type) arch_set_system_reg(env, HEX_SREG_MODECTL, 0x1); } arch_set_system_reg(env, HEX_SREG_HTID, cs->cpu_index); + memset(env->t_sreg, 0, sizeof(target_ulong) * NUM_SREGS); + memset(env->greg, 0, sizeof(target_ulong) * NUM_GREGS); + env->threadId = cs->cpu_index; + env->tlb_lock_state = HEX_LOCK_UNLOCKED; + env->k0_lock_state = HEX_LOCK_UNLOCKED; + env->next_PC = 0; #endif } diff --git a/target/hexagon/machine.c b/target/hexagon/machine.c index d9d71edf77..dc900422f4 100644 --- a/target/hexagon/machine.c +++ b/target/hexagon/machine.c @@ -19,6 +19,10 @@ const VMStateDescription vmstate_hexagon_cpu = { VMSTATE_UINTTL_ARRAY(env.pred, HexagonCPU, NUM_PREGS), VMSTATE_UINTTL_ARRAY(env.t_sreg, HexagonCPU, NUM_SREGS), VMSTATE_UINTTL_ARRAY(env.greg, HexagonCPU, NUM_GREGS), + VMSTATE_UINTTL(env.next_PC, HexagonCPU), + VMSTATE_UINTTL(env.tlb_lock_state, HexagonCPU), + VMSTATE_UINTTL(env.k0_lock_state, HexagonCPU), + VMSTATE_UINTTL(env.threadId, HexagonCPU), VMSTATE_END_OF_LIST() }, };