From nobody Mon Sep 28 01:15:05 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=1786098202; cv=none; d=zohomail.com; s=zohoarc; b=VkYO6JzjTWvlyn/o8af1CP32W45m6IyARl5zXhO1ZzLDp7JI84PlwlAfimt5rB4RZjt75j7P9z0xui8J/qCMeQYEZsIl8MaKOJS29Eq3k6rSjM5QcYrmJl7WGTvzk7cR7nEqYoaAoOWX2hAKHYHG/4JUsk08DnEWUCz6acYSJmc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1786098202; 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=zrJdRbzEGvrJ9gAaG85uTJQ2zx9w5ggPCpDcihPIboo=; b=gR2qAWTt6LQp2pJMk6WN/gYKRXGvufiYS7xIljdhgrzqLTV9SEX4ZgwE8hjsHkuD4kgyqwXtbeQsfZSlqKvndy6gud6RQYl+I3zcWcyRp7lG/maUMZKjw2LDyopZfxg2H9zKyFjHBFrEGquHeWKsuCqhuBabF8omDAG2fdaXIoE= 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 1786098202696989.249210227598; Fri, 7 Aug 2026 03:23:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wsHip-0002cs-Dp; Fri, 07 Aug 2026 06:22:39 -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 1wsHin-0002c4-Fs for qemu-devel@nongnu.org; Fri, 07 Aug 2026 06:22:37 -0400 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wsHik-0006gz-P8 for qemu-devel@nongnu.org; Fri, 07 Aug 2026 06:22:37 -0400 Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-2cc8311c6ddso3746145ad.0 for ; Fri, 07 Aug 2026 03:22:34 -0700 (PDT) Received: from [127.0.0.1] ([38.34.7.236]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-315be86d3fcsm6158337eec.4.2026.08.07.03.22.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Aug 2026 03:22:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786098153; x=1786702953; darn=nongnu.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=zrJdRbzEGvrJ9gAaG85uTJQ2zx9w5ggPCpDcihPIboo=; b=HMhktjBbJxXg7gDzZLWd0bEz2MmE+CmGJ02C2BzE4a5yK+st/dcLbVknbi64bhWfbR 45TUGKGriQJbETq4oQuAxVm7r8OrBXO31/Nmfzfswy14wfqfVDw/LZhNi6viZfpDYHo0 U8z7YNmWSp90gzUyl576fZb6tRTGhKzM4BellwAAfIzmiUz4Yf286cOp7NwXSBDD8CDn DY6YVt30jThEaxTH6ogc2CZCuuWjbw8NIBgJZl20xdlQpDkAH2x6u4kpoep1TQjq22lx aIT4F/jJ49ULqfO6EyAZYQ9gJ/eEe27Ph0wHleVZN5loBChiz8PWTR2mDVREFN5r8bSy fTog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786098153; x=1786702953; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=zrJdRbzEGvrJ9gAaG85uTJQ2zx9w5ggPCpDcihPIboo=; b=Dk2RxHv1dSKPV3WBq8H8wXWv7KH+HRAvCoRteCN6y3BIOBrDTI9LbDekG872GHFNtV lLgAlT+EuOxYNDJNOIPq9PIptSg3/jarsyJQnKnZ3AjkVi0bbIEP00a8saWaoniVEzXZ 4xEgmGVlOHJWKeozTHIadLs7n7aBLHvQ8SzHHtnV+Z4sLb5zvTlhrr8K3jaOQPzBjf+R vF4yAM1ZdeiLt6Gw+Mhe8kTLWVcxV1p8Mvrxk9rEZfvkgv7GKa6IQtb21O6xEDdf1snd xyeHuPalrC6QbCYoJw/aG/icy9zWWMeM1cnzCKloEKkU5hfJp0P3pZEAyjmAST0cH6b+ Zv0w== X-Gm-Message-State: AOJu0YyifWqvLeJD0OXbm4cRiRN9uxHDsws0a6i0JcZJISh1cwFEoqQU 7/ezUnAorguSg0HQrQE3nTueuvBS+TJbvGrRoWIblTLBgD5+pWmybHSa X-Gm-Gg: AR+sD12K5aKAiMPxPgoZwkhH1ztC+eUuD3ktF5dR2PgayJEmGaNoi1bPv3QQmjz5+QW pM81xdJgaE5VRTs//MdAwfvu0wxWeNiVPG21wznepouDqO86zgDHZd5sqUcYVhrfA92Hyf6F1D2 +XYZdryClxoqCoZNcedcMNM4/SwU/jCD2wW7w9zK9je2jTbDPV5aR1xv+fck+LXD5ucapux+dXn W+8/AXe/c7CjQ/le38nxp/2aAwnpuTBgokJ+mLfo1XfqRL/bHwaUMYy2dltuVaPMj7HDcrbGL6o axxSpS/KyM7ppmzOneqNWUmr5UkNfZ2Is+V3aF9sc26iDzuaWfXImM0Bb/CybTRkBoCzSOrzUaM w1Qt2hjSn81SmD8QVvdnIUyPeMibRfDNViTeZKPEdKFE7H5kqYChWVfc3r4WTNruOIUzzAcd+4q 2PorZWCCwTqmisiT6V2ivNS7M09xdG9mLWkX6qJZslab2cF2Dzo3OXNIwAOw== X-Received: by 2002:a17:902:ec8a:b0:2c9:ed4a:c3a4 with SMTP id d9443c01a7336-2d0ca1658f2mr190987935ad.0.1786098153432; Fri, 07 Aug 2026 03:22:33 -0700 (PDT) From: Junze Cao Date: Fri, 07 Aug 2026 18:21:16 +0800 Subject: [PATCH v2 1/3] hw/misc: Add K230 DDR controller and PHY models MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260807-k230-ddr-v2-v2-1-c531308ae819@gmail.com> References: <20260807-k230-ddr-v2-v2-0-c531308ae819@gmail.com> In-Reply-To: <20260807-k230-ddr-v2-v2-0-c531308ae819@gmail.com> To: qemu-devel@nongnu.org Cc: Chao Liu , qemu-riscv@nongnu.org, Pierrick Bouvier , Palmer Dabbelt , Alistair Francis , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , Fabiano Rosas , Laurent Vivier , Paolo Bonzini , Junze Cao X-Mailer: b4 0.15.2 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::632; envelope-from=caojunze424@gmail.com; helo=mail-pl1-x632.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: 1786098206041158500 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 Suggested-by: Chao Liu Reviewed-by: Daniel Henrique Barboza --- MAINTAINERS | 2 + hw/misc/k230_ddr.c | 556 +++++++++++++++++++++++++++++++++++++++++= ++++ hw/misc/meson.build | 1 + include/hw/misc/k230_ddr.h | 59 +++++ 4 files changed, 618 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 902db77218..f12728ff47 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1827,8 +1827,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..dac700b201 --- /dev/null +++ b/hw/misc/k230_ddr.c @@ -0,0 +1,556 @@ +/* + * 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/log.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]; + } else { + qemu_log_mask(LOG_UNIMP, + "%s: unimplemented DDR PHY read at offset 0x%" + HWADDR_PRIx ", returning 0\n", + __func__, addr); + } + 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); + return; + } + + qemu_log_mask(LOG_UNIMP, + "%s: unimplemented DDR PHY write at offset 0x%" + HWADDR_PRIx ", value 0x%" PRIx64 "\n", + __func__, addr, value); +} + +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 Mon Sep 28 01:15:05 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=1786098250; cv=none; d=zohomail.com; s=zohoarc; b=QF+gHneyQCsWT2qH8B57/sTCGJNI7IoVuGvBYfaY5V4e+pIpu20XHQJCl0gjaPWdqp5jM3k6Nib8QVswqu+ldsr+WzgNSnOTPHJWmwqDlysN7JbWuvZK8Ws6uyem2heLNeNLbkNS8d69x4jaYofG1nEY2jXVC66SfOVdQiKB9Bs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1786098250; 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=ZN5jp+bb/UoI7I0sY1cKfqGk82YmhPmpHjZV2tsLJIo=; b=NqUy3avMKHYCncFnsjHl3TBZY4OeqwctpXZtZpT0imlFzddTyaAK6NpjzEIeGTiU0nrskJFZFprXtsLd5HQGIut0eq+aAIg3Iu8LLbF6qQR556mHPUhkhfLpWZrsROb4m9gaZiYGv6tN7aVbi8NAOogY2jjOKyavXmhiibctr2I= 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 1786098250132557.6518066665949; Fri, 7 Aug 2026 03:24:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wsHis-0002dg-K6; Fri, 07 Aug 2026 06:22:42 -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 1wsHiq-0002cx-8S for qemu-devel@nongnu.org; Fri, 07 Aug 2026 06:22:40 -0400 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wsHio-0006hT-Hk for qemu-devel@nongnu.org; Fri, 07 Aug 2026 06:22:40 -0400 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-2cffd93cdedso3351345ad.3 for ; Fri, 07 Aug 2026 03:22:38 -0700 (PDT) Received: from [127.0.0.1] ([38.34.7.236]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-315be86d3fcsm6158337eec.4.2026.08.07.03.22.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Aug 2026 03:22:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786098157; x=1786702957; darn=nongnu.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=ZN5jp+bb/UoI7I0sY1cKfqGk82YmhPmpHjZV2tsLJIo=; b=lHRSMWHXLXqweDchvE5Zp4AzZWPrU0MawCEksb5ndUdEsCAcKxvTitc/5gcOvsmUxx /8duZaVPQNqO5cRM3GVBZsQqkP/lIYGkR8G7TL4yGz1B/kmiwkyyGECku8dg3ps6vveZ 8VkC8XYmrzVtpis04A6Dd+OHfWUk0NghevLJ0pb39IyDVlwnz91jPSxeE+VymlPqNNB1 vBE8rP4MRuMPHvQX2FNedxantCtXTlrHJG7ZBQc3M+UZFL8tzr3Ry4DLn3lFQCyMXuLm tqvGpyhYlUC2kxhIWvxG7zDU5itFRteRYc4f3TZHaOe96xhnyobMvyCRR863st8BNIdi HQCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786098157; x=1786702957; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=ZN5jp+bb/UoI7I0sY1cKfqGk82YmhPmpHjZV2tsLJIo=; b=qTUL9SNnBR+H44BKLJhNuGrkMl9f4mTOdFh7n9KpNN81Tiit1liNLyOHqetiKt12G4 yKMNWjby0BYZszO0yxbhiFp9cBzuq378UV6NaD5btVp9Of8K3j0OHyrjmMrKwBlqACvs MhUT8u7qNGcG0TI4YTtVsT72scns8dYdV5Vbx4YHMneN80fSWQgUuH32gDjwi1G927rq +0Qi+VL6sG4mF3tr8MknKxv/3P/8smmweV1f4gF+FYuMv+XL8nJERyYniBNQuTPiWNQF OriRzQV3SGO1d9QIoNcSBw8MQq3wngjk2W2Xnsc1z3vJSXki6pRKo2wOMAzPEJpf8GSq ilPA== X-Gm-Message-State: AOJu0YyakrUlIUeLPkhU2Esl5GIwaAHfsmqaM9JHSrRog/BNYrk4nwCv 66Nd4HN4nVgiSarZWiP9AqKC/g20OPGo5j5d6oeU9X3M+5qudkETNurY X-Gm-Gg: AR+sD13m9oLOtrYXevXG99sYlU5fhOXYvISJ2Uu7MDbxPWXfVseM2q+i1ft5cxBAnCy PNlfjqnd3R29QlhnccfIObdcn7lMvyZMy0AFKG5pfjmjImtKAJzfUJ5cOZpwesAx7/u8kWagqtR slui37UG5bhwUGqXGY2NRsXUaOfftuk8h7cxy47/bQjfiwWQfbeFx9Z6SK1u5Bru0SN23PftTPz mU04ocy1DeHMahb/wBbp1u49gBapbcWucZocxEusGU4fbCanmAFlMru/wA+LHM5hk1z6MG/9DfM urDF5bpZTSdKSiVLQCL81aD+054XwZgCLhN8jBFD2fvF4/jHEVu5i6UwGRnMvHKWGW98Lmf4/s/ Fa02+5d3hvbMxMNygzQl96dqi6qFi/fyaMOBlHdYS1F3dlUtUuASnC7xQKn4wD4xPvjkYoXOYjA IITh1ia6AwdhF4C0Ei10ui9GJy4j5Uw9/K9zVjkzRmhK2AzVgSU7Wskx7ibQ== X-Received: by 2002:a17:903:1b2b:b0:2ca:ecf6:9115 with SMTP id d9443c01a7336-2d0caa9bb8bmr183156455ad.2.1786098157187; Fri, 07 Aug 2026 03:22:37 -0700 (PDT) From: Junze Cao Date: Fri, 07 Aug 2026 18:21:17 +0800 Subject: [PATCH v2 2/3] hw/riscv: Connect K230 DDR controller and PHY models MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260807-k230-ddr-v2-v2-2-c531308ae819@gmail.com> References: <20260807-k230-ddr-v2-v2-0-c531308ae819@gmail.com> In-Reply-To: <20260807-k230-ddr-v2-v2-0-c531308ae819@gmail.com> To: qemu-devel@nongnu.org Cc: Chao Liu , qemu-riscv@nongnu.org, Pierrick Bouvier , Palmer Dabbelt , Alistair Francis , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , Fabiano Rosas , Laurent Vivier , Paolo Bonzini , Junze Cao X-Mailer: b4 0.15.2 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::62d; envelope-from=caojunze424@gmail.com; helo=mail-pl1-x62d.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: 1786098253678158500 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. Suggested-by: Chao Liu Reviewed-by: Daniel Henrique Barboza Signed-off-by: Junze Cao --- 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 Mon Sep 28 01:15:05 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=1786098220; cv=none; d=zohomail.com; s=zohoarc; b=fOSiEbA+MfRQxsLKNqyGUtzU6HM17t0Euj4Ioc7i5LAPgLLG/drJrq7YH0lP/c3SOOpK2a488PxOPdM6zvUAYalbRKiKbvvWAHMyncd/eQwCpMcSlbNUjkBa8KBg9FLQwiW5hF26sgzzdk1d001+DannX5zc2tGEayA+cjm1YGg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1786098220; 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=TwplKdyrp1SNw2uTkoOz6zBC6XTehcOPz4L69a33/PY=; b=ljV53LbUHrhLOvyAOZUQfhtc+l95VwSfs0uOtQa6YbCI379lv8UUmbvP9FEydi4Gi2CjfnYArawoMO2Q57Je8A/jkz22K0YpiSyvlKukM+rF719o8C0DSoCO82z8aLdQcJSRd6qHtdzZc6sNoCgsnVvMzIqDOqdfRjZ1XTsVlPI= 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 1786098220723490.5436582282201; Fri, 7 Aug 2026 03:23:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wsHiw-0002el-ID; Fri, 07 Aug 2026 06:22:46 -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 1wsHiu-0002dt-L0 for qemu-devel@nongnu.org; Fri, 07 Aug 2026 06:22:44 -0400 Received: from mail-pl1-x633.google.com ([2607:f8b0:4864:20::633]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wsHis-0006hy-JB for qemu-devel@nongnu.org; Fri, 07 Aug 2026 06:22:44 -0400 Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-2cad68425a7so3756255ad.1 for ; Fri, 07 Aug 2026 03:22:42 -0700 (PDT) Received: from [127.0.0.1] ([38.34.7.236]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-315be86d3fcsm6158337eec.4.2026.08.07.03.22.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Aug 2026 03:22:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786098161; x=1786702961; darn=nongnu.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=TwplKdyrp1SNw2uTkoOz6zBC6XTehcOPz4L69a33/PY=; b=SzJcM3OaQu5KcybLrYOJ6WZlQ4gjneoXqXbTJCaVFEuEuPoXQ64vaDGJiVZeeBVILi knDf40Gh8OqZk9FruKfoQJpiBILiuZjrvyvEgs3dO73f1qxVHeRMnmUJeT3ok+YuE8zW vJn2nYjij9Krij/b4j6P3vxQFIP8qj3uIzIPts/IcOhc+k8UcXuAtwQ5mOZzhsk+Qzlf 8OhEL50BvGkaR4A5T81iLB6CCGtQgUWrQYph2Ps6kFur6c1YG84zHMBEujgHGhXb67Hu 2aBTXEJC/JbaQD7qUxzKi//VcI5L/Hb6+MkUk7IpLQk573tQnx0CRmSzE6dierk9Rpo5 1WJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786098161; x=1786702961; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=TwplKdyrp1SNw2uTkoOz6zBC6XTehcOPz4L69a33/PY=; b=hGmelcZT8e69VKUZkBtSqrRXT8/a251h+tZXVSaxlQLga6WZogKTPF6c06m28CE7Ko gcmG15dEhqVmDvloCFuOedX5IVvH3hSm4x+Fe1mgv4xjDmJ3bqnpawbm629LZkU9bEh9 Pk+Z1uFlip2pEumcHZ+gQ0ZXcG21plxtlI1rbmknBUw16h6Q3C2PJLT5HxotxrxgpqyD h+rLyT4WEAjaTa4Fot3rC1gFkrrByYB1ZabEgX8xj7dDHgQd7uBwjny1QMnmsbidh0mq +Qpvqvdeo7jsyqurJOutvUNAznkuL1OiFGR8m4y2f8QO/xkdgaDhgpQ/51IGCBm/dWLN zFCA== X-Gm-Message-State: AOJu0Yxo/EwC2JqrnTjxiDEQ84GK7sfvJET3zKDVfg7NX8bC7rKMdNOS M6ehGuOJf30TEFrVGFZMdzEC+tmLrL2OAJT/IgRtkY5IfXMtedaaoOik X-Gm-Gg: AR+sD13MPkoyw70ZUVDfpg4ZEaj6Q6poEgyqHkyY2wLVBcJyrNv3z3mFE0/2Cdxbu36 bAtB7x+85zIzGhJflzTYqssfucknjeAPIwKcBsVMqtc5x0UBi/ZqflHt6W0LkTC5pZCWcwkMwTi w6zxQdFTLZ5ttgr7cqh5zgDTuE4lp2ms6BXXxlHHeMPWkEx2/IWwqptLFZHk9W3USEftY7PoZq6 CQPEHx1UbnHpd4tNk1uZ3KKhMQAuyB/2u2DvyEAuUc1GPK7T0ffJKHTYR7zh4eHgRssxUPLDwJp aN1knddFuvW5Ngp0fKzeXMozPNMVZZG+XTHTukzQ/xufUG5IV/jbVEinDz0HgNyeCpDOJWuuyAD jGpc0XRiLnNjTWu4ZN6O4mWy/MjeEkvrQGqnFaDwk9s3j3G3XDaAdt20bh/lGWZALZxHGDQSPHL faqSYn/l0TIrgTG7ml4VOqBduX6DaKV8YZY2huTJ2A7x7VNmelts061gd7LQRX+uLQAmqf X-Received: by 2002:a17:903:32c9:b0:2c4:397:dd7a with SMTP id d9443c01a7336-2d0caa4978fmr155587445ad.4.1786098160989; Fri, 07 Aug 2026 03:22:40 -0700 (PDT) From: Junze Cao Date: Fri, 07 Aug 2026 18:21:18 +0800 Subject: [PATCH v2 3/3] tests/qtest: Add K230 DDR controller tests MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260807-k230-ddr-v2-v2-3-c531308ae819@gmail.com> References: <20260807-k230-ddr-v2-v2-0-c531308ae819@gmail.com> In-Reply-To: <20260807-k230-ddr-v2-v2-0-c531308ae819@gmail.com> To: qemu-devel@nongnu.org Cc: Chao Liu , qemu-riscv@nongnu.org, Pierrick Bouvier , Palmer Dabbelt , Alistair Francis , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , Fabiano Rosas , Laurent Vivier , Paolo Bonzini , Junze Cao X-Mailer: b4 0.15.2 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::633; envelope-from=caojunze424@gmail.com; helo=mail-pl1-x633.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: 1786098221659158500 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. Reviewed-by: Daniel Henrique Barboza Suggested-by: Chao Liu Signed-off-by: Junze Cao --- MAINTAINERS | 1 + tests/qtest/k230-ddr-test.c | 226 ++++++++++++++++++++++++++++++++++++++++= ++++ tests/qtest/meson.build | 3 +- 3 files changed, 229 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index f12728ff47..cf764b2efc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1834,6 +1834,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