From patchwork Sat Mar 1 05:26:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Cain X-Patchwork-Id: 13997305 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 1EE44C021B8 for ; Sat, 1 Mar 2025 05:28:21 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1toFOF-00041S-T1; Sat, 01 Mar 2025 00:27:56 -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 1toFOE-0003pM-8h for qemu-devel@nongnu.org; Sat, 01 Mar 2025 00:27:54 -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-0008BU-Ik for qemu-devel@nongnu.org; Sat, 01 Mar 2025 00:27:53 -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 5214jQp5007534 for ; Sat, 1 Mar 2025 05:27:41 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= A9gNZELgJqbbUPM1U1dqZ4plaRvgvVErlAnhKG0UXw0=; b=SDykqwM/GzY7YQUw zvRRzT6YS1LzN3Lc0pJG+V7mIaQlGXVLSbYDa2SOSIr2MExMsQKJuX1xko0QvWYw fe+ZLZRm1H9gg4cgyiGv/V/CoovnSuHw6BaD6kxOS/QDG7o5fIUyA63PBzr5vT0n 0GxltZpGMthRVgMB2TQ7LqWanbsZsSrr0MoaJ/zc5CMxF/HoHnirCSf5poBGtHLW iMO74dDS6LHBCkBWUJV3yHs6cuGhgC1C1amG8d+UwMBWpXnBe1MGELEklSdNIlhp +DfYZ7kNAmCFIVCnydj2WL5BCstb0z+kgaaq+KEBRwtaGWRF+QF8oDdGT2ltORGC KLnT6w== Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 453t89r64v-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-pl1-f197.google.com with SMTP id d9443c01a7336-2234dddbd6fso63070395ad.0 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=1740806849; x=1741411649; 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=A9gNZELgJqbbUPM1U1dqZ4plaRvgvVErlAnhKG0UXw0=; b=WuiVQLhpWa42QMjXLhr7o2ZwiGqVlpfjRlq7mrBIiczae77W0D1bZa1DljRKjmt411 F6Np5zZRwXIAvvPkBDECdxdTiPar2s7qQYGXLlEyMnPMcdJzJC8UWAA08uoIOvPZ/4vK ClXaAXk1ZHKeJnVNarhLUPbd6ntw8PrAPZFlSGbxkphbW3cF2ql57vhE8OjJ1xO2szVD Eiz3oSrkvOpHr1Eq9MXlgigP7D7pt40eO82aCmSCzIn6YkczlFz6HKdyVH9ACNUuFhTm P4LOhfpJDybO4WKrgcVGsMREQyV3YfZ3ClJk4cxW/8nPNd5iW7hPy55+OVYb4CFANfQ2 QczA== X-Gm-Message-State: AOJu0Yxg1TsbzOe0qhGF4ITURcg6/EdXnqMnth+faDbG/nvKQj7kHvvL 9HjBkddNxaxLoR1vKnb4k7MHjNqEgLgTq7tzfwQpfZCjNP8qgUNbswRkXnRxC/hFFSKRqyOUi7s 8xKgWydJT59EFkfxJHR5GFJt6Kv0c/HFH9HzQw7XexOHcLTaP9lxY6p3GUozYxA== X-Gm-Gg: ASbGncsDXNCiZlJ4MaidiELXjN8DPeolCMUIZFxfNyMx+DGKVNnS37hn6/2/R9IL/Jf SE0BC16xpowzHTuaLKeEM3sCj4XKJqIt7hMt22RoNY9Qi5d2jEEE2jqHAF52R5jB3q9iK6eGjtD aCqxiqTqd87c6TAz1GrDBg1qzRaby0NWyE+GdDlLc1wHJHjXnLGJGbhj3LoFQu9VgwvvcaRQiAQ YInqEt29bAs92X9XcHU+8mqSn8oLqD2/Cbh5x7+H93ocnxy0zQeBJMUTXZ7SYe2L1CITt8b7/XK tRkcEOSV5R1TX3+IgepNWygey118YsRIVciNk5R5kuhGcDmEuiqpcONL49f6kAi+ X-Received: by 2002:a17:903:1987:b0:223:517a:d5a9 with SMTP id d9443c01a7336-223517ad897mr154986955ad.15.1740806848958; Fri, 28 Feb 2025 21:27:28 -0800 (PST) X-Google-Smtp-Source: AGHT+IGoIZhCT7adNhTg9L95IFVfdhmsY8zgZ9Y0wNqbxqeFhRWVO41G3U2nxfwuPbbmoHKwehbaGQ== X-Received: by 2002:a17:903:1987:b0:223:517a:d5a9 with SMTP id d9443c01a7336-223517ad897mr154986625ad.15.1740806848559; Fri, 28 Feb 2025 21:27:28 -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.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Feb 2025 21:27:28 -0800 (PST) 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 31/38] target/hexagon: Add {TLB, k0}lock, cause code, wait_next_pc Date: Fri, 28 Feb 2025 21:26:21 -0800 Message-Id: <20250301052628.1011210-32-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: qcNWxMsBjDcnzoKEkqaYmv128pm5zf4d X-Proofpoint-GUID: qcNWxMsBjDcnzoKEkqaYmv128pm5zf4d 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: , Reply-to: Brian Cain X-Patchwork-Original-From: Brian Cain via From: Brian Cain 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 {TLB,k0}lock counts are used to represent the TLB, k0 locks among hardware threads. wait_next_pc represents the program counter to set when resuming from a wait-for-interrupts state. cause_code contains the precise exception cause.This will be used by subsequent commits. Signed-off-by: Brian Cain --- target/hexagon/cpu.h | 4 ++++ target/hexagon/cpu.c | 4 ++++ target/hexagon/machine.c | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/target/hexagon/cpu.h b/target/hexagon/cpu.h index 0957faead3..ddc1158d8e 100644 --- a/target/hexagon/cpu.h +++ b/target/hexagon/cpu.h @@ -103,6 +103,7 @@ typedef struct { typedef struct CPUArchState { target_ulong gpr[TOTAL_PER_THREAD_REGS]; target_ulong pred[NUM_PREGS]; + target_ulong cause_code; /* For comparing with LLDB on target - see adjust_stack_ptrs function */ target_ulong last_pc_dumped; @@ -116,11 +117,14 @@ typedef struct CPUArchState { target_ulong *g_sreg; target_ulong greg[NUM_GREGS]; + target_ulong wait_next_pc; /* 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 tlb_lock_count; + target_ulong k0_lock_count; target_ulong next_PC; #endif target_ulong new_value_usr; diff --git a/target/hexagon/cpu.c b/target/hexagon/cpu.c index c4b9df2fc3..7c34d015a3 100644 --- a/target/hexagon/cpu.c +++ b/target/hexagon/cpu.c @@ -312,7 +312,11 @@ static void hexagon_cpu_reset_hold(Object *obj, ResetType type) env->threadId = cs->cpu_index; env->tlb_lock_state = HEX_LOCK_UNLOCKED; env->k0_lock_state = HEX_LOCK_UNLOCKED; + env->tlb_lock_count = 0; + env->k0_lock_count = 0; env->next_PC = 0; + env->wait_next_pc = 0; + env->cause_code = -1; #endif } diff --git a/target/hexagon/machine.c b/target/hexagon/machine.c index dc900422f4..9fdafb4573 100644 --- a/target/hexagon/machine.c +++ b/target/hexagon/machine.c @@ -22,7 +22,11 @@ const VMStateDescription vmstate_hexagon_cpu = { VMSTATE_UINTTL(env.next_PC, HexagonCPU), VMSTATE_UINTTL(env.tlb_lock_state, HexagonCPU), VMSTATE_UINTTL(env.k0_lock_state, HexagonCPU), + VMSTATE_UINTTL(env.tlb_lock_count, HexagonCPU), + VMSTATE_UINTTL(env.k0_lock_count, HexagonCPU), VMSTATE_UINTTL(env.threadId, HexagonCPU), + VMSTATE_UINTTL(env.cause_code, HexagonCPU), + VMSTATE_UINTTL(env.wait_next_pc, HexagonCPU), VMSTATE_END_OF_LIST() }, };