From nobody Sun Jul 26 13:29:03 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1781156152; cv=none; d=zohomail.com; s=zohoarc; b=PnagWcZdeFRWr2FH1/wTrYRJ1tWPQVOb7y/Z6eCmjBgvVmND3rl4r3Rn7LvcPbMNjZcIFapBleW/AGBlGa9TmGnZoehaNlTETzHxluESQIBBaglqH4N/yFFFKRNXbSOkXSmNlFPle0Ou3oFPZ9KQ/2h3fU5xRf98+M8Wce6UUT0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1781156152; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=nIlNUrChWKt8+Y6wrk4REcbZGGxSNxkeHUGKQz8Rkq8=; b=YmWWcSt7HjIQ5UZC12ALTXSzXReT+N1Z/wa0EX9ArY5pPAdmKvu3sETEyBNNxnC4+gPrqMPtbhO8sTAW23tKbcgqRrOcHHNJ7fFlZiwKJtJIa1B2qgs1vSkWrIX1Sp2Vn8O2mmouhyHE/LUlZMli5WqmkuqbMhGU4PYOhoCpFKw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1781156152803394.2643402724128; Wed, 10 Jun 2026 22:35:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wXY3A-0002Ga-L3; Thu, 11 Jun 2026 01:33:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wXY30-0001jm-CM for qemu-devel@nongnu.org; Thu, 11 Jun 2026 01:33:48 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wXY2x-0002l8-S1 for qemu-devel@nongnu.org; Thu, 11 Jun 2026 01:33:46 -0400 Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 65B5GQXr3817133 for ; Thu, 11 Jun 2026 05:33:32 GMT Received: from mail-dy1-f197.google.com (mail-dy1-f197.google.com [74.125.82.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4eqe6uss7b-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 11 Jun 2026 05:33:31 +0000 (GMT) Received: by mail-dy1-f197.google.com with SMTP id 5a478bee46e88-304f23c55b2so8214716eec.0 for ; Wed, 10 Jun 2026 22:33:31 -0700 (PDT) Received: from hu-bcain-lv.qualcomm.com (Global_NAT1.qualcomm.com. [129.46.96.20]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-30806ee207asm720800eec.29.2026.06.10.22.33.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2026 22:33:29 -0700 (PDT) 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= nIlNUrChWKt8+Y6wrk4REcbZGGxSNxkeHUGKQz8Rkq8=; b=a+g8YcKTfCextbh2 3AIlY4Upazkm/tnfEb8PnRTVrjnvDyCW1KS8WvHCoT+mEsezt8IwhefnohK6uH0h 1KYi1TdtyI5W/d/QmLm/CduzVovanqlInCgPckqSTau4l0b0A3HGlPUwZCOE+kfE aV8nuSSXejA5j11cmb5vVkS65FGZdYSVguySmpf3+5patvrzZUp6lCZhMvLgPdrq 8EKelbvq6Xw53Q3rL0dfmUXX4fpnk5lII6vUnLxUSDqsdrdYKaGcTgn8+OgsLe+G XMPv2eZnIqo7qacWW5wa4V8xiSkkYnZki1vEo9T1KIsis0/kJhqPb5BHWnCiTpHF FDMufA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1781156011; x=1781760811; darn=nongnu.org; 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=nIlNUrChWKt8+Y6wrk4REcbZGGxSNxkeHUGKQz8Rkq8=; b=egI9WwbeHkJW180n4syxo28/Ju8ZSyH5DLqoxHEUc/RduvpqYkNCnDxhV3J50RTqOg EDRXnH2hrxG1jld6L3YXPZHEImbwjJtFrOGath3YmOjoATECE8/1gFrRpLms8dMHuIHz k+L+5WO6B2+BOlmmPOANMCoBfBEmwwz7WYNhfQN/rmwekVK+ShSkUlk6uEtrWItMSffl 4TnTvx2FPsP4TmldN11dXjdcLgBL3NFpK4cE+EZ3T3qMRFu0yHGKeOFKIHDaFspY7cXT o0WSqZdZb4ZpdHizIwlHRwY5b4NM4x8TqNdby+T8rCF1caGMjc+81fxJ+QeCTwALyWwO J3Jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781156011; x=1781760811; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=nIlNUrChWKt8+Y6wrk4REcbZGGxSNxkeHUGKQz8Rkq8=; b=FbWrPEUrbZ0fJ7IP7mWM6eLHHuS+Ai0WunwYTJjBhV0kZFhfnn6CA+M/s4VOseroed Xn3Z+DEByHZ6pUN/VOKdsLdfX94Nx9LijOwRY7rj7TejJZXph6sclddo2KyoRSeXJtOL Mp8U2Mic6KDtTzkcwJDnJf+c2wGTO8Z5ksHrESnzLeUG2l6UygF4f9skt0S5gtCTk1Wa +s/V+qIFGXEZtDlH0+i/d5d5CrBry1eLFKVWX7cRu4F322SWkMb/lthMUema/9k//FPW kis952OnMm37ppvOllCa9yghzV5/aG069U4bJmFZR1eR+R5ohVJtJAaNXr4kBUAaIMu0 OsyQ== X-Gm-Message-State: AOJu0Yw7HFlk58fLvaIa8UtxdONXwbJ/EZkm1oFIjA3RSgFmXgVelHAF mSIPrCIS+IWJpp0eJ8iEUH5ut/XwaC6t9d5HbAyKrDieY41bUSt0jRRa1B3ciXeLHtKufMpo9mL J8z7LmCjByFfbEMIh4msv1T3yYCtcRIu+ltghkP2TFKKzNSVky9RvLpr03Spbnn+Eag== X-Gm-Gg: Acq92OF7cIFE8Adp/F96p6HkOXilJomFCRY5VjbsVOQGutjpvbIU1PHzxfiCSVy2ZNh qfuhZKqyFVlODbodsLjq5ahX7+P3TSk0n5Lh6mNutMAdkZJoYRgal3gsqnwUrGY7on1Ppw0fwrD 0eTsb7D6I7XIo2UnUBSLPETemXK9tWdzaxnUKxfmEd34YxeIMQqrtZbLKGiyokSKjU27I8yNGWR YCXRps398TZ1w0e+e7oa8sNYAbp/2/x4owK1Yl/b7IDHUWyeyirDWbuw05DdImttic93V136Ewi vjMfAsEzeuu30zlDykkzGmkuTqsG5YFMs+6xQCsnZwR1NQ0x03iv2MOLF+34qWGPROD8ghP8SYR Gaastju8JDuD1RfMfGSWJ3kynuHHpEIHuwNx9Wn6tpUlHAfGov8liFu+cbJ/qDYrQ3Oqr/lZdnu HjpdyA X-Received: by 2002:a05:7300:6d20:b0:304:de94:1c2c with SMTP id 5a478bee46e88-30804cbf74bmr1108315eec.34.1781156010923; Wed, 10 Jun 2026 22:33:30 -0700 (PDT) X-Received: by 2002:a05:7300:6d20:b0:304:de94:1c2c with SMTP id 5a478bee46e88-30804cbf74bmr1108297eec.34.1781156010343; Wed, 10 Jun 2026 22:33:30 -0700 (PDT) From: Brian Cain To: qemu-devel@nongnu.org Cc: brian.cain@oss.qualcomm.com, matheus.bernardino@oss.qualcomm.com, pierrick.bouvier@oss.qualcomm.com, ltaylorsimpson@gmail.com, philmd@mailo.org, philmd@oss.qualcomm.com, Brian Cain Subject: [PATCH v6] target/hexagon: Add k0 {un,}lock Date: Wed, 10 Jun 2026 22:32:45 -0700 Message-Id: <20260611053249.3918491-25-brian.cain@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260611053249.3918491-1-brian.cain@oss.qualcomm.com> References: <20260611053249.3918491-1-brian.cain@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Authority-Analysis: v=2.4 cv=FJ8rAeos c=1 sm=1 tr=0 ts=6a2a48ab cx=c_pps a=Uww141gWH0fZj/3QKPojxA==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=IkcTkHD0fZMA:10 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yOCtJkima9RkubShWh1s:22 a=COk6AnOGAAAA:8 a=pGLkceISAAAA:8 a=EUspDBNiAAAA:8 a=ZtvnA-OJD4c8FAOZTSoA:9 a=QEXdDO2ut3YA:10 a=PxkB5W3o20Ba91AHUih5:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwNjExMDA1MiBTYWx0ZWRfX3nySg5LvHmBR KvY8ZqaaM2sSR0LwOMi/aFkEk9pCXYCLRy8C3D4UPk3Gc5UK6Z9epSjn2/2Web/kLcgZxWqsBpa OS1gypGGri1iaQqELQnkX4+nia5WfCw= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjExMDA1MiBTYWx0ZWRfX9306V8coe4VQ K+Euk3lvzg62eQZTpQ0pDMA/Lv6vGPI1WNPZ+0/CAFRrGSDiR23kjdSpWHrxLk6a3E1aczE6SfT tm11fTYgyhC5XQOttENT/jhZtIoiAo1/UWhLd0iBM2Dz3f0G1YwvOgfdf5xlgBoVveK/GSfYAJS tSXAkqR0FJuZeminHvRwiSdPN3xE4JpTa8OMRzcpuWsYjhYaV4VmVxsNfngNqbXX7vb7w8egPq/ Sq85dkKvNPM5CGd1pmNmyOhtjhfDWcYEh+KskRi3+tDqrzc9WtiQQRQvw4eVlb+UMuX17gmW0bp xo2rPsRc0U4gXxsWywAMt+lwb9iA0rSgzlubxDaKZZYXVrlrz4iy0xUv5RFG9Ac1TP4ncFFnA+o anh4dH7OZ1aUrfb9WpO3pyyZhPKUydbbYzd//wtFGcDdjp7qvQ3CAPWkAUezc9/Q1k9tn4bzjva +Lb6FERn51cd4uIC1zA== X-Proofpoint-GUID: ve8RfczrVp2iWBLPUQ-hEI3GrIwEgpjL X-Proofpoint-ORIG-GUID: ve8RfczrVp2iWBLPUQ-hEI3GrIwEgpjL X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-11_01,2026-06-09_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 clxscore=1015 adultscore=0 lowpriorityscore=0 bulkscore=0 impostorscore=0 priorityscore=1501 spamscore=0 phishscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606040000 definitions=main-2606110052 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=brian.cain@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @qualcomm.com) X-ZM-MESSAGEID: 1781156154658158500 From: Brian Cain Reviewed-by: Taylor Simpson Signed-off-by: Brian Cain --- target/hexagon/sys_macros.h | 3 + target/hexagon/hex_mmu.c | 4 +- target/hexagon/op_helper.c | 119 ++++++++++++++++++++++++++++++++++++ 3 files changed, 124 insertions(+), 2 deletions(-) diff --git a/target/hexagon/sys_macros.h b/target/hexagon/sys_macros.h index 0b62deba5e9..ee001a4cfd6 100644 --- a/target/hexagon/sys_macros.h +++ b/target/hexagon/sys_macros.h @@ -146,6 +146,9 @@ #define fSET_TLB_LOCK() hex_tlb_lock(env); #define fCLEAR_TLB_LOCK() hex_tlb_unlock(env); =20 +#define fSET_K0_LOCK() hex_k0_lock(env); +#define fCLEAR_K0_LOCK() hex_k0_unlock(env); + #define fTLB_IDXMASK(INDEX) \ ((INDEX) & (fPOW2_ROUNDUP( \ fCAST4u(hexagon_tlb_get_num_entries(env_archcpu(env)->tlb))) - 1)) diff --git a/target/hexagon/hex_mmu.c b/target/hexagon/hex_mmu.c index c921e82b377..d035affeb2b 100644 --- a/target/hexagon/hex_mmu.c +++ b/target/hexagon/hex_mmu.c @@ -204,8 +204,8 @@ void hex_tlb_unlock(CPUHexagonState *env) (env->tlb_lock_state !=3D HEX_LOCK_OWNER)) { qemu_log_mask(LOG_GUEST_ERROR, "thread %" PRIu32 " attempted to tlbunlock without h= aving the " - "lock, tlb_lock state =3D %d\n", - env->threadId, env->tlb_lock_state); + "lock, tlb_lock state =3D %u\n", + env->threadId, (unsigned)env->tlb_lock_state); g_assert(env->tlb_lock_state !=3D HEX_LOCK_WAITING); return; } diff --git a/target/hexagon/op_helper.c b/target/hexagon/op_helper.c index 220475a297c..1ae58b78726 100644 --- a/target/hexagon/op_helper.c +++ b/target/hexagon/op_helper.c @@ -36,6 +36,9 @@ #include "cpu_helper.h" #include "translate.h" #ifndef CONFIG_USER_ONLY +#include "hw/hexagon/hexagon_globalreg.h" +#include "hex_mmu.h" +#include "hw/hexagon/hexagon_tlb.h" #include "hex_interrupts.h" #include "hexswi.h" #endif @@ -1232,6 +1235,122 @@ void HELPER(modify_ssr)(CPUHexagonState *env, uint3= 2_t new, uint32_t old) BQL_LOCK_GUARD(); hexagon_modify_ssr(env, new, old); } + +static void hex_k0_lock(CPUHexagonState *env) +{ + HexagonCPU *cpu =3D env_archcpu(env); + CPUState *cs =3D env_cpu(env); + target_ulong syscfg; + + BQL_LOCK_GUARD(); + g_assert((env->k0_lock_count =3D=3D 0) || (env->k0_lock_count =3D=3D 1= )); + + syscfg =3D cpu->globalregs ? + hexagon_globalreg_read(cpu->globalregs, HEX_SREG_SYSCFG, + env->threadId) : 0; + if (GET_SYSCFG_FIELD(SYSCFG_K0LOCK, syscfg)) { + if (env->k0_lock_state =3D=3D HEX_LOCK_QUEUED) { + env->next_PC +=3D 4; + env->k0_lock_count++; + env->k0_lock_state =3D HEX_LOCK_OWNER; + SET_SYSCFG_FIELD(env, SYSCFG_K0LOCK, 1); + return; + } + if (env->k0_lock_state =3D=3D HEX_LOCK_OWNER) { + qemu_log_mask(LOG_GUEST_ERROR, + "Double k0lock at PC: 0x%" PRIx32 + ", thread may hang\n", + env->next_PC); + env->next_PC +=3D 4; + cpu_interrupt(cs, CPU_INTERRUPT_HALT); + cpu_loop_exit(cs); + return; + } + env->k0_lock_state =3D HEX_LOCK_WAITING; + cpu_interrupt(cs, CPU_INTERRUPT_HALT); + cpu_loop_exit(cs); + } else { + env->next_PC +=3D 4; + env->k0_lock_count++; + env->k0_lock_state =3D HEX_LOCK_OWNER; + SET_SYSCFG_FIELD(env, SYSCFG_K0LOCK, 1); + } +} + +static void hex_k0_unlock(CPUHexagonState *env) +{ + HexagonCPU *cpu =3D env_archcpu(env); + unsigned int this_threadId =3D env->threadId; + CPUHexagonState *unlock_thread =3D NULL; + CPUState *cs; + target_ulong syscfg; + + BQL_LOCK_GUARD(); + g_assert((env->k0_lock_count =3D=3D 0) || (env->k0_lock_count =3D=3D 1= )); + + /* Nothing to do if the k0 isn't locked by this thread */ + syscfg =3D cpu->globalregs ? + hexagon_globalreg_read(cpu->globalregs, HEX_SREG_SYSCFG, + env->threadId) : 0; + if ((GET_SYSCFG_FIELD(SYSCFG_K0LOCK, syscfg) =3D=3D 0) || + (env->k0_lock_state !=3D HEX_LOCK_OWNER)) { + qemu_log_mask(LOG_GUEST_ERROR, + "thread %" PRIu32 " attempted to unlock k0 without" + " having the lock, k0_lock state =3D %u," + " syscfg:k0 =3D %" PRIu32 "\n", + env->threadId, (unsigned)env->k0_lock_state, + (uint32_t)GET_SYSCFG_FIELD(SYSCFG_K0LOCK, syscfg)); + g_assert(env->k0_lock_state !=3D HEX_LOCK_WAITING); + return; + } + + env->k0_lock_count--; + env->k0_lock_state =3D HEX_LOCK_UNLOCKED; + SET_SYSCFG_FIELD(env, SYSCFG_K0LOCK, 0); + + /* Look for a thread to unlock */ + CPU_FOREACH(cs) { + CPUHexagonState *thread =3D cpu_env(cs); + + /* + * The hardware implements round-robin fairness, so we look for th= reads + * starting at env->threadId + 1 and incrementing modulo the numbe= r of + * threads. + * + * To implement this, we check if thread is a earlier in the modulo + * sequence than unlock_thread. + * if unlock thread is higher than this thread + * thread must be between this thread and unlock_thread + * else + * thread higher than this thread is ahead of unlock_thread + * thread must be lower then unlock thread + */ + if (thread->k0_lock_state =3D=3D HEX_LOCK_WAITING) { + if (!unlock_thread) { + unlock_thread =3D thread; + } else if (unlock_thread->threadId > this_threadId) { + if (this_threadId < thread->threadId && + thread->threadId < unlock_thread->threadId) { + unlock_thread =3D thread; + } + } else { + if (thread->threadId > this_threadId) { + unlock_thread =3D thread; + } + if (thread->threadId < unlock_thread->threadId) { + unlock_thread =3D thread; + } + } + } + } + if (unlock_thread) { + cs =3D env_cpu(unlock_thread); + unlock_thread->k0_lock_state =3D HEX_LOCK_QUEUED; + SET_SYSCFG_FIELD(unlock_thread, SYSCFG_K0LOCK, 1); + cpu_interrupt(cs, CPU_INTERRUPT_K0_UNLOCK); + } + +} #endif =20 =20 --=20 2.34.1