From nobody Thu Aug 27 01:43:47 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=1779408602; cv=none; d=zohomail.com; s=zohoarc; b=OjvLpt6omhcdgHo79FMoMmy4kZlLn/as7Mx/9ZstZIOgu+fMTCyTmebXt+Yduv0QYQ8uS3EBURC5QRKQgEMJMkhUzgpBjaxSvwqMv+rTv2G4THU4aPq3aFl2pJ3/Gih2c1eVO1psCj7K2nDX1/CuLzwvsV81g5QK6PeSjZxoIvw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779408602; 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=ewB7oe34ttDo/ekIA9n4ViclSINjIlgVsppzFfFe5RA=; b=dYR676bofub2DZvZ9cA8dcQRSjh5nF109JOyDOgrBwEcumrozVvz0CJLvw6bfxXLLCATuedVf9jHLjPmKS9pTCWz5kyqCNP+4eZE994N3encZYZ8SqEQFi/jJOUXQIzHYlTyNSrPhUnJ192shGxYZzNUzbQCnXYxpT/LCYPY+O4= 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 1779408602560993.9381094016156; Thu, 21 May 2026 17:10:02 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wQDRC-0007E1-Gj; Thu, 21 May 2026 20:08:26 -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 1wQDOx-0003Sd-DP for qemu-devel@nongnu.org; Thu, 21 May 2026 20:06:09 -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 1wQDOu-0004sD-1k for qemu-devel@nongnu.org; Thu, 21 May 2026 20:06:06 -0400 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-2ba4a1a0325so42797845ad.0 for ; Thu, 21 May 2026 17:06:02 -0700 (PDT) Received: from toolbx.alistair23.me ([2403:581e:fdf9:0:6209:4521:6813:45b7]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2beb114b54csm3915475ad.42.2026.05.21.17.05.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 May 2026 17:06:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779408361; x=1780013161; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ewB7oe34ttDo/ekIA9n4ViclSINjIlgVsppzFfFe5RA=; b=E42JAlVg0b+2M9vMDFOkY3awQ93uI6DvXCPlpwPGbyj2b7FnvOCljWCePY9FgoZNSc t/bXPPbyp5mPk0sbjwnAsnRnUZkndo77BMqDArc/iI9VInvyFIglSkXNqegDgParddTc KtHa8p5NeIsYkND5bOLIW3iYapv/q/UrtV7/QOQBwMToWmjMeCbNT8witAA01XhLsjea HhNgMyrvyQSXiqzwRw6MhgbsXAMr9cEmuchbkqVw4lhSxbs1v0K2Sz9DpeGzjr1uSNQz AM87CtZJbkDyA0k6cbRpiIUZK7cLzvVwXSbSDseOzRDpAISxmQn+F3YQC90QQX/UkTwy C4ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779408361; x=1780013161; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ewB7oe34ttDo/ekIA9n4ViclSINjIlgVsppzFfFe5RA=; b=MsQs2cw+vd0UUivB9f/9tk0cjona2n3alrX//yPFYFzm0JEkUnNjDYydhotWuncBw7 6leJfVnrFs9qDD6wJbg82bUwQOSer6IaeXrGrROsz0jofy2Re8ct871LpMz6kaO0A4Hq M5WwuDLEhppb6F1vtzceqiie+NKxCfpN/KIrteQXWbvVewoAz9L5fJnu+SBda1+jkamZ OtKFBhvcoWOsnOCr7MXmn1pUJ04kw/6173Oi4sCF1WPRpA7RidUEYIPk/548B/aEYsmY IcISqWd92IvG9Zlr9ROOY7J0zCs+wPNCLTckiwOugr8pYm7L6PzHBi9uomudVgHwoRMY kubw== X-Gm-Message-State: AOJu0Ywas/y31rxw9fJHzzRkU3XNp9PMQKiA6VEA16n/rQeriUIG/QaM 7anlqkGeHdRuP/tJtcjCDfCvtdzKPpoQPxKkK+xOnq8Gfo1d3Zrh1PbIcdph3K9+ X-Gm-Gg: Acq92OEeAxmOYyr/rGEsC9hbD2Yq2Hhc0M3RH3QDGkfZpLxkHBnu2IM9FCvEnBUFiOu klcksusbNnKYL1s5zJPy4U8QKoKJFqPE/7QQsZ7ZfgIeVhZLiwW3sXu7dPJo2oj0hs/kd505jew 0jvpfDoAWY8eAJ42jxFOnUnEAJXijL5SXl/zjLyxWNkd1c7cSwZB1BD73jhJDtPAbu8MLPYAPjx VMM3YHqugLNUqYBV+KsNlU08KnCyEnr9LMMbt0hz09eINcJEYC/0lYQPbyjAzWsIJa4Vo3C1D3O p6Nb9NyWHkQA+twRZiwh77kfTXvr9v6Dtrs++xIgvTbjS2QotY4AbaSkLctmYV0Mi2Xez6FvOGQ zer9FBNgqGHQ6Mn8SkTfl5RSAR6T//0zoeMfD+I87fbwCeOKUD8wZPiu74/N4wqPzFZ4+2VTKGr Xb3Ta4La/xMN+KR5kNxpPHEx5AygbMcHw34bFRFyrdCg== X-Received: by 2002:a17:902:f70e:b0:2bc:8ebd:af76 with SMTP id d9443c01a7336-2beb03466afmr11280675ad.0.1779408361226; Thu, 21 May 2026 17:06:01 -0700 (PDT) From: alistair23@gmail.com X-Google-Original-From: alistair.francis@wdc.com To: qemu-devel@nongnu.org Cc: alistair23@gmail.com, Jim Shu , "Fea.Wang" , Daniel Henrique Barboza , Alistair Francis Subject: [PULL 45/48] hw/intc: riscv_aplic: Add reset API to APLIC Date: Fri, 22 May 2026 10:03:21 +1000 Message-ID: <20260522000324.23255-46-alistair.francis@wdc.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260522000324.23255-1-alistair.francis@wdc.com> References: <20260522000324.23255-1-alistair.francis@wdc.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=alistair23@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=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: 1779408605146154100 Content-Type: text/plain; charset="utf-8" From: Jim Shu Clearing APLIC registers and qemu_irq in the reset function Signed-off-by: Jim Shu Signed-off-by: Fea.Wang Reviewed-by: Daniel Henrique Barboza Message-ID: <20260428160103.3551125-3-jim.shu@sifive.com> Signed-off-by: Alistair Francis --- hw/intc/riscv_aplic.c | 45 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 40 insertions(+), 5 deletions(-) diff --git a/hw/intc/riscv_aplic.c b/hw/intc/riscv_aplic.c index 791e0b01b9..a04e0e1a89 100644 --- a/hw/intc/riscv_aplic.c +++ b/hw/intc/riscv_aplic.c @@ -892,6 +892,44 @@ static const MemoryRegionOps riscv_aplic_ops =3D { } }; =20 +static void riscv_aplic_reset_enter(Object *obj, ResetType type) +{ + RISCVAPLICState *aplic =3D RISCV_APLIC(obj); + int i; + + aplic->domaincfg =3D 0; + memset(aplic->sourcecfg, 0, sizeof(uint32_t) * aplic->num_irqs); + memset(aplic->target, 0, sizeof(uint32_t) * aplic->num_irqs); + if (!aplic->msimode) { + for (i =3D 0; i < aplic->num_irqs; i++) { + aplic->target[i] =3D 1; + } + } + + for (i =3D 0; i < aplic->num_irqs ; i++) { + riscv_aplic_set_enabled_raw(aplic, i, false); + } + + /* Need to unlock [ms]msicfgaddrh.L */ + aplic->mmsicfgaddr =3D 0; + aplic->mmsicfgaddrH =3D 0; + aplic->smsicfgaddr =3D 0; + aplic->smsicfgaddrH =3D 0; + + if (!aplic->msimode) { + /* Reset IDC registers only in non-MSI mode */ + for (i =3D 0; i < aplic->num_harts; i++) { + aplic->idelivery[i] =3D 0; + aplic->iforce[i] =3D 0; + aplic->ithreshold[i] =3D 0; + } + + for (i =3D 0; i < aplic->num_harts; i++) { + qemu_irq_lower(aplic->external_irqs[i]); + } + } +} + static void riscv_aplic_realize(DeviceState *dev, Error **errp) { uint32_t i; @@ -925,11 +963,6 @@ static void riscv_aplic_realize(DeviceState *dev, Erro= r **errp) aplic->sourcecfg =3D g_new0(uint32_t, aplic->num_irqs); aplic->state =3D g_new0(uint32_t, aplic->num_irqs); aplic->target =3D g_new0(uint32_t, aplic->num_irqs); - if (!aplic->msimode) { - for (i =3D 0; i < aplic->num_irqs; i++) { - aplic->target[i] =3D 1; - } - } aplic->idelivery =3D g_new0(uint32_t, aplic->num_harts); aplic->iforce =3D g_new0(uint32_t, aplic->num_harts); aplic->ithreshold =3D g_new0(uint32_t, aplic->num_harts); @@ -1014,9 +1047,11 @@ static const VMStateDescription vmstate_riscv_aplic = =3D { static void riscv_aplic_class_init(ObjectClass *klass, const void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); + ResettableClass *rc =3D RESETTABLE_CLASS(klass); =20 device_class_set_props(dc, riscv_aplic_properties); dc->realize =3D riscv_aplic_realize; + rc->phases.enter =3D riscv_aplic_reset_enter; dc->vmsd =3D &vmstate_riscv_aplic; } =20 --=20 2.53.0