From nobody Thu Dec 18 14:12:17 2025 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1752240921; cv=none; d=zohomail.com; s=zohoarc; b=jZOwsTu0BgzP11eeB0ehVeNmjSCVqk41RAjxrFdnQLC1EEwF1uu2i2Id8nGuU6G59bCQgW05qeDa/UsP75IWSRyRBCaGZ6Pu4nBiZgzOetJ30L4wdw/ioiNZxoxtWSoaweRNwuZm7o/ED+ckQcXaU5XfLSgosfhq24pMUAeiQKs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752240921; h=Content-Transfer-Encoding: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:Cc; bh=DcshZRdHA+R2F5c57grtYhzclejkjBGcvQNzRFYXK7E=; b=kdJzBBhO9lUdCLyjN/X+YY5Ph+yvy7f1EAHCUtq6CbIYuEacyS0aheMGvKBNVIj3hDs/ooCExpCR6i39V2QrnwB3SRolLlrzToq2bXYDaa3F2ICaSnIynVgDZ3UbD6jvNTw0OZk1CDeuPkeg5b9rObLoOS/3845WGzMJHGc17Jo= 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 lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1752240921312291.8186482220581; Fri, 11 Jul 2025 06:35:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uaDtk-0004Nr-2l; Fri, 11 Jul 2025 09:34:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uaDte-0004MH-P1 for qemu-devel@nongnu.org; Fri, 11 Jul 2025 09:34:39 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uaDtc-0002wT-EX for qemu-devel@nongnu.org; Fri, 11 Jul 2025 09:34:38 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-4537deebb01so11863515e9.0 for ; Fri, 11 Jul 2025 06:34:36 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-454d50df0cdsm89734145e9.25.2025.07.11.06.34.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Jul 2025 06:34:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1752240875; x=1752845675; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=DcshZRdHA+R2F5c57grtYhzclejkjBGcvQNzRFYXK7E=; b=n6+C4eqaEDaHZHSCHXFp0IO3+isVBteTQlrRaEPhnkbWAB2U+BY8hyS3UKnMHKWNxf gEUlVxjds/lGubBMeRIe4pnZKzsKNjvLyBzm3JazzeomOUFxam8dwkObacW0JQeO46oi XrMJVwyoT0s+uFVHErZur9gbEFilojOn17gcoJuJGpaqtRFp5+58TjOj4cdOKVx6ga28 /aFchE/umJnXYbW53xRDp4teBlUC3FiG+ZbxtxIefcgjQTNHlW/fP+A/g8JvgMcxT1Zj 3PBbxzaKGG6TVWf06KGnklM2SyQ+RB5tcGkdlrLoB/GV6ccNviIm+/C11Uh/dzBGjEk5 JZgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752240875; x=1752845675; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DcshZRdHA+R2F5c57grtYhzclejkjBGcvQNzRFYXK7E=; b=IrOTga+g9gHQqiN5gY39ddk9hVrvyHgHMMCuuG3XqRcExOovucgMR/u0qfitHzX8V+ qfksxVGJ9nVjG4U+xyeqY/cG4OllIuDJQMV2JhR4jkNQW7l6KpczmnFD9u6kjwS502re nogn3/lXn1vDZgzoSDqCUZ9tlMjDBl6FZaVKepn096pPOS7gjI8JGqiAWPL/WC54LLuf DulTEHZBCY7TS8YIMLAg6dsjr0errqCC6oI4q8rkZBBHTgqOuc8yokaiS/Qa2Zz5P8jN /B4rgSALv8DsUstZAiq88BcCzr86lUPVYeSqGb5dL7LfLarBbXqA01e1cevPl3aHZGhb eZqQ== X-Gm-Message-State: AOJu0YzosxO9go9gIdbJFYfECu5JuSGQP3uE52OcTq8LOHs99kz8Qhxt 5TDdJL7eWGxdayVEo3P2sIKROrXokVgqcL1s81j/nTM6q8S3v+uwQXkwOsipxZBUlY48EX4oyyf YGw8B X-Gm-Gg: ASbGncvtQ8R57ueuzHc7vNbOqYMHhmEkLZDCClXcZIrSFCOfDC9EGf2EejQ4sSrCqyT 0Jksbj+zFwcPdHkCpTTQZQVmmB8FGVacvWZ43hORbBU4ZcJvXU0GIjzgqa8bTlsk+E8/TCMeUK9 NU1gy9jFELIc5TV82/YyJ4FisQtjxRcUiLgmkiBfFd9msR98gyG/e6YA4fV/EAdWJt0qk8sAE81 D453HzC33u9mz0WxXfMvb9arcWuXI9YbxR51oc4dnUmz3Ri3UnT0ZHZF8NHrj5amSRmUwMxOepC +atdvmLFdDT2G+Ircr9f/dapJZEnXVfzecyS/fx1Fmv4WWwYkrNoBqscYOP9xABQryySupuWV29 ad/038rehejCURKwtymED4Y2llIMx X-Google-Smtp-Source: AGHT+IG2c7UofLpeu7O5NPvj24unMbofNRJiU5V4VLQNPyTbQhLSBXm70qAlLlSte+9ytav8JDiHNQ== X-Received: by 2002:a05:600c:3d89:b0:450:d30e:ff96 with SMTP id 5b1f17b1804b1-455f30bfc7dmr11257655e9.0.1752240874865; Fri, 11 Jul 2025 06:34:34 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 03/36] MAX78000: Add ICC to SOC Date: Fri, 11 Jul 2025 14:33:56 +0100 Message-ID: <20250711133429.1423030-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250711133429.1423030-1-peter.maydell@linaro.org> References: <20250711133429.1423030-1-peter.maydell@linaro.org> 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=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x333.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_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: 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 @linaro.org) X-ZM-MESSAGEID: 1752240923085116600 Content-Type: text/plain; charset="utf-8" From: Jackson Donaldson This commit adds the instruction cache controller to max78000_soc Signed-off-by: Jackson Donaldson Reviewed-by: Peter Maydell Message-id: 20250704223239.248781-4-jcksn@duck.com Signed-off-by: Peter Maydell --- include/hw/arm/max78000_soc.h | 6 ++++++ hw/arm/max78000_soc.c | 20 ++++++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/include/hw/arm/max78000_soc.h b/include/hw/arm/max78000_soc.h index 97bf4099c99..27b506d6eeb 100644 --- a/include/hw/arm/max78000_soc.h +++ b/include/hw/arm/max78000_soc.h @@ -11,6 +11,7 @@ =20 #include "hw/or-irq.h" #include "hw/arm/armv7m.h" +#include "hw/misc/max78000_icc.h" #include "qom/object.h" =20 #define TYPE_MAX78000_SOC "max78000-soc" @@ -21,6 +22,9 @@ OBJECT_DECLARE_SIMPLE_TYPE(MAX78000State, MAX78000_SOC) #define SRAM_BASE_ADDRESS 0x20000000 #define SRAM_SIZE (128 * 1024) =20 +/* The MAX78k has 2 instruction caches; only icc0 matters, icc1 is for RIS= C */ +#define MAX78000_NUM_ICC 2 + struct MAX78000State { SysBusDevice parent_obj; =20 @@ -29,6 +33,8 @@ struct MAX78000State { MemoryRegion sram; MemoryRegion flash; =20 + Max78000IccState icc[MAX78000_NUM_ICC]; + Clock *sysclk; }; =20 diff --git a/hw/arm/max78000_soc.c b/hw/arm/max78000_soc.c index 9676ada6a27..0c83b08eca0 100644 --- a/hw/arm/max78000_soc.c +++ b/hw/arm/max78000_soc.c @@ -17,12 +17,20 @@ #include "hw/qdev-clock.h" #include "hw/misc/unimp.h" =20 +static const uint32_t max78000_icc_addr[] =3D {0x4002a000, 0x4002a800}; + static void max78000_soc_initfn(Object *obj) { MAX78000State *s =3D MAX78000_SOC(obj); + int i; =20 object_initialize_child(obj, "armv7m", &s->armv7m, TYPE_ARMV7M); =20 + for (i =3D 0; i < MAX78000_NUM_ICC; i++) { + g_autofree char *name =3D g_strdup_printf("icc%d", i); + object_initialize_child(obj, name, &s->icc[i], TYPE_MAX78000_ICC); + } + s->sysclk =3D qdev_init_clock_in(DEVICE(s), "sysclk", NULL, NULL, 0); } =20 @@ -30,8 +38,9 @@ static void max78000_soc_realize(DeviceState *dev_soc, Er= ror **errp) { MAX78000State *s =3D MAX78000_SOC(dev_soc); MemoryRegion *system_memory =3D get_system_memory(); - DeviceState *armv7m; + DeviceState *dev, *armv7m; Error *err =3D NULL; + int i; =20 if (!clock_has_source(s->sysclk)) { error_setg(errp, "sysclk clock must be wired up by the board code"= ); @@ -74,6 +83,12 @@ static void max78000_soc_realize(DeviceState *dev_soc, E= rror **errp) return; } =20 + for (i =3D 0; i < MAX78000_NUM_ICC; i++) { + dev =3D DEVICE(&(s->icc[i])); + sysbus_realize(SYS_BUS_DEVICE(dev), errp); + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, max78000_icc_addr[i]); + } + create_unimplemented_device("globalControl", 0x40000000, 0x400); create_unimplemented_device("systemInterface", 0x40000400, 0x400); create_unimplemented_device("functionControl", 0x40000800, 0x400); @@ -107,9 +122,6 @@ static void max78000_soc_realize(DeviceState *dev_soc, = Error **errp) create_unimplemented_device("standardDMA", 0x40028000, 0x1000= ); create_unimplemented_device("flashController0", 0x40029000, 0x400); =20 - create_unimplemented_device("icc0", 0x4002a000, 0x800); - create_unimplemented_device("icc1", 0x4002a800, 0x800); - create_unimplemented_device("adc", 0x40034000, 0x1000= ); create_unimplemented_device("pulseTrainEngine", 0x4003c000, 0xa0); create_unimplemented_device("oneWireMaster", 0x4003d000, 0x1000= ); --=20 2.43.0