From nobody Sat Jul 25 15:51:59 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=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1784208323; cv=none; d=zohomail.com; s=zohoarc; b=iNd5InQJafKtkTUji84T5IMBqZwOaiI1hLn2uo3rVLzYcra/8ZAWeb227rTNLiMQLx8L5if0P4qM9vjS0vzWQIzeYu4eTWL/ufInoRjqpf8uWnUwCUCEo3OqXX10VNPRaMnqVmgOVSyfZb87/lzWwpab6XAPTLrNQZijHMYmmKM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1784208323; h=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=nkV/3uYIIDprneakL3Sm0JJiijnr2az6NELeQsPrfv0=; b=np37Tdole5yFYJj5rZ6ejGqMV9yt275CKeoj4GmwZ+LrIguprIuIW4dX5m23nuGN3VMRc7j8CAy9Dolr3FKtSYSoQp1ZXsVr5jW3xUQ66D3oBURjJj+vce+R9LPjkzlN/FciYPdH+UYZy7fyigF5jBATpqn3Yz3S0JfRSs66nFA= 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=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1784208323790763.0558949225405; Thu, 16 Jul 2026 06:25:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wkM56-0004YU-Bm; Thu, 16 Jul 2026 09:24:52 -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 1wkM52-0004Xf-Df for qemu-devel@nongnu.org; Thu, 16 Jul 2026 09:24:48 -0400 Received: from mail-pj1-x102c.google.com ([2607:f8b0:4864:20::102c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wkM4z-0004xa-Oa for qemu-devel@nongnu.org; Thu, 16 Jul 2026 09:24:48 -0400 Received: by mail-pj1-x102c.google.com with SMTP id 98e67ed59e1d1-38dd1cc8dc8so597501a91.0 for ; Thu, 16 Jul 2026 06:24:45 -0700 (PDT) Received: from DESKTOP-JUS09M1.tail12b54b.ts.net ([38.34.7.236]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-13cd4344b8bsm11336706c88.13.2026.07.16.06.24.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jul 2026 06:24:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784208284; x=1784813084; 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:content-type; bh=nkV/3uYIIDprneakL3Sm0JJiijnr2az6NELeQsPrfv0=; b=ZroqEqJThZO5mcvMFVYXBVJOFtGdysRRG8EvRGAKcVaB2QFCFWh1pR7K9oRW9wGiq7 GQgbYKOVGBM9T43A2E/HHo0DZNxSk4nnFDaCE18/2jsHnJZ5xncTMM+Wuk72aHnh1sDU AEXRePomTyV4tCIdxZSwKq7Lz3hypXYDLfG+URFvjskMD35/ufPF6POPFdRdsVfu9MFj BGP2RFwXk2/xi1OqZEuRB8kIMvPQglh/hy+sLmXbM0P+GpHMfoAe5n7FQrOVijQwxOAh YPuCwADmVeLojJjHXU74z5xFOhzJIJ73pids4sOqBBE33E6/Q8wcXVAtraFq9W7kSN1U f2CA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784208284; x=1784813084; 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:content-type; bh=nkV/3uYIIDprneakL3Sm0JJiijnr2az6NELeQsPrfv0=; b=gQGUUpFDVaW5XLH9UnGClL/y6UinUNNNW1Izb3Lxlo3+sM+B4Z8iEf2oaKV5nwCHud f97eaMezUXi1gtYra4f2PzdpLtCEMo3IUvTPWkN5kK0HS8o5o9T6Lfvjc/3BA8QwSLTz kJ8Qp8UWINpBPch9mHOgjaQR/QimVA0sw+W0PEH5Tw3MdFRUYoTOE348/SJGU0LN3QFE WfiJJakbUWeZPpJMsVPoOtg+X9V7ekE19ZwVW70pk/Qy2rQLeOQp1ydH4kpylGskXBPf BHc9fvpc3skSXnPU61sXgO2s7hW+dhu9HNQHTcNa8DOLd4JjWFkEIjlHMp7UcAICU5v3 imlQ== X-Gm-Message-State: AOJu0YwQjBYXSvexea6wXlNz6rcCcqHmCUCNjAgUyXASFZ/DCXgEe6PB RJ3VOKEfKD76eYpD8rft1h8cle84CZFvHAFEa0hWzetKwM+p+FyNPIE6MqmsvFnSliDKJg== X-Gm-Gg: AfdE7cnlICaTKy0emiKwNJ9y1TlsP/fWv8GxJtIQiZI3bPH1rv/BcBAaLwrtFD99Euh tAcYy6LM+qckKaYHMJ8zcEHlyOz+7UtPDKuoRn2IMy1gjRFRC2nLZUnd1KC+kGtx7E2BTK07eGQ Ci5lEBQFegWUeTvhFGzGRBncPVClITxG19jcxP/bgJjTW0f8DXbw5UWMacqrIGNTSod+o+jfBVS up68Eb4jS+i8RWhVlCkq6bP5V2FSAm22O5lcqT9ptSIMnN+2s0ZX+5O5DYQhXXFgFIvZHmpXEk8 wMv8ykBGbDbGJ7bWAVZMIWGuTXMQ2whqBaDgy5gtg3Xn6x5hy/2I6PX4m34l3LV+xMvz0cAlHYA /0uwT/R349737I66TPuNoFjgBQ1lPMOW3NXNdxiXvh0h79Ipb1LZG19dC0mq/AiW2qbsaO+3Tti RDBXOMmXN9I+Xas7SZL4NMP5p2PIf6LgPqEdPApqw= X-Received: by 2002:a17:90b:2d4e:b0:368:b002:bdad with SMTP id 98e67ed59e1d1-38dc779df28mr15799223a91.5.1784208284223; Thu, 16 Jul 2026 06:24:44 -0700 (PDT) From: Junze Cao To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, chao.liu@processmission.com, pierrick.bouvier@oss.qualcomm.com, palmer@dabbelt.com, alistair.francis@wdc.com, liwei1518@gmail.com, daniel.barboza@oss.qualcomm.com, zhiwei_liu@linux.alibaba.com, farosas@suse.de, lvivier@redhat.com, pbonzini@redhat.com, Junze Cao Subject: [PATCH 1/3] hw/misc: Add K230 DDR controller and PHY models Date: Thu, 16 Jul 2026 21:24:21 +0800 Message-ID: <20260716132423.931427-2-caojunze424@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260716132423.931427-1-caojunze424@gmail.com> References: <20260716132423.931427-1-caojunze424@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2607:f8b0:4864:20::102c; envelope-from=caojunze424@gmail.com; helo=mail-pj1-x102c.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, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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 @gmail.com) X-ZM-MESSAGEID: 1784208326446158500 Content-Type: text/plain; charset="utf-8" The K230 SDK U-Boot SPL programs K230 DDRC CFG and K230 DDR PHY registers before DRAM can be used. Add separate SysBus devices for both register ranges. Model controller reset values, DFI and software-update handshakes. For the PHY, model register ownership, the training mailbox, and DFI completion. Include migration state for both devices. Signed-off-by: Junze Cao Reviewed-by: Daniel Henrique Barboza Suggested-by: Chao Liu --- MAINTAINERS | 2 + hw/misc/k230_ddr.c | 544 +++++++++++++++++++++++++++++++++++++ hw/misc/meson.build | 1 + include/hw/misc/k230_ddr.h | 59 ++++ 4 files changed, 606 insertions(+) create mode 100644 hw/misc/k230_ddr.c create mode 100644 include/hw/misc/k230_ddr.h diff --git a/MAINTAINERS b/MAINTAINERS index ecb8cfdc41..1cb3ef6c02 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1826,8 +1826,10 @@ M: Chao Liu L: qemu-riscv@nongnu.org S: Maintained F: docs/system/riscv/k230.rst +F: hw/misc/k230_ddr.c F: hw/riscv/k230.c F: hw/watchdog/k230_wdt.c +F: include/hw/misc/k230_ddr.h F: include/hw/riscv/k230.h F: include/hw/watchdog/k230_wdt.h F: tests/functional/riscv64/test_k230.py diff --git a/hw/misc/k230_ddr.c b/hw/misc/k230_ddr.c new file mode 100644 index 0000000000..9ff2714e34 --- /dev/null +++ b/hw/misc/k230_ddr.c @@ -0,0 +1,544 @@ +/* + * Kendryte K230 DDR controller and PHY models + * + * Models the K230 DDRC CFG registers and K230 DDR PHY registers exercised + * by the K230 SDK U-Boot SPL. + * + * Copyright (c) 2026 Junze Cao + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "qemu/module.h" +#include "migration/vmstate.h" +#include "hw/core/registerfields.h" +#include "hw/core/resettable.h" +#include "hw/misc/k230_ddr.h" + +/* DDRC CFG registers */ + +enum K230DDRCOperatingMode { + K230_DDRC_MODE_INIT =3D 0, + K230_DDRC_MODE_NORMAL =3D 1, +}; + +REG32(K230_DDRC_MSTR, 0x000) + +REG32(K230_DDRC_STAT, 0x004) + FIELD(K230_DDRC_STAT, OPERATING_MODE, 0, 3) + +REG32(K230_DDRC_PWRCTL, 0x030) + +REG32(K230_DDRC_RFSHCTL0, 0x050) + +REG32(K230_DDRC_RFSHTMG, 0x064) + +REG32(K230_DDRC_RFSHTMG1, 0x068) + +REG32(K230_DDRC_INIT0, 0x0d0) + +REG32(K230_DDRC_INIT2, 0x0d8) + +REG32(K230_DDRC_INIT3, 0x0dc) + +REG32(K230_DDRC_INIT5, 0x0e4) + +REG32(K230_DDRC_DRAMTMG0, 0x100) +#define R_K230_DDRC_DRAMTMG(index) \ + (R_K230_DDRC_DRAMTMG0 + (index)) + +REG32(K230_DDRC_ZQCTL0, 0x180) + +REG32(K230_DDRC_ZQCTL1, 0x184) + +REG32(K230_DDRC_ZQCTL2, 0x188) + +REG32(K230_DDRC_ZQSTAT, 0x18c) + +REG32(K230_DDRC_DFITMG0, 0x190) + +REG32(K230_DDRC_DFITMG1, 0x194) + +REG32(K230_DDRC_DFIUPD0, 0x1a0) + +REG32(K230_DDRC_DFIUPD1, 0x1a4) + +REG32(K230_DDRC_DFIUPD2, 0x1a8) + +REG32(K230_DDRC_DFIMISC, 0x1b0) + FIELD(K230_DDRC_DFIMISC, DFI_INIT_COMPLETE_EN, 0, 1) + FIELD(K230_DDRC_DFIMISC, DFI_INIT_START, 5, 1) + +REG32(K230_DDRC_DFITMG2, 0x1b4) + +REG32(K230_DDRC_DFISTAT, 0x1bc) + FIELD(K230_DDRC_DFISTAT, DFI_INIT_COMPLETE, 0, 1) + +REG32(K230_DDRC_ODTCFG, 0x240) + +REG32(K230_DDRC_SWCTL, 0x320) + FIELD(K230_DDRC_SWCTL, SW_DONE, 0, 1) + +REG32(K230_DDRC_SWSTAT, 0x324) + FIELD(K230_DDRC_SWSTAT, SW_DONE_ACK, 0, 1) + +static const uint32_t k230_ddrc_reset_values[K230_DDRC_REG_COUNT] =3D { + [R_K230_DDRC_MSTR] =3D 0x01040000, + [R_K230_DDRC_RFSHCTL0] =3D 0x00210000, + [R_K230_DDRC_RFSHTMG] =3D 0x0062008c, + [R_K230_DDRC_RFSHTMG1] =3D 0x0000008c, + [R_K230_DDRC_INIT0] =3D 0x0002004e, + [R_K230_DDRC_INIT3] =3D 0x00000510, + [R_K230_DDRC_INIT5] =3D 0x00100000, + [R_K230_DDRC_DRAMTMG(0)] =3D 0x0f101b0f, + [R_K230_DDRC_DRAMTMG(1)] =3D 0x00080414, + [R_K230_DDRC_DRAMTMG(2)] =3D 0x0305060d, + [R_K230_DDRC_DRAMTMG(3)] =3D 0x00004000, + [R_K230_DDRC_DRAMTMG(4)] =3D 0x05040405, + [R_K230_DDRC_DRAMTMG(5)] =3D 0x05050403, + [R_K230_DDRC_DRAMTMG(6)] =3D 0x02020005, + [R_K230_DDRC_DRAMTMG(7)] =3D 0x00000202, + [R_K230_DDRC_DRAMTMG(8)] =3D 0x03034405, + [R_K230_DDRC_DRAMTMG(9)] =3D 0x0004040d, + [R_K230_DDRC_DRAMTMG(10)] =3D 0x001c180a, + [R_K230_DDRC_DRAMTMG(11)] =3D 0x440c021c, + [R_K230_DDRC_DRAMTMG(12)] =3D 0x00020610, + [R_K230_DDRC_DRAMTMG(13)] =3D 0x1c200004, + [R_K230_DDRC_DRAMTMG(14)] =3D 0x000000a0, + [R_K230_DDRC_DRAMTMG(16)] =3D 0x05100404, + [R_K230_DDRC_ZQCTL0] =3D 0x02000040, + [R_K230_DDRC_ZQCTL1] =3D 0x02000100, + [R_K230_DDRC_DFITMG0] =3D 0x07020002, + [R_K230_DDRC_DFITMG1] =3D 0x00000404, + [R_K230_DDRC_DFIUPD0] =3D 0x00400003, + [R_K230_DDRC_DFIUPD1] =3D 0x00010001, + [R_K230_DDRC_DFIUPD2] =3D 0x80000000, + [R_K230_DDRC_DFIMISC] =3D 0x00000001, + [R_K230_DDRC_DFITMG2] =3D 0x00000202, + [R_K230_DDRC_ODTCFG] =3D 0x04000400, + [R_K230_DDRC_SWCTL] =3D 0x00000001, + [R_K230_DDRC_SWSTAT] =3D 0x00000001, +}; + +/* K230 DDR PHY CSRs use byte offset =3D CSR index * 4. */ +#define K230_DDR_PHY_CSR_OFFSET(index) ((index) * 4) +#define K230_DDR_PHY_MASTER_CSR(reg) \ + K230_DDR_PHY_CSR_OFFSET(0x20000 + (reg)) +#define K230_DDR_PHY_APBONLY_CSR(reg) \ + K230_DDR_PHY_CSR_OFFSET(0xd0000 + (reg)) + +#define K230_DDR_PHY_ATX_IMPEDANCE_RESET UINT32_C(0x03ff) + +REG32(K230_DDR_PHY_MICRO_CONT_MUX_SEL, + K230_DDR_PHY_APBONLY_CSR(0x000)) + FIELD(K230_DDR_PHY_MICRO_CONT_MUX_SEL, MICRO_CONT_MUX_SEL, 0, 1) + +REG32(K230_DDR_PHY_TRAINING_STATUS, + K230_DDR_PHY_APBONLY_CSR(0x004)) + FIELD(K230_DDR_PHY_TRAINING_STATUS, MAILBOX_EMPTY, 0, 1) + +REG32(K230_DDR_PHY_TRAINING_ACK, + K230_DDR_PHY_APBONLY_CSR(0x031)) + +REG32(K230_DDR_PHY_TRAINING_MESSAGE, + K230_DDR_PHY_APBONLY_CSR(0x032)) + +REG32(K230_DDR_PHY_TRAINING_TRIGGER, + K230_DDR_PHY_APBONLY_CSR(0x099)) + +#define K230_DDR_PHY_TX_IMPEDANCE_CTRL1_RESET UINT32_C(0x0fff) + +REG32(K230_DDR_PHY_DFI_INIT_COMPLETE, + K230_DDR_PHY_MASTER_CSR(0x0f9)) + FIELD(K230_DDR_PHY_DFI_INIT_COMPLETE, DFI_INIT_COMPLETE, 0, 1) + +REG32(K230_DDR_PHY_VREF_IN_GLOBAL, + K230_DDR_PHY_MASTER_CSR(0x0b2)) +#define K230_DDR_PHY_VREF_IN_GLOBAL_RESET UINT32_C(0x0200) + +static void k230_ddr_cfg_update_state(K230DDRCfgState *s) +{ + bool dfi_complete =3D false; + unsigned int operating_mode =3D K230_DDRC_MODE_INIT; + + if (s->phy) { + dfi_complete =3D FIELD_EX32(s->phy->dfi_init_complete, + K230_DDR_PHY_DFI_INIT_COMPLETE, + DFI_INIT_COMPLETE); + } + + ARRAY_FIELD_DP32(s->regs, K230_DDRC_DFISTAT, + DFI_INIT_COMPLETE, dfi_complete); + ARRAY_FIELD_DP32(s->regs, K230_DDRC_SWSTAT, SW_DONE_ACK, + ARRAY_FIELD_EX32(s->regs, K230_DDRC_SWCTL, SW_DONE)); + + if (dfi_complete && + ARRAY_FIELD_EX32(s->regs, K230_DDRC_DFIMISC, + DFI_INIT_COMPLETE_EN)) { + s->initialized =3D true; + } + + if (s->initialized) { + operating_mode =3D K230_DDRC_MODE_NORMAL; + } + + ARRAY_FIELD_DP32(s->regs, K230_DDRC_STAT, + OPERATING_MODE, operating_mode); +} + +static uint64_t k230_ddr_cfg_read(void *opaque, hwaddr addr, unsigned int = size) +{ + K230DDRCfgState *s =3D opaque; + uint64_t value =3D 0; + + if (addr < K230_DDRC_REG_SIZE) { + k230_ddr_cfg_update_state(s); + value =3D s->regs[addr / sizeof(uint32_t)]; + } + + return value; +} + +static void k230_ddr_cfg_write(void *opaque, hwaddr addr, uint64_t value, + unsigned int size) +{ + K230DDRCfgState *s =3D opaque; + uint32_t val =3D value; + + if (addr >=3D K230_DDRC_REG_SIZE) { + return; + } + + switch (addr) { + case A_K230_DDRC_STAT: + case A_K230_DDRC_DFISTAT: + case A_K230_DDRC_ZQSTAT: + case A_K230_DDRC_SWSTAT: + return; + case A_K230_DDRC_PWRCTL: + s->regs[R_K230_DDRC_PWRCTL] =3D val & MAKE_64BIT_MASK(0, 9); + break; + case A_K230_DDRC_ZQCTL2: + /* ZQ reset completes immediately and the W1S bit self-clears. */ + s->regs[R_K230_DDRC_ZQCTL2] =3D 0; + s->regs[R_K230_DDRC_ZQSTAT] =3D 0; + break; + case A_K230_DDRC_DFIMISC: + s->regs[R_K230_DDRC_DFIMISC] =3D + val & (MAKE_64BIT_MASK(0, 6) | MAKE_64BIT_MASK(8, 5)); + if (s->phy && s->phy->training_complete && + FIELD_EX32(val, K230_DDRC_DFIMISC, DFI_INIT_START)) { + s->phy->dfi_init_complete =3D FIELD_DP32( + s->phy->dfi_init_complete, + K230_DDR_PHY_DFI_INIT_COMPLETE, DFI_INIT_COMPLETE, 1); + } + break; + case A_K230_DDRC_SWCTL: + s->regs[R_K230_DDRC_SWCTL] =3D + val & R_K230_DDRC_SWCTL_SW_DONE_MASK; + break; + default: + s->regs[addr / sizeof(uint32_t)] =3D val; + break; + } + + k230_ddr_cfg_update_state(s); +} + +static bool k230_ddr_phy_decode_anib(hwaddr addr, unsigned int *anib) +{ + uint32_t csr =3D addr / sizeof(uint32_t); + + if ((csr & 0xfff) !=3D 0x043) { + return false; + } + + *anib =3D csr >> 12; + return *anib < K230_DDR_PHY_ANIB_COUNT; +} + +static bool k230_ddr_phy_decode_dbyte(hwaddr addr, uint32_t reg, + unsigned int *dbyte, + unsigned int *nibble) +{ + uint32_t csr =3D addr / sizeof(uint32_t); + uint32_t block_offset; + + if (csr < 0x10000) { + return false; + } + + csr -=3D 0x10000; + *dbyte =3D csr >> 12; + if (*dbyte >=3D K230_DDR_PHY_DBYTE_COUNT) { + return false; + } + + block_offset =3D csr & 0xfff; + *nibble =3D block_offset >> 8; + return *nibble < K230_DDR_PHY_NIBBLES_PER_DBYTE && + (block_offset & 0xff) =3D=3D reg; +} + +static uint64_t k230_ddr_phy_read(void *opaque, hwaddr addr, + unsigned int size) +{ + K230DDRPhyState *s =3D opaque; + unsigned int dbyte; + unsigned int nibble; + unsigned int anib; + uint64_t value =3D 0; + + switch (addr) { + case A_K230_DDR_PHY_MICRO_CONT_MUX_SEL: + value =3D s->micro_cont_mux_sel; + break; + case A_K230_DDR_PHY_TRAINING_STATUS: + value =3D s->mailbox_message_pending ? 0 : + R_K230_DDR_PHY_TRAINING_STATUS_MAILBOX_EMPTY_MASK; + break; + case A_K230_DDR_PHY_TRAINING_MESSAGE: + value =3D s->training_complete ? 0x07 : 0; + break; + case A_K230_DDR_PHY_TRAINING_ACK: + case A_K230_DDR_PHY_TRAINING_TRIGGER: + break; + case A_K230_DDR_PHY_DFI_INIT_COMPLETE: + value =3D s->dfi_init_complete; + break; + case A_K230_DDR_PHY_VREF_IN_GLOBAL: + value =3D s->vref_in_global; + break; + default: + if (k230_ddr_phy_decode_anib(addr, &anib)) { + value =3D s->atx_impedance[anib]; + } else if (k230_ddr_phy_decode_dbyte(addr, 0x049, + &dbyte, &nibble)) { + value =3D s->tx_impedance_ctrl1[dbyte][nibble]; + } else if (k230_ddr_phy_decode_dbyte(addr, 0x04d, + &dbyte, &nibble)) { + value =3D s->tx_odt_drv_stren[dbyte][nibble]; + } + break; + } + + return value; +} + +static void k230_ddr_phy_write(void *opaque, hwaddr addr, uint64_t value, + unsigned int size) +{ + K230DDRPhyState *s =3D opaque; + uint16_t val =3D value; + unsigned int dbyte; + unsigned int nibble; + unsigned int anib; + + switch (addr) { + case A_K230_DDR_PHY_MICRO_CONT_MUX_SEL: + s->micro_cont_mux_sel =3D + val & R_K230_DDR_PHY_MICRO_CONT_MUX_SEL_MICRO_CONT_MUX_SEL_MAS= K; + return; + case A_K230_DDR_PHY_TRAINING_STATUS: + case A_K230_DDR_PHY_TRAINING_MESSAGE: + return; + case A_K230_DDR_PHY_TRAINING_ACK: + if (val =3D=3D 0) { + s->mailbox_message_pending =3D false; + } + return; + case A_K230_DDR_PHY_TRAINING_TRIGGER: + if (val !=3D 0) { + s->training_trigger_seen =3D true; + } else if (s->training_trigger_seen) { + /* Abstract the loaded firmware run to its final mailbox messa= ge. */ + s->training_trigger_seen =3D false; + s->training_complete =3D true; + s->mailbox_message_pending =3D true; + } + return; + default: + break; + } + + if (FIELD_EX32(s->micro_cont_mux_sel, + K230_DDR_PHY_MICRO_CONT_MUX_SEL, + MICRO_CONT_MUX_SEL)) { + return; + } + + switch (addr) { + case A_K230_DDR_PHY_DFI_INIT_COMPLETE: + s->dfi_init_complete =3D + val & R_K230_DDR_PHY_DFI_INIT_COMPLETE_DFI_INIT_COMPLETE_MASK; + return; + case A_K230_DDR_PHY_VREF_IN_GLOBAL: + s->vref_in_global =3D val & UINT16_C(0x7fff); + return; + default: + break; + } + + if (k230_ddr_phy_decode_anib(addr, &anib)) { + s->atx_impedance[anib] =3D val & UINT16_C(0x03ff); + return; + } + + if (k230_ddr_phy_decode_dbyte(addr, 0x049, &dbyte, &nibble)) { + s->tx_impedance_ctrl1[dbyte][nibble] =3D val & UINT16_C(0x0fff); + return; + } + + if (k230_ddr_phy_decode_dbyte(addr, 0x04d, &dbyte, &nibble)) { + s->tx_odt_drv_stren[dbyte][nibble] =3D val & UINT16_C(0x0fff); + } +} + +static const MemoryRegionOps k230_ddr_cfg_ops =3D { + .read =3D k230_ddr_cfg_read, + .write =3D k230_ddr_cfg_write, + .endianness =3D DEVICE_LITTLE_ENDIAN, + .valid =3D { + .min_access_size =3D 4, + .max_access_size =3D 4, + .unaligned =3D false, + }, +}; + +static const MemoryRegionOps k230_ddr_phy_ops =3D { + .read =3D k230_ddr_phy_read, + .write =3D k230_ddr_phy_write, + .endianness =3D DEVICE_LITTLE_ENDIAN, + .valid =3D { + .min_access_size =3D 4, + .max_access_size =3D 4, + .unaligned =3D false, + }, +}; + +static void k230_ddr_cfg_init(Object *obj) +{ + K230DDRCfgState *s =3D K230_DDR_CFG(obj); + + memory_region_init_io(&s->mmio, obj, &k230_ddr_cfg_ops, s, + "k230-ddr-cfg", K230_DDRC_MMIO_SIZE); + sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->mmio); +} + +static void k230_ddr_phy_init(Object *obj) +{ + K230DDRPhyState *s =3D K230_DDR_PHY(obj); + + memory_region_init_io(&s->mmio, obj, &k230_ddr_phy_ops, s, + "k230-ddr-phy", K230_DDR_PHY_MMIO_SIZE); + sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->mmio); +} + +static void k230_ddr_cfg_reset_enter(Object *obj, ResetType type) +{ + K230DDRCfgState *s =3D K230_DDR_CFG(obj); + + s->initialized =3D false; + memcpy(s->regs, k230_ddrc_reset_values, sizeof(s->regs)); +} + +static void k230_ddr_phy_reset_enter(Object *obj, ResetType type) +{ + K230DDRPhyState *s =3D K230_DDR_PHY(obj); + unsigned int dbyte; + unsigned int nibble; + unsigned int anib; + + memset(s->tx_odt_drv_stren, 0, sizeof(s->tx_odt_drv_stren)); + + for (anib =3D 0; anib < ARRAY_SIZE(s->atx_impedance); anib++) { + s->atx_impedance[anib] =3D K230_DDR_PHY_ATX_IMPEDANCE_RESET; + } + + for (dbyte =3D 0; dbyte < ARRAY_SIZE(s->tx_impedance_ctrl1); dbyte++) { + for (nibble =3D 0; + nibble < ARRAY_SIZE(s->tx_impedance_ctrl1[dbyte]); nibble++) { + s->tx_impedance_ctrl1[dbyte][nibble] =3D + K230_DDR_PHY_TX_IMPEDANCE_CTRL1_RESET; + } + } + + s->dfi_init_complete =3D 0; + s->vref_in_global =3D K230_DDR_PHY_VREF_IN_GLOBAL_RESET; + s->micro_cont_mux_sel =3D 0; + s->training_trigger_seen =3D false; + s->training_complete =3D false; + s->mailbox_message_pending =3D false; +} + +static const VMStateDescription vmstate_k230_ddr_cfg =3D { + .name =3D "k230-ddr-cfg", + .version_id =3D 1, + .minimum_version_id =3D 1, + .fields =3D (const VMStateField[]) { + VMSTATE_UINT32_ARRAY(regs, K230DDRCfgState, K230_DDRC_REG_COUNT), + VMSTATE_BOOL(initialized, K230DDRCfgState), + VMSTATE_END_OF_LIST() + }, +}; + +static const VMStateDescription vmstate_k230_ddr_phy =3D { + .name =3D "k230-ddr-phy", + .version_id =3D 1, + .minimum_version_id =3D 1, + .fields =3D (const VMStateField[]) { + VMSTATE_UINT16_ARRAY(atx_impedance, K230DDRPhyState, + K230_DDR_PHY_ANIB_COUNT), + VMSTATE_UINT16_2DARRAY(tx_impedance_ctrl1, K230DDRPhyState, + K230_DDR_PHY_DBYTE_COUNT, + K230_DDR_PHY_NIBBLES_PER_DBYTE), + VMSTATE_UINT16_2DARRAY(tx_odt_drv_stren, K230DDRPhyState, + K230_DDR_PHY_DBYTE_COUNT, + K230_DDR_PHY_NIBBLES_PER_DBYTE), + VMSTATE_UINT16(dfi_init_complete, K230DDRPhyState), + VMSTATE_UINT16(vref_in_global, K230DDRPhyState), + VMSTATE_UINT16(micro_cont_mux_sel, K230DDRPhyState), + VMSTATE_BOOL(training_trigger_seen, K230DDRPhyState), + VMSTATE_BOOL(training_complete, K230DDRPhyState), + VMSTATE_BOOL(mailbox_message_pending, K230DDRPhyState), + VMSTATE_END_OF_LIST() + }, +}; + +static void k230_ddr_cfg_class_init(ObjectClass *klass, const void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + ResettableClass *rc =3D RESETTABLE_CLASS(klass); + + rc->phases.enter =3D k230_ddr_cfg_reset_enter; + dc->vmsd =3D &vmstate_k230_ddr_cfg; +} + +static void k230_ddr_phy_class_init(ObjectClass *klass, const void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + ResettableClass *rc =3D RESETTABLE_CLASS(klass); + + rc->phases.enter =3D k230_ddr_phy_reset_enter; + dc->vmsd =3D &vmstate_k230_ddr_phy; +} + +static const TypeInfo k230_ddr_types[] =3D { + { + .name =3D TYPE_K230_DDR_CFG, + .parent =3D TYPE_SYS_BUS_DEVICE, + .instance_size =3D sizeof(K230DDRCfgState), + .instance_init =3D k230_ddr_cfg_init, + .class_init =3D k230_ddr_cfg_class_init, + }, + { + .name =3D TYPE_K230_DDR_PHY, + .parent =3D TYPE_SYS_BUS_DEVICE, + .instance_size =3D sizeof(K230DDRPhyState), + .instance_init =3D k230_ddr_phy_init, + .class_init =3D k230_ddr_phy_class_init, + }, +}; + +DEFINE_TYPES(k230_ddr_types) diff --git a/hw/misc/meson.build b/hw/misc/meson.build index 23265f6035..6d5e2b2647 100644 --- a/hw/misc/meson.build +++ b/hw/misc/meson.build @@ -28,6 +28,7 @@ system_ss.add(when: 'CONFIG_IOSB', if_true: files('iosb.c= ')) system_ss.add(when: 'CONFIG_VIRT_CTRL', if_true: files('virt_ctrl.c')) =20 # RISC-V devices +system_ss.add(when: 'CONFIG_K230', if_true: files('k230_ddr.c')) system_ss.add(when: 'CONFIG_MCHP_PFSOC_DMC', if_true: files('mchp_pfsoc_dm= c.c')) system_ss.add(when: 'CONFIG_MCHP_PFSOC_IOSCB', if_true: files('mchp_pfsoc_= ioscb.c')) system_ss.add(when: 'CONFIG_MCHP_PFSOC_SYSREG', if_true: files('mchp_pfsoc= _sysreg.c')) diff --git a/include/hw/misc/k230_ddr.h b/include/hw/misc/k230_ddr.h new file mode 100644 index 0000000000..d912e8e1b0 --- /dev/null +++ b/include/hw/misc/k230_ddr.h @@ -0,0 +1,59 @@ +/* + * Kendryte K230 DDR controller and PHY models + * + * Device state and type declarations for the K230 DDRC CFG and K230 DDR P= HY + * registers. + * + * Copyright (c) 2026 Junze Cao + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#ifndef HW_MISC_K230_DDR_H +#define HW_MISC_K230_DDR_H + +#include "hw/core/sysbus.h" + +#define K230_DDRC_MMIO_SIZE 0x02000000 +#define K230_DDR_PHY_MMIO_SIZE 0x00400000 + +#define K230_DDRC_REG_SIZE 0x328 +#define K230_DDRC_REG_COUNT (K230_DDRC_REG_SIZE / sizeof(uint32_t)) + +#define K230_DDR_PHY_ANIB_COUNT 10 +#define K230_DDR_PHY_DBYTE_COUNT 4 +#define K230_DDR_PHY_NIBBLES_PER_DBYTE 2 + +#define TYPE_K230_DDR_CFG "riscv.k230.ddr-cfg" +OBJECT_DECLARE_SIMPLE_TYPE(K230DDRCfgState, K230_DDR_CFG) + +#define TYPE_K230_DDR_PHY "riscv.k230.ddr-phy" +OBJECT_DECLARE_SIMPLE_TYPE(K230DDRPhyState, K230_DDR_PHY) + +struct K230DDRCfgState { + SysBusDevice parent_obj; + + MemoryRegion mmio; + K230DDRPhyState *phy; + uint32_t regs[K230_DDRC_REG_COUNT]; + bool initialized; +}; + +struct K230DDRPhyState { + SysBusDevice parent_obj; + + MemoryRegion mmio; + uint16_t atx_impedance[K230_DDR_PHY_ANIB_COUNT]; + uint16_t tx_impedance_ctrl1[K230_DDR_PHY_DBYTE_COUNT] + [K230_DDR_PHY_NIBBLES_PER_DBYTE]; + uint16_t tx_odt_drv_stren[K230_DDR_PHY_DBYTE_COUNT] + [K230_DDR_PHY_NIBBLES_PER_DBYTE]; + uint16_t dfi_init_complete; + uint16_t vref_in_global; + uint16_t micro_cont_mux_sel; + bool training_trigger_seen; + bool training_complete; + bool mailbox_message_pending; +}; + +#endif --=20 2.53.0 From nobody Sat Jul 25 15:51:59 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=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1784208433; cv=none; d=zohomail.com; s=zohoarc; b=ONG7X1FNcR4DGLvSedSSID2C/Bq08vVkYXRAJcu+mSkw/0DLgtEmmPpMs/5dc/Gl8Uf86NOCVO8Vmotyac8hJzoiYFcZXIsd341SDpaBDavPLshtKdXU0v5EwVkb0MEQSfAV7QZDw/DRnNY6QoPCoBtxs9SzdXtTmoG28pPHAS0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1784208433; h=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=WKXtH3awKz4URpq1FYzgqqqMJUq1Aobj2mw3LYY6nwA=; b=U063mVhTUxQxcjO0a9JCT20vvmHU+HussMWdnCLfiScwgM4fI9HvgmXM411vmSK3xne0AQYhUB0CYcMO+392S1q7VFbFuIEC3mqsAC7zl3oRn5a1v2DRbB7kgkLY/BnJCSuJjTUoqON4oA5QMyg4PRXzhlXx/ghY6yeVdHqUQzQ= 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=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1784208433863976.9937932610026; Thu, 16 Jul 2026 06:27:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wkM72-0006hx-48; Thu, 16 Jul 2026 09:26:52 -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 1wkM70-0006hV-H7 for qemu-devel@nongnu.org; Thu, 16 Jul 2026 09:26:50 -0400 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wkM6y-0005HG-OK for qemu-devel@nongnu.org; Thu, 16 Jul 2026 09:26:50 -0400 Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-2cf1777c25aso2788025ad.2 for ; Thu, 16 Jul 2026 06:26:48 -0700 (PDT) Received: from DESKTOP-JUS09M1.tail12b54b.ts.net ([38.34.7.236]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-13cd4344b8bsm11336706c88.13.2026.07.16.06.26.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jul 2026 06:26:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784208407; x=1784813207; 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:content-type; bh=WKXtH3awKz4URpq1FYzgqqqMJUq1Aobj2mw3LYY6nwA=; b=j3XRFiYSTnWvD6FjMPgotJiJtdXPm0NSr/7OOZkAGCnyYeI9Q2s9eG6Z+1BChjWzFo aqOJc4uuJS0iBuJ8UgTA9C2N5yc1fgyzJyYHfTlGwa3l1r8E8e5YKbV4YEzRe7tc2WIt 3bC3oHhBe43/qwqJGgNc7H0diZlIwmXsUAX1KPaMwBrrRzFqJEFNqs/IvP0Uq8iYTdRP IFx+the7bAXJXfXxCR/lFacVVOlu+oYdp95/uemnI/VPHGt0rUmJ7Kw3dH07n1VWlFrT LMaKVBYvyNzXdvXCUfeemoaCBW3agYId07a/89NSx9PSAhaHTf7Pss5tmDYwdOg0FgJp qkuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784208407; x=1784813207; 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:content-type; bh=WKXtH3awKz4URpq1FYzgqqqMJUq1Aobj2mw3LYY6nwA=; b=OfuZ5IUcAj2tidzvT3B8aVTS5M1k8VxE3zWO7raJKZb/DJPIVpnpSmmKmvlYitINJv tQcCs9DsM/JUbv1+G/lvUY1cAIuY0JhVpRqK9etZBz0tEVah/ocKTAyCEDh/vCxlWnfO TwAn2EpHmjS+4f5me27ZVg49hBI9jOuwM1dlWFWk/j+uo06vu3y07AOM/XjACOq0Vcht qLHcucjC9/o48SLA/nysF9OZU4Q2Qk7kloor/myHk4rCeu32JshrQHjeCrYgR38xewhK sAdBwiqzO7ZCdeTBtqoe7qCb1f0e/jZBP80JwwoDvfYbaEqY71SO74BDl6ZaxOEsxkvR CZhQ== X-Gm-Message-State: AOJu0YzrtM0MDUSj+hxU1kGpUvhZSHcN31khD85SzYh78QobnbS8vBus 4PhDaBr35yhJdPc2Nz8rokrz2uAdo+nSf+nwc1KcGH/tO6tdKWmV0HSSnbdf/YT0IITVPQ== X-Gm-Gg: AfdE7clDW82r176C71qSFtdeoNAYJz56+vTwlmMBdaBdj/bAZ3DNGZ0lvH1DPgKrRNM Vloqhbm785hzw2vwBpoLEX9wn/ZDefmzhN3c+drwjRo2npFvr2GBea0lOhbIQI9ZlVMSMRr9YeO L6JEDz5Iz+QJ9P8NsNJBpKJPV1vgi8FtYuqbHcH7kbBdXeX/Xh3mc5vL+ER5MEaj5w1MC4R1MmY /xzP+wqi42jHOM3X7QcIT3vovDsWCBWfAVky2SZZ6igfMqN3k757VnqyU+t5y1KLj1c7C5TJISD 73QwwVIgjiZChy3kyIp/RcqSU/tPL9FuSzZLvgds/vE+mAAV7+PZdzULK/mjotvbVAdj2tWGosS mmNArnhB4XvDNUQfrCPp28BwG5NUaptfz+AVW47f6TxJu1c+e3h72vzS573CrJmUVlQw4jbCdpe 8xaG8T/P1m+lg8VlOYTjr8QxkewWCv X-Received: by 2002:a17:903:2bcc:b0:2c9:99be:f011 with SMTP id d9443c01a7336-2ce9f28e423mr166320265ad.6.1784208407119; Thu, 16 Jul 2026 06:26:47 -0700 (PDT) From: Junze Cao To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, chao.liu@processmission.com, pierrick.bouvier@oss.qualcomm.com, palmer@dabbelt.com, alistair.francis@wdc.com, liwei1518@gmail.com, daniel.barboza@oss.qualcomm.com, zhiwei_liu@linux.alibaba.com, farosas@suse.de, lvivier@redhat.com, pbonzini@redhat.com, Junze Cao Subject: [PATCH 2/3] hw/riscv: Connect K230 DDR controller and PHY models Date: Thu, 16 Jul 2026 21:24:22 +0800 Message-ID: <20260716132423.931427-3-caojunze424@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260716132423.931427-1-caojunze424@gmail.com> References: <20260716132423.931427-1-caojunze424@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2607:f8b0:4864:20::630; envelope-from=caojunze424@gmail.com; helo=mail-pl1-x630.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, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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 @gmail.com) X-ZM-MESSAGEID: 1784208434828158500 Content-Type: text/plain; charset="utf-8" Replace the unimplemented K230 DDR configuration region with the DDRC model and map the PHY model at 0x9a000000. Connect the controller to the PHY so DFI status reflects PHY training and initialization state. Signed-off-by: Junze Cao Reviewed-by: Daniel Henrique Barboza Suggested-by: Chao Liu --- docs/system/riscv/k230.rst | 4 ++++ hw/riscv/k230.c | 19 ++++++++++++++++--- include/hw/riscv/k230.h | 4 ++++ 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/docs/system/riscv/k230.rst b/docs/system/riscv/k230.rst index cea8202e55..06a819fbdb 100644 --- a/docs/system/riscv/k230.rst +++ b/docs/system/riscv/k230.rst @@ -20,12 +20,16 @@ The ``k230`` machine supports the following devices: * Platform-Level Interrupt Controller (PLIC) * 2 K230 Watchdog Timer * 5 UART +* K230 DDRC CFG and DDR PHY =20 Boot options ------------ The ``k230`` machine supports K230 SDK boot through M-mode U-Boot, which t= hen starts OpenSBI/Linux with ``bootm``. It also supports direct Linux boot. =20 +The DDRC CFG and DDR PHY models allow the K230 SDK U-Boot SPL to complete = DDR +initialization before loading the next boot stage. + K230 SDK Linux kernels use T-HEAD C9xx private MAEE page table attributes.= QEMU does not implement MAEE in the generic RISC-V MMU, so such kernels need to= be built with standard RISC-V PTE bits before they can boot under QEMU. diff --git a/hw/riscv/k230.c b/hw/riscv/k230.c index 656f28190c..627150b463 100644 --- a/hw/riscv/k230.c +++ b/hw/riscv/k230.c @@ -97,6 +97,7 @@ static const MemMapEntry memmap[] =3D { [K230_DEV_SPI] =3D { 0x91584000, 0x00001000 }, [K230_DEV_HI_SYS_CFG] =3D { 0x91585000, 0x00000400 }, [K230_DEV_DDRC_CFG] =3D { 0x98000000, 0x02000000 }, + [K230_DEV_DDR_PHY] =3D { 0x9A000000, 0x00400000 }, [K230_DEV_FLASH] =3D { 0xC0000000, 0x08000000 }, [K230_DEV_PLIC] =3D { 0xF00000000, 0x00400000 }, [K230_DEV_CLINT] =3D { 0xF04000000, 0x00400000 }, @@ -108,6 +109,11 @@ static void k230_soc_init(Object *obj) RISCVHartArrayState *cpu0 =3D &s->c908_cpu; =20 object_initialize_child(obj, "c908-cpu", cpu0, TYPE_RISCV_HART_ARRAY); + object_initialize_child(obj, "ddr-cfg", &s->ddr_cfg, + TYPE_K230_DDR_CFG); + object_initialize_child(obj, "ddr-phy", &s->ddr_phy, + TYPE_K230_DDR_PHY); + s->ddr_cfg.phy =3D &s->ddr_phy; object_initialize_child(obj, "k230-wdt0", &s->wdt[0], TYPE_K230_WDT); object_initialize_child(obj, "k230-wdt1", &s->wdt[1], TYPE_K230_WDT); =20 @@ -158,6 +164,16 @@ static void k230_soc_realize(DeviceState *dev, Error *= *errp) int c908_cpus; =20 sysbus_realize(SYS_BUS_DEVICE(&s->c908_cpu), &error_fatal); + if (!sysbus_realize(SYS_BUS_DEVICE(&s->ddr_cfg), errp)) { + return; + } + if (!sysbus_realize(SYS_BUS_DEVICE(&s->ddr_phy), errp)) { + return; + } + sysbus_mmio_map(SYS_BUS_DEVICE(&s->ddr_cfg), 0, + memmap[K230_DEV_DDRC_CFG].base); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->ddr_phy), 0, + memmap[K230_DEV_DDR_PHY].base); =20 c908_cpus =3D s->c908_cpu.num_harts; =20 @@ -361,9 +377,6 @@ static void k230_soc_realize(DeviceState *dev, Error **= errp) create_unimplemented_device("hi_sys_cfg", memmap[K230_DEV_HI_SYS_CFG].= base, memmap[K230_DEV_HI_SYS_CFG].size); =20 - create_unimplemented_device("ddrc_cfg", memmap[K230_DEV_DDRC_CFG].base, - memmap[K230_DEV_DDRC_CFG].size); - create_unimplemented_device("flash", memmap[K230_DEV_FLASH].base, memmap[K230_DEV_FLASH].size); } diff --git a/include/hw/riscv/k230.h b/include/hw/riscv/k230.h index 592e1c26bf..80ca16338c 100644 --- a/include/hw/riscv/k230.h +++ b/include/hw/riscv/k230.h @@ -16,6 +16,7 @@ #define HW_K230_H =20 #include "hw/core/boards.h" +#include "hw/misc/k230_ddr.h" #include "hw/riscv/riscv_hart.h" #include "hw/watchdog/k230_wdt.h" =20 @@ -32,6 +33,8 @@ typedef struct K230SoCState { /*< public >*/ RISCVHartArrayState c908_cpu; /* Small core */ =20 + K230DDRCfgState ddr_cfg; + K230DDRPhyState ddr_phy; K230WdtState wdt[2]; MemoryRegion sram; MemoryRegion bootrom; @@ -112,6 +115,7 @@ enum { K230_DEV_SPI, K230_DEV_HI_SYS_CFG, K230_DEV_DDRC_CFG, + K230_DEV_DDR_PHY, K230_DEV_FLASH, K230_DEV_PLIC, K230_DEV_CLINT, --=20 2.53.0 From nobody Sat Jul 25 15:51:59 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=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1784208443; cv=none; d=zohomail.com; s=zohoarc; b=imkTRhC5lPNc8m+3XSRtgG0V53uFXtO5hN/m9ENWomabq2isx8yDX8NN8Rh3gL6/8DUtqU4v4evZYZ3fFJBteaaRVaWQw+GtEpWUrJ6A0wAuG0ZfDbrgrCQgxgWjVfH4pgCmCnmu0y2oxxn5T1ltBnDEvgGWWHM1cbU/OFTNhSw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1784208443; h=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=CvShPGpwKNFXEzFauLDR7uPosp0H+g1u6SP4L/tTglA=; b=Z26J3jVHd7bUxrL+rTNLUsKYFiXJ4YCEjEkvHqO33Wc+MFrNCfJ/cv9PySsO+RNDGO2NtGaY8+LQnjVh1LwL237nd7HSZUambK2QUTa80WE67GkWAz6t+Wr3jmhHbafg95Y1vbmMAyeZkOKRfbHyKTvAqVDb5RRFWGHdR5m02Vw= 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=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1784208443709841.4896192441882; Thu, 16 Jul 2026 06:27:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wkM76-0006ix-Lz; Thu, 16 Jul 2026 09:26:56 -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 1wkM74-0006iI-Ld for qemu-devel@nongnu.org; Thu, 16 Jul 2026 09:26:54 -0400 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wkM72-0005Hi-Er for qemu-devel@nongnu.org; Thu, 16 Jul 2026 09:26:54 -0400 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-2cad85b7b5aso8962275ad.1 for ; Thu, 16 Jul 2026 06:26:52 -0700 (PDT) Received: from DESKTOP-JUS09M1.tail12b54b.ts.net ([38.34.7.236]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-13cd4344b8bsm11336706c88.13.2026.07.16.06.26.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jul 2026 06:26:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784208411; x=1784813211; 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:content-type; bh=CvShPGpwKNFXEzFauLDR7uPosp0H+g1u6SP4L/tTglA=; b=fifAUhFruBZcCqNwHdrklBkoQpdtuNOMhXtMYQ/TdgSIepMVi4nW60bcf8xL9QTveT sYHdELcYWNBXm4XYmgNtcXOdiQY2VeYAYjrFR7Qx6SXNQu94eZ2uqUDEY2/Semp4fHHV VjXseOePUSBdhTETxdW0VpzuFFnrZIMAF1oNfWQvEsHPD3R9NaEMgCT3poVLRvBt6/bQ bw/hFycnMwDXQ0q40KaWfJGZB6+8KpiLjQJnEq340TNC47XWn1dHdJx8pvx+4HA3+jer T6dr4YV3XfaJOrH688lXpGeJ8qwcaf2rUfxd7qrEDqvCK447YC9Y1pb2RQWztVcVTgZU 4nYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784208411; x=1784813211; 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:content-type; bh=CvShPGpwKNFXEzFauLDR7uPosp0H+g1u6SP4L/tTglA=; b=Xl744nkGlQWlQu6ERFiiprwi+WSPLy+fG9GjNHHrCSN6p6HjEnU6US/O0OHPnXZiQF i2jD6lUQqFH7ny9Yc166awyHvtFv8blVma0zYxbDsLX3jajaFCk5kWQpr3w+QpdaHcFE BzwCsG4GWMXaBUpjzsvFWMr8fvbrriqcMkYRrAZvetsOn72wC1kSJyk3GbeS+HHGBLLV mRNOhmgY9nC4IFuNeQG90qqOF0UxBWIwPy873x6OVU55MZJbiK/JUUU5ybEictWdGLBC ESWiwI4gFUBUxDpz6/HBbLTCxDWEn9oYiEUUKTblUiKMMa53dCMgZ/rXFvFYOt1DZhJH OALw== X-Gm-Message-State: AOJu0YyccpgJFCByavvaCZf3hoMJ/JR2+L1JIqLwrKE+EhHFRfIgkDHE EYJj8qJtHVzPc7ZjTDUFLAouxa4nBKMkKCCclxateF1724qCR1yuauGsjw7lT9rz7RF4UA== X-Gm-Gg: AfdE7cnUjTK/TCRbcP9oiCcGw1vEWqh6d1PDyL+5cLCMD586GGofLK/NtMcXci0sIJu kCifGyX26BedSCjEMQte3AlKO9qUG+5tDJa1GFi3QBBggGCvY6EAqcNaILQoOg06I2FMYXeXBfS U8ckE43rI7yetlBgsD/HDnIxM7QnsOxluYSVSiAqqY+sn7WUuEAnNAsvqOoGUrvvnKrr4Tv7Zgp +snNILNKQGNJ8YVaWbx9uFXIRqXi9aXlWrs0/7Njfi+A36WVzhiEy4vwlCpsxfNGJtREQrTchTD nZ49uQCvnZKyOysZE5nlV1RyE3cBPmdZyZ5+jNjDJAqYvtxGMMXLm9YzSVLliWHBvXuDC8qrXDT n32kZoYM0Zo5Ivd2HBkJ9bgJkm4cRBrKMXJwKtovTSYBOhiyvC1ksewPMLxNwkTNQLxabHrLcb6 hHidgFPOM3n+MSxTTv/eOgMzpnCA5/ X-Received: by 2002:a17:903:2b0e:b0:2cc:e3b6:f305 with SMTP id d9443c01a7336-2ce9f038e25mr170767415ad.4.1784208410993; Thu, 16 Jul 2026 06:26:50 -0700 (PDT) From: Junze Cao To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, chao.liu@processmission.com, pierrick.bouvier@oss.qualcomm.com, palmer@dabbelt.com, alistair.francis@wdc.com, liwei1518@gmail.com, daniel.barboza@oss.qualcomm.com, zhiwei_liu@linux.alibaba.com, farosas@suse.de, lvivier@redhat.com, pbonzini@redhat.com, Junze Cao Subject: [PATCH 3/3] tests/qtest: Add K230 DDR controller tests Date: Thu, 16 Jul 2026 21:24:23 +0800 Message-ID: <20260716132423.931427-4-caojunze424@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260716132423.931427-1-caojunze424@gmail.com> References: <20260716132423.931427-1-caojunze424@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2607:f8b0:4864:20::636; envelope-from=caojunze424@gmail.com; helo=mail-pl1-x636.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, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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 @gmail.com) X-ZM-MESSAGEID: 1784208444915158500 Content-Type: text/plain; charset="utf-8" Add qtests for DDRC and PHY reset values, register access policy, the software-update handshake, and PHY register ownership. Exercise PHY training and mailbox acknowledgement through the DFI initialization sequence. Include negative coverage to ensure DFI cannot complete before PHY training or enter Normal mode before completion is enabled. Signed-off-by: Junze Cao Reviewed-by: Daniel Henrique Barboza Suggested-by: Chao Liu --- MAINTAINERS | 1 + tests/qtest/k230-ddr-test.c | 226 ++++++++++++++++++++++++++++++++++++ tests/qtest/meson.build | 3 +- 3 files changed, 229 insertions(+), 1 deletion(-) create mode 100644 tests/qtest/k230-ddr-test.c diff --git a/MAINTAINERS b/MAINTAINERS index 1cb3ef6c02..ace7def55e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1833,6 +1833,7 @@ F: include/hw/misc/k230_ddr.h F: include/hw/riscv/k230.h F: include/hw/watchdog/k230_wdt.h F: tests/functional/riscv64/test_k230.py +F: tests/qtest/k230-ddr-test.c F: tests/qtest/k230-wdt-test.c =20 RX Machines diff --git a/tests/qtest/k230-ddr-test.c b/tests/qtest/k230-ddr-test.c new file mode 100644 index 0000000000..72362929bc --- /dev/null +++ b/tests/qtest/k230-ddr-test.c @@ -0,0 +1,226 @@ +/* + * QTest testcase for the K230 DDR controller and PHY + * + * Exercises register access, reset, PHY ownership, training mailbox, and = DFI + * initialization. + * + * Copyright (c) 2026 Junze Cao + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "libqtest.h" + +#define K230_DDRC_BASE UINT64_C(0x98000000) +#define K230_DDR_PHY_BASE UINT64_C(0x9a000000) + +#define K230_DDRC_MSTR 0x000 +#define K230_DDRC_STAT 0x004 +#define K230_DDRC_DRAMTMG4 0x110 +#define K230_DDRC_DFIMISC 0x1b0 +#define K230_DDRC_DFISTAT 0x1bc +#define K230_DDRC_SWCTL 0x320 +#define K230_DDRC_SWSTAT 0x324 + +#define K230_DDRC_STAT_OPERATING_MODE_MASK 0x7 +#define K230_DDRC_DFISTAT_DFI_INIT_COMPLETE_MASK 0x1 + +#define K230_DDR_PHY_CSR(index) \ + (K230_DDR_PHY_BASE + (uint64_t)(index) * sizeof(uint32_t)) + +#define K230_DDR_PHY_ATX_IMPEDANCE 0x00043 +#define K230_DDR_PHY_TX_IMPEDANCE_CTRL1 0x10049 +#define K230_DDR_PHY_VREF_IN_GLOBAL 0x200b2 +#define K230_DDR_PHY_MICRO_CONT_MUX_SEL 0xd0000 +#define K230_DDR_PHY_TRAINING_STATUS 0xd0004 +#define K230_DDR_PHY_TRAINING_ACK 0xd0031 +#define K230_DDR_PHY_TRAINING_MESSAGE 0xd0032 +#define K230_DDR_PHY_TRAINING_TRIGGER 0xd0099 + +static void complete_phy_training(QTestState *qts) +{ + qtest_writel(qts, + K230_DDR_PHY_CSR(K230_DDR_PHY_MICRO_CONT_MUX_SEL), 1); + qtest_writel(qts, K230_DDR_PHY_CSR(K230_DDR_PHY_TRAINING_TRIGGER), 9); + qtest_writel(qts, K230_DDR_PHY_CSR(K230_DDR_PHY_TRAINING_TRIGGER), 1); + qtest_writel(qts, K230_DDR_PHY_CSR(K230_DDR_PHY_TRAINING_TRIGGER), 0); +} + +static void test_reset_and_register_access(void) +{ + QTestState *qts =3D qtest_init("-machine k230"); + + g_assert_cmphex(qtest_readl(qts, K230_DDRC_BASE + K230_DDRC_MSTR), + =3D=3D, 0x01040000); + g_assert_cmphex(qtest_readl(qts, K230_DDRC_BASE + K230_DDRC_STAT), + =3D=3D, 0x00000000); + g_assert_cmphex(qtest_readl(qts, K230_DDRC_BASE + K230_DDRC_DRAMTMG4), + =3D=3D, 0x05040405); + g_assert_cmphex(qtest_readl(qts, K230_DDRC_BASE + K230_DDRC_DFIMISC), + =3D=3D, 0x00000001); + g_assert_cmphex(qtest_readl(qts, K230_DDRC_BASE + K230_DDRC_SWCTL), + =3D=3D, 0x00000001); + g_assert_cmphex(qtest_readl(qts, K230_DDRC_BASE + K230_DDRC_SWSTAT), + =3D=3D, 0x00000001); + + g_assert_cmphex(qtest_readl(qts, + K230_DDR_PHY_CSR(K230_DDR_PHY_ATX_IMPEDANCE)), + =3D=3D, 0x03ff); + g_assert_cmphex(qtest_readl(qts, + K230_DDR_PHY_CSR(K230_DDR_PHY_TX_IMPEDANCE_CTRL1)), + =3D=3D, 0x0fff); + g_assert_cmphex(qtest_readl(qts, + K230_DDR_PHY_CSR(K230_DDR_PHY_VREF_IN_GLOBAL)), + =3D=3D, 0x0200); + + qtest_writel(qts, K230_DDRC_BASE + K230_DDRC_MSTR, 0x01040008); + g_assert_cmphex(qtest_readl(qts, K230_DDRC_BASE + K230_DDRC_MSTR), + =3D=3D, 0x01040008); + + qtest_writel(qts, K230_DDRC_BASE + K230_DDRC_STAT, 0xffffffff); + g_assert_cmphex(qtest_readl(qts, K230_DDRC_BASE + K230_DDRC_STAT), + =3D=3D, 0x00000000); + + qtest_writel(qts, K230_DDR_PHY_CSR(K230_DDR_PHY_VREF_IN_GLOBAL), + 0xffffffff); + g_assert_cmphex(qtest_readl(qts, + K230_DDR_PHY_CSR(K230_DDR_PHY_VREF_IN_GLOBAL)), + =3D=3D, 0x7fff); + + qtest_writel(qts, K230_DDRC_BASE + K230_DDRC_DRAMTMG4, 0); + + qtest_system_reset(qts); + g_assert_cmphex(qtest_readl(qts, K230_DDRC_BASE + K230_DDRC_MSTR), + =3D=3D, 0x01040000); + g_assert_cmphex(qtest_readl(qts, K230_DDRC_BASE + K230_DDRC_DRAMTMG4), + =3D=3D, 0x05040405); + g_assert_cmphex(qtest_readl(qts, + K230_DDR_PHY_CSR(K230_DDR_PHY_VREF_IN_GLOBAL)), + =3D=3D, 0x0200); + + qtest_quit(qts); +} + +static void test_software_update_handshake(void) +{ + QTestState *qts =3D qtest_init("-machine k230"); + + qtest_writel(qts, K230_DDRC_BASE + K230_DDRC_SWCTL, 0); + g_assert_cmphex(qtest_readl(qts, K230_DDRC_BASE + K230_DDRC_SWSTAT), + =3D=3D, 0); + + qtest_writel(qts, K230_DDRC_BASE + K230_DDRC_SWCTL, 1); + g_assert_cmphex(qtest_readl(qts, K230_DDRC_BASE + K230_DDRC_SWSTAT), + =3D=3D, 1); + + qtest_writel(qts, K230_DDRC_BASE + K230_DDRC_SWSTAT, 0); + g_assert_cmphex(qtest_readl(qts, K230_DDRC_BASE + K230_DDRC_SWSTAT), + =3D=3D, 1); + + qtest_quit(qts); +} + +static void test_phy_ownership(void) +{ + QTestState *qts =3D qtest_init("-machine k230"); + uint64_t atx =3D K230_DDR_PHY_CSR(K230_DDR_PHY_ATX_IMPEDANCE); + uint64_t mux =3D K230_DDR_PHY_CSR(K230_DDR_PHY_MICRO_CONT_MUX_SEL); + + qtest_writel(qts, atx, 0x155); + g_assert_cmphex(qtest_readl(qts, atx), =3D=3D, 0x155); + + qtest_writel(qts, mux, 1); + qtest_writel(qts, atx, 0x2aa); + g_assert_cmphex(qtest_readl(qts, atx), =3D=3D, 0x155); + + qtest_writel(qts, mux, 0); + qtest_writel(qts, atx, 0x2aa); + g_assert_cmphex(qtest_readl(qts, atx), =3D=3D, 0x2aa); + + qtest_quit(qts); +} + +static void test_dfi_prerequisites(void) +{ + QTestState *qts =3D qtest_init("-machine k230"); + + qtest_writel(qts, K230_DDRC_BASE + K230_DDRC_DFIMISC, 0x20); + + g_assert_cmphex(qtest_readl(qts, + K230_DDRC_BASE + K230_DDRC_DFISTAT) & + K230_DDRC_DFISTAT_DFI_INIT_COMPLETE_MASK, + =3D=3D, 0); + g_assert_cmphex(qtest_readl(qts, K230_DDRC_BASE + K230_DDRC_STAT) & + K230_DDRC_STAT_OPERATING_MODE_MASK, + =3D=3D, 0); + + qtest_quit(qts); +} + +static void test_dfi_complete_enable(void) +{ + QTestState *qts =3D qtest_init("-machine k230"); + + complete_phy_training(qts); + qtest_writel(qts, K230_DDRC_BASE + K230_DDRC_DFIMISC, 0x20); + + g_assert_cmphex(qtest_readl(qts, + K230_DDRC_BASE + K230_DDRC_DFISTAT) & + K230_DDRC_DFISTAT_DFI_INIT_COMPLETE_MASK, + =3D=3D, 1); + g_assert_cmphex(qtest_readl(qts, K230_DDRC_BASE + K230_DDRC_STAT) & + K230_DDRC_STAT_OPERATING_MODE_MASK, + =3D=3D, 0); + + qtest_quit(qts); +} + +static void test_training_and_dfi_handshake(void) +{ + QTestState *qts =3D qtest_init("-machine k230"); + + complete_phy_training(qts); + + g_assert_cmphex(qtest_readl(qts, + K230_DDR_PHY_CSR(K230_DDR_PHY_TRAINING_STATUS)), + =3D=3D, 0); + g_assert_cmphex(qtest_readl(qts, + K230_DDR_PHY_CSR(K230_DDR_PHY_TRAINING_MESSAGE)), + =3D=3D, 0x07); + + qtest_writel(qts, K230_DDR_PHY_CSR(K230_DDR_PHY_TRAINING_ACK), 0); + g_assert_cmphex(qtest_readl(qts, + K230_DDR_PHY_CSR(K230_DDR_PHY_TRAINING_STATUS)), + =3D=3D, 1); + qtest_writel(qts, K230_DDR_PHY_CSR(K230_DDR_PHY_TRAINING_ACK), 1); + + qtest_writel(qts, K230_DDRC_BASE + K230_DDRC_DFIMISC, 0x20); + g_assert_cmphex(qtest_readl(qts, K230_DDRC_BASE + K230_DDRC_DFISTAT), + =3D=3D, 1); + + qtest_writel(qts, K230_DDRC_BASE + K230_DDRC_DFIMISC, 0); + qtest_writel(qts, K230_DDRC_BASE + K230_DDRC_DFIMISC, 1); + g_assert_cmphex(qtest_readl(qts, K230_DDRC_BASE + K230_DDRC_STAT) & 0x= 7, + =3D=3D, 1); + + qtest_quit(qts); +} + +int main(int argc, char **argv) +{ + g_test_init(&argc, &argv, NULL); + + qtest_add_func("/k230-ddr/reset-and-register-access", + test_reset_and_register_access); + qtest_add_func("/k230-ddr/software-update-handshake", + test_software_update_handshake); + qtest_add_func("/k230-ddr/phy-ownership", test_phy_ownership); + qtest_add_func("/k230-ddr/dfi-prerequisites", test_dfi_prerequisites); + qtest_add_func("/k230-ddr/dfi-complete-enable", + test_dfi_complete_enable); + qtest_add_func("/k230-ddr/training-and-dfi-handshake", + test_training_and_dfi_handshake); + + return g_test_run(); +} diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index 56ff860e21..dc110f72c8 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -297,7 +297,8 @@ qtests_riscv64 =3D ['riscv-csr-test'] + \ (config_all_devices.has_key('CONFIG_IOMMU_TESTDEV') and config_all_devices.has_key('CONFIG_RISCV_IOMMU') ? ['iommu-riscv-test'] : []) + \ - (config_all_devices.has_key('CONFIG_K230') ? ['k230-wdt-test'] : []) + (config_all_devices.has_key('CONFIG_K230') ? + ['k230-ddr-test', 'k230-wdt-test'] : []) =20 qtests_hexagon =3D ['boot-serial-test'] =20 --=20 2.53.0