Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.1/patches/2222280/?format=api
{ "id": 2222280, "url": "http://patchwork.ozlabs.org/api/1.1/patches/2222280/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260411070637.72421-9-james.hilliard1@gmail.com/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/1.1/projects/14/?format=api", "name": "QEMU Development", "link_name": "qemu-devel", "list_id": "qemu-devel.nongnu.org", "list_email": "qemu-devel@nongnu.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20260411070637.72421-9-james.hilliard1@gmail.com>", "date": "2026-04-11T07:06:35", "name": "[9/9] target/mips: add Octeon CHORD and LLM COP2 support", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "139fd63e5c82dc83db2c18dc1e68f3a0e9aaf7a3", "submitter": { "id": 66301, "url": "http://patchwork.ozlabs.org/api/1.1/people/66301/?format=api", "name": "James Hilliard", "email": "james.hilliard1@gmail.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260411070637.72421-9-james.hilliard1@gmail.com/mbox/", "series": [ { "id": 499531, "url": "http://patchwork.ozlabs.org/api/1.1/series/499531/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=499531", "date": "2026-04-11T07:06:33", "name": "[1/9] linux-user/mips, target/mips: honor MIPS_FIXADE for unaligned accesses", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/499531/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2222280/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2222280/checks/", "tags": {}, "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@legolas.ozlabs.org", "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256\n header.s=20251104 header.b=dwxtvbBW;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)" ], "Received": [ "from lists.gnu.org (lists1p.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4ft4W93drFz1yH7\n\tfor <incoming@patchwork.ozlabs.org>; Sat, 11 Apr 2026 17:07:47 +1000 (AEST)", "from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces@nongnu.org>)\n\tid 1wBSR0-0001d0-PF; Sat, 11 Apr 2026 03:07:14 -0400", "from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <james.hilliard1@gmail.com>)\n id 1wBSQz-0001cc-7j\n for qemu-devel@nongnu.org; Sat, 11 Apr 2026 03:07:13 -0400", "from mail-oi1-x235.google.com ([2607:f8b0:4864:20::235])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.90_1) (envelope-from <james.hilliard1@gmail.com>)\n id 1wBSQx-00011L-5e\n for qemu-devel@nongnu.org; Sat, 11 Apr 2026 03:07:12 -0400", "by mail-oi1-x235.google.com with SMTP id\n 5614622812f47-46aa216a65aso1563915b6e.1\n for <qemu-devel@nongnu.org>; Sat, 11 Apr 2026 00:07:10 -0700 (PDT)", "from Mac.localdomain (71-218-253-186.hlrn.qwest.net.\n [71.218.253.186]) by smtp.gmail.com with ESMTPSA id\n 5614622812f47-478a0f1e841sm2651091b6e.5.2026.04.11.00.07.07\n (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);\n Sat, 11 Apr 2026 00:07:08 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=gmail.com; s=20251104; t=1775891229; x=1776496029; darn=nongnu.org;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=/sg85p7Iqac4DT4DHFeQF4b5N57xVPOx6e9bnRBDjzI=;\n b=dwxtvbBWMXx9xuemf5M60Ng6M2FF43fEZdrqczywcw+QrMRZDSLrBMM2Abfo5Yo0Es\n 3TEV5UBb4RxivZ1w+/3icFJxjyGKpc0qpg1uFFheRkFqp/q82foJ87BuNjwvuS0FSYLq\n xCEdJ66vWDuVCSv1zSiwi1ejUmpu2n8fY+TPtC50AQwIlmvnhG7r6fg6HC4XL08US+jf\n UZpBCi8991UoiUdM2+hnJWRvJM9xe6X5E9LxE7NOi1Pevx9L0veL2EEfwbv2nJEh6wNJ\n DNd9h5IQn2QeLNKD3rJ5fQTjp4HcVl1bhidYClHh5K7vp/2m+TFXTCPKgRWgmjeJhFU2\n Cl6A==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1775891229; x=1776496029;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from\n :to:cc:subject:date:message-id:reply-to;\n bh=/sg85p7Iqac4DT4DHFeQF4b5N57xVPOx6e9bnRBDjzI=;\n b=HCf17l5QhDDcEZjKTJ4SLDksucnusy8jbWJ3lJPYD2qWfNCM+xRgce+zn0H33TdVTG\n tbnABXpClJ0BgUCGIiAJzuI5hR1zNqemO9n91xf69B4DhoGRN+EWhwUbbdmyN11T9bba\n 6uxR3oY5VxR278CV6pz1HOVPNSA4VPMO6RHD/q8ClzGNrxPciuyEHzZTljf+BYTnYL42\n piuGZfSb2Kh3b1L6szEjeziFQ6g1XxO5IBjGrAiFpxMuW90PL4u8pq4taVkseGyDXkdP\n 0uM9k5MvbLHf/ldcltV6yiv7DdIJaMLLPSteH642efgKiH3aXOC4ILDfh3WQ875jUsr+\n D9Eg==", "X-Gm-Message-State": "AOJu0Yx7GkeP2VAtIcfr3n8aHQzEA0j/B1Z+ZU0o3d44jLkbMGSYyOzC\n oSAxUwan3KkA9jJAPlz17dpZwD+Qo4YTp8Ev1k7fBu6AjSsL3ULOUfQAqgdSzsRpSyg=", "X-Gm-Gg": "AeBDies0HShME25dluUwa7eeAKZEOoMyaypXkjzdjNE7gBhvDSimhcR9B6vu2jDvM+i\n Dt3bwWt0CyxEWg1YLAmqCK7ixGJaJ0Q8yYC7ohGrxkg660Ii3XFEGszTbgWtXENjFT4WaQBFbXX\n 2f+sfE0+8UEysd8jdmBFPz1/8wb+DNCM0g5klezqxj+6E0MaQWcyTkYs2Xv2X6SMP/pDNSmFoFV\n jSAlPP1MJhP0+aUw6zZn0Huav5wY5x/3qtmHwA9v9UTE0AHcmIkxX0OVXDlY4DFuNN1KFD/xcXt\n Yka7T0TaFtujGQs6VnPKKmGmN4BHij+IobyW5S2VPIHjGKD0wLBxU4TojxawhTXNOYOxltiHGYH\n 2rerqoHKAY6fmDAghp6nrSw6uQE0cF6dLwquUGwMPq4NXwFatCYzuOM8+g1tfqj6s9Qp4xdEYHR\n D0VfCdKt8L4jHEt9lUrt6d+ITIe2dEeAu1XWJqGZCXNk5S2Mk/oSQ9lOiUja3a/KcTFg4hM5Is+\n wW4G8vyiQ/tMzxMrRyY70t6oeEDm825hckviOGw9iO5QHQQsijHaOA7IUondQqjirFHjPg=", "X-Received": "by 2002:a05:6808:518f:b0:459:b569:702f with SMTP id\n 5614622812f47-4789e427876mr3260738b6e.15.1775891229407;\n Sat, 11 Apr 2026 00:07:09 -0700 (PDT)", "From": "James Hilliard <james.hilliard1@gmail.com>", "To": "qemu-devel@nongnu.org", "Cc": "James Hilliard <james.hilliard1@gmail.com>,\n Laurent Vivier <laurent@vivier.eu>,\n Pierrick Bouvier <pierrick.bouvier@linaro.org>, =?utf-8?q?Philippe_Mathieu-?=\n\t=?utf-8?q?Daud=C3=A9?= <philmd@linaro.org>,\n Aurelien Jarno <aurelien@aurel32.net>, Jiaxun Yang <jiaxun.yang@flygoat.com>,\n Aleksandar Rikalo <arikalo@gmail.com>, Huacai Chen <chenhuacai@kernel.org>", "Subject": "[PATCH 9/9] target/mips: add Octeon CHORD and LLM COP2 support", "Date": "Sat, 11 Apr 2026 01:06:35 -0600", "Message-ID": "<20260411070637.72421-9-james.hilliard1@gmail.com>", "X-Mailer": "git-send-email 2.53.0", "In-Reply-To": "<20260411070637.72421-1-james.hilliard1@gmail.com>", "References": "<20260411070637.72421-1-james.hilliard1@gmail.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Received-SPF": "pass client-ip=2607:f8b0:4864:20::235;\n envelope-from=james.hilliard1@gmail.com; helo=mail-oi1-x235.google.com", "X-Spam_score_int": "-17", "X-Spam_score": "-1.8", "X-Spam_bar": "-", "X-Spam_report": "(-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001,\n RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,\n 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 <qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<https://lists.nongnu.org/archive/html/qemu-devel>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org" }, "content": "Add the Octeon CHORD hardware register access path and the LLM\nnarrow/wide read and write windows.\n\nModel both CHORD access forms, including the rdhwr $30 path and the\nlegacy dmfc2 alias, and implement sparse backing storage for the two\nLLM sets so user-mode code can save, restore, and probe the\narchitectural state.\n\nSigned-off-by: James Hilliard <james.hilliard1@gmail.com>\n---\n target/mips/cpu.c | 28 ++++++++\n target/mips/cpu.h | 21 ++++++\n target/mips/helper.h | 1 +\n target/mips/tcg/octeon_crypto.c | 111 ++++++++++++++++++++++++++++++++\n target/mips/tcg/op_helper.c | 6 ++\n target/mips/tcg/translate.c | 21 ++++++\n 6 files changed, 188 insertions(+)", "diff": "diff --git a/target/mips/cpu.c b/target/mips/cpu.c\nindex ec70c10985..b098c5030d 100644\n--- a/target/mips/cpu.c\n+++ b/target/mips/cpu.c\n@@ -27,6 +27,7 @@\n #include \"internal.h\"\n #include \"kvm_mips.h\"\n #include \"qemu/module.h\"\n+#include \"qemu/qtree.h\"\n #include \"system/kvm.h\"\n #include \"system/qtest.h\"\n #include \"hw/core/qdev-properties.h\"\n@@ -183,6 +184,18 @@ static bool mips_cpu_has_work(CPUState *cs)\n \n #include \"cpu-defs.c.inc\"\n \n+static void mips_cpu_destroy_octeon_state(CPUMIPSState *env)\n+{\n+ if (env->octeon_crypto.llm_narrow) {\n+ q_tree_destroy(env->octeon_crypto.llm_narrow);\n+ env->octeon_crypto.llm_narrow = NULL;\n+ }\n+ if (env->octeon_crypto.llm_wide) {\n+ q_tree_destroy(env->octeon_crypto.llm_wide);\n+ env->octeon_crypto.llm_wide = NULL;\n+ }\n+}\n+\n static void mips_cpu_reset_hold(Object *obj, ResetType type)\n {\n CPUState *cs = CPU(obj);\n@@ -194,6 +207,7 @@ static void mips_cpu_reset_hold(Object *obj, ResetType type)\n mcc->parent_phases.hold(obj, type);\n }\n \n+ mips_cpu_destroy_octeon_state(env);\n memset(env, 0, offsetof(CPUMIPSState, end_reset_fields));\n \n /* Reset registers to their default values */\n@@ -248,6 +262,9 @@ static void mips_cpu_reset_hold(Object *obj, ResetType type)\n env->active_fpu.fcr31 = env->cpu_model->CP1_fcr31;\n env->msair = env->cpu_model->MSAIR;\n env->insn_flags = env->cpu_model->insn_flags;\n+ if (env->insn_flags & INSN_OCTEON) {\n+ env->octeon_crypto.chord = 1;\n+ }\n \n #if defined(CONFIG_USER_ONLY)\n env->CP0_Status = (MIPS_HFLAG_UM << CP0St_KSU);\n@@ -264,6 +281,9 @@ static void mips_cpu_reset_hold(Object *obj, ResetType type)\n * hardware registers.\n */\n env->CP0_HWREna |= 0x0000000F;\n+ if (env->insn_flags & INSN_OCTEON) {\n+ env->CP0_HWREna |= 0x40000000u;\n+ }\n if (env->CP0_Config1 & (1 << CP0C1_FP)) {\n env->CP0_Status |= (1 << CP0St_CU1);\n }\n@@ -422,6 +442,13 @@ static void mips_cpu_reset_hold(Object *obj, ResetType type)\n #endif\n }\n \n+static void mips_cpu_finalize(Object *obj)\n+{\n+ MIPSCPU *cpu = MIPS_CPU(obj);\n+\n+ mips_cpu_destroy_octeon_state(&cpu->env);\n+}\n+\n static void mips_cpu_disas_set_info(const CPUState *cs, disassemble_info *info)\n {\n const MIPSCPU *cpu = MIPS_CPU(cs);\n@@ -636,6 +663,7 @@ static const TypeInfo mips_cpu_type_info = {\n .instance_size = sizeof(MIPSCPU),\n .instance_align = __alignof(MIPSCPU),\n .instance_init = mips_cpu_initfn,\n+ .instance_finalize = mips_cpu_finalize,\n .abstract = true,\n .class_size = sizeof(MIPSCPUClass),\n .class_init = mips_cpu_class_init,\ndiff --git a/target/mips/cpu.h b/target/mips/cpu.h\nindex 69f96172d8..03ee9181a0 100644\n--- a/target/mips/cpu.h\n+++ b/target/mips/cpu.h\n@@ -11,6 +11,7 @@\n #include \"fpu/softfloat-types.h\"\n #include \"hw/core/clock.h\"\n #include \"mips-defs.h\"\n+#include \"qemu/qtree.h\"\n \n typedef struct CPUMIPSTLBContext CPUMIPSTLBContext;\n \n@@ -617,6 +618,22 @@ typedef enum MIPSOcteonCop2Sel {\n OCTEON_COP2_SEL_SMS4_ENC0 = OCTEON_COP2_SEL_AES_ENC0,\n OCTEON_COP2_SEL_SMS4_DEC_CBC0 = OCTEON_COP2_SEL_AES_DEC_CBC0,\n OCTEON_COP2_SEL_SMS4_DEC0 = OCTEON_COP2_SEL_AES_DEC0,\n+ /*\n+ * The low-latency memory window shares 0x0400 with the older CHORD\n+ * alias for the POW tag-switch completion bit. Newer code reads CHORD\n+ * via RDHWR $30, but compatibility still requires DMFC2 0x0400.\n+ */\n+ OCTEON_COP2_SEL_LLM_READ_ADDR0 = 0x0400,\n+ OCTEON_COP2_SEL_CHORD = OCTEON_COP2_SEL_LLM_READ_ADDR0,\n+ OCTEON_COP2_SEL_LLM_WRITE_ADDR_INTERNAL0 = 0x0401,\n+ OCTEON_COP2_SEL_LLM_DATA0 = 0x0402,\n+ OCTEON_COP2_SEL_LLM_READ64_ADDR0 = 0x0404,\n+ OCTEON_COP2_SEL_LLM_WRITE64_ADDR_INTERNAL0 = 0x0405,\n+ OCTEON_COP2_SEL_LLM_READ_ADDR1 = 0x0408,\n+ OCTEON_COP2_SEL_LLM_WRITE_ADDR_INTERNAL1 = 0x0409,\n+ OCTEON_COP2_SEL_LLM_DATA1 = 0x040a,\n+ OCTEON_COP2_SEL_LLM_READ64_ADDR1 = 0x040c,\n+ OCTEON_COP2_SEL_LLM_WRITE64_ADDR_INTERNAL1 = 0x040d,\n OCTEON_COP2_SEL_CRC_POLYNOMIAL = 0x0200,\n OCTEON_COP2_SEL_CRC_IV = 0x0201,\n OCTEON_COP2_SEL_CRC_LEN = 0x0202,\n@@ -754,6 +771,10 @@ typedef struct MIPSOcteonCryptoState {\n uint32_t zuc_lfsr[16];\n uint32_t zuc_window[3];\n uint32_t zuc_tresult;\n+ uint64_t llm_data[2];\n+ target_ulong chord;\n+ QTree *llm_narrow;\n+ QTree *llm_wide;\n } MIPSOcteonCryptoState;\n \n typedef struct CPUArchState {\ndiff --git a/target/mips/helper.h b/target/mips/helper.h\nindex 0d5713b705..faa8061dc9 100644\n--- a/target/mips/helper.h\n+++ b/target/mips/helper.h\n@@ -200,6 +200,7 @@ DEF_HELPER_1(rdhwr_cc, tl, env)\n DEF_HELPER_1(rdhwr_ccres, tl, env)\n DEF_HELPER_1(rdhwr_performance, tl, env)\n DEF_HELPER_1(rdhwr_xnp, tl, env)\n+DEF_HELPER_1(rdhwr_chord, tl, env)\n DEF_HELPER_2(pmon, void, env, int)\n DEF_HELPER_1(wait, void, env)\n \ndiff --git a/target/mips/tcg/octeon_crypto.c b/target/mips/tcg/octeon_crypto.c\nindex 70cd1ddcac..e9937ed1ca 100644\n--- a/target/mips/tcg/octeon_crypto.c\n+++ b/target/mips/tcg/octeon_crypto.c\n@@ -15,6 +15,81 @@\n #include \"crypto/sm4.h\"\n #include \"qemu/bitops.h\"\n #include \"qemu/host-utils.h\"\n+#include \"qemu/qtree.h\"\n+\n+#define OCTEON_LLM_NARROW_MASK ((1ULL << 36) - 1)\n+\n+static gint octeon_u64_tree_compare(gconstpointer a, gconstpointer b,\n+ gpointer user_data)\n+{\n+ uint64_t av = *(const uint64_t *)a;\n+ uint64_t bv = *(const uint64_t *)b;\n+\n+ return (av > bv) - (av < bv);\n+}\n+\n+static QTree *octeon_llm_tree_new(void)\n+{\n+ return q_tree_new_full(octeon_u64_tree_compare, NULL, g_free, g_free);\n+}\n+\n+static uint64_t octeon_llm_load(QTree *tree, uint64_t addr)\n+{\n+ uint64_t key = addr;\n+ uint64_t *value = tree ? q_tree_lookup(tree, &key) : NULL;\n+\n+ return value ? *value : 0;\n+}\n+\n+static void octeon_llm_store(QTree **treep, uint64_t addr, uint64_t value)\n+{\n+ uint64_t *key;\n+ uint64_t *stored;\n+\n+ if (!*treep) {\n+ *treep = octeon_llm_tree_new();\n+ }\n+\n+ key = g_new(uint64_t, 1);\n+ stored = g_new(uint64_t, 1);\n+ *key = addr;\n+ *stored = value;\n+ q_tree_replace(*treep, key, stored);\n+}\n+\n+static uint64_t octeon_llm_pack_narrow(uint64_t value)\n+{\n+ value &= OCTEON_LLM_NARROW_MASK;\n+ return value | ((uint64_t)(ctpop64(value) & 1) << 36);\n+}\n+\n+static void octeon_llm_read(MIPSOcteonCryptoState *crypto, unsigned int set,\n+ uint64_t addr, bool wide)\n+{\n+ uint64_t value;\n+\n+ if (wide) {\n+ value = octeon_llm_load(crypto->llm_wide, addr);\n+ } else {\n+ value = octeon_llm_pack_narrow(octeon_llm_load(crypto->llm_narrow,\n+ addr));\n+ }\n+\n+ crypto->llm_data[set] = value;\n+}\n+\n+static void octeon_llm_write(MIPSOcteonCryptoState *crypto, unsigned int set,\n+ uint64_t addr, bool wide)\n+{\n+ uint64_t value = crypto->llm_data[set];\n+\n+ if (wide) {\n+ octeon_llm_store(&crypto->llm_wide, addr, value);\n+ } else {\n+ octeon_llm_store(&crypto->llm_narrow, addr,\n+ value & OCTEON_LLM_NARROW_MASK);\n+ }\n+}\n \n static inline void octeon_set_shared_mode(MIPSOcteonCryptoState *crypto,\n MIPSOcteonSharedMode mode)\n@@ -1935,6 +2010,12 @@ target_ulong helper_octeon_cop2_dmfc2(CPUMIPSState *env, uint32_t sel)\n return crypto->crc_len;\n case OCTEON_COP2_SEL_CRC_IV_REFLECT:\n return octeon_crc_reflect32_by_byte(crypto->crc_iv);\n+ case OCTEON_COP2_SEL_CHORD:\n+ return crypto->chord;\n+ case OCTEON_COP2_SEL_LLM_DATA0:\n+ return crypto->llm_data[0];\n+ case OCTEON_COP2_SEL_LLM_DATA1:\n+ return crypto->llm_data[1];\n case OCTEON_COP2_SEL_HSH_DATW0:\n case OCTEON_COP2_SEL_HSH_DATW1:\n case OCTEON_COP2_SEL_HSH_DATW2:\n@@ -2088,6 +2169,36 @@ void helper_octeon_cop2_dmtc2(CPUMIPSState *env, target_ulong value,\n case OCTEON_COP2_SEL_AES_KEYLENGTH:\n crypto->aes_keylen = q;\n break;\n+ case OCTEON_COP2_SEL_LLM_READ_ADDR0:\n+ octeon_llm_read(crypto, 0, q, false);\n+ break;\n+ case OCTEON_COP2_SEL_LLM_WRITE_ADDR_INTERNAL0:\n+ octeon_llm_write(crypto, 0, q, false);\n+ break;\n+ case OCTEON_COP2_SEL_LLM_DATA0:\n+ crypto->llm_data[0] = q;\n+ break;\n+ case OCTEON_COP2_SEL_LLM_READ64_ADDR0:\n+ octeon_llm_read(crypto, 0, q, true);\n+ break;\n+ case OCTEON_COP2_SEL_LLM_WRITE64_ADDR_INTERNAL0:\n+ octeon_llm_write(crypto, 0, q, true);\n+ break;\n+ case OCTEON_COP2_SEL_LLM_READ_ADDR1:\n+ octeon_llm_read(crypto, 1, q, false);\n+ break;\n+ case OCTEON_COP2_SEL_LLM_WRITE_ADDR_INTERNAL1:\n+ octeon_llm_write(crypto, 1, q, false);\n+ break;\n+ case OCTEON_COP2_SEL_LLM_DATA1:\n+ crypto->llm_data[1] = q;\n+ break;\n+ case OCTEON_COP2_SEL_LLM_READ64_ADDR1:\n+ octeon_llm_read(crypto, 1, q, true);\n+ break;\n+ case OCTEON_COP2_SEL_LLM_WRITE64_ADDR_INTERNAL1:\n+ octeon_llm_write(crypto, 1, q, true);\n+ break;\n case OCTEON_COP2_SEL_CAMELLIA_FL:\n octeon_camellia_fl_layer(crypto, q, false);\n break;\ndiff --git a/target/mips/tcg/op_helper.c b/target/mips/tcg/op_helper.c\nindex 3164166910..eae1ce7083 100644\n--- a/target/mips/tcg/op_helper.c\n+++ b/target/mips/tcg/op_helper.c\n@@ -353,6 +353,12 @@ target_ulong helper_rdhwr_xnp(CPUMIPSState *env)\n return (env->CP0_Config5 >> CP0C5_XNP) & 1;\n }\n \n+target_ulong helper_rdhwr_chord(CPUMIPSState *env)\n+{\n+ check_hwrena(env, 30, GETPC());\n+ return env->octeon_crypto.chord;\n+}\n+\n void helper_pmon(CPUMIPSState *env, int function)\n {\n function /= 2;\ndiff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c\nindex 625faae9d1..6760b816d7 100644\n--- a/target/mips/tcg/translate.c\n+++ b/target/mips/tcg/translate.c\n@@ -9185,6 +9185,9 @@ static bool octeon_cop2_is_supported_dmfc2(uint16_t sel)\n case OCTEON_COP2_SEL_GFM_RESINP0:\n case OCTEON_COP2_SEL_GFM_RESINP1:\n case OCTEON_COP2_SEL_GFM_POLY:\n+ case OCTEON_COP2_SEL_CHORD:\n+ case OCTEON_COP2_SEL_LLM_DATA0:\n+ case OCTEON_COP2_SEL_LLM_DATA1:\n return true;\n default:\n return false;\n@@ -9220,6 +9223,16 @@ static bool octeon_cop2_is_supported_dmtc2(uint16_t sel)\n case OCTEON_COP2_SEL_AES_KEYLENGTH:\n case OCTEON_COP2_SEL_CAMELLIA_FL:\n case OCTEON_COP2_SEL_CAMELLIA_FLINV:\n+ case OCTEON_COP2_SEL_LLM_READ_ADDR0:\n+ case OCTEON_COP2_SEL_LLM_WRITE_ADDR_INTERNAL0:\n+ case OCTEON_COP2_SEL_LLM_DATA0:\n+ case OCTEON_COP2_SEL_LLM_READ64_ADDR0:\n+ case OCTEON_COP2_SEL_LLM_WRITE64_ADDR_INTERNAL0:\n+ case OCTEON_COP2_SEL_LLM_READ_ADDR1:\n+ case OCTEON_COP2_SEL_LLM_WRITE_ADDR_INTERNAL1:\n+ case OCTEON_COP2_SEL_LLM_DATA1:\n+ case OCTEON_COP2_SEL_LLM_READ64_ADDR1:\n+ case OCTEON_COP2_SEL_LLM_WRITE64_ADDR_INTERNAL1:\n case OCTEON_COP2_SEL_CRC_WRITE_POLYNOMIAL:\n case OCTEON_COP2_SEL_CRC_IV:\n case OCTEON_COP2_SEL_CRC_WRITE_LEN:\n@@ -11135,6 +11148,14 @@ void gen_rdhwr(DisasContext *ctx, int rt, int rd, int sel)\n gen_helper_rdhwr_xnp(t0, tcg_env);\n gen_store_gpr(t0, rt);\n break;\n+ case 30:\n+ if (!(ctx->insn_flags & INSN_OCTEON)) {\n+ gen_reserved_instruction(ctx);\n+ break;\n+ }\n+ gen_helper_rdhwr_chord(t0, tcg_env);\n+ gen_store_gpr(t0, rt);\n+ break;\n case 29:\n #if defined(CONFIG_USER_ONLY)\n tcg_gen_ld_tl(t0, tcg_env,\n", "prefixes": [ "9/9" ] }