From patchwork Wed Mar 5 01:21:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 870512 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp550810wrg; Tue, 4 Mar 2025 17:24:32 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUsJwjCKXmOb540UvXdOZBr3j2xc7raX4sBCSVZedbps/cLheiJRJzlbNseqwwIHYHg6bLqHw==@linaro.org X-Google-Smtp-Source: AGHT+IEIUh7nTSOs5PH2AnnzBi0Xo2VwiTXmTgAwtMChSHUpc3Kn5jaIcO7JwyQmvIIGNOJBFdNT X-Received: by 2002:ac8:5fcc:0:b0:475:42d:ea0a with SMTP id d75a77b69052e-4750b4c8f45mr17137901cf.38.1741137872677; Tue, 04 Mar 2025 17:24:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741137872; cv=none; d=google.com; s=arc-20240605; b=SQk8KoV3prnuQX3wX6FDl7RrljckvpCUnVPB+AEgLnyBYTHu65PfGTR7Fxl4FRq1hW 2xkFyx7dlhYUf23yxic/T66UevOfALHPdcOIK1fjr2V/7I2dSYoRXLIzJ/jsv5OnuG1j wEBiWO997vu0OFZMteiQHw7XEdhT7BbSjvrOWkNqinVwSgGfhKaIkHFqFYbilf2qxNfU nZTnnI4+kmlvVyyxx/CCSCocWX4A3H7CpsMmgi1dPxmTQGePcDgjp5t4HMCMHl4+rB0O szSbro8NmEbyarBU86flP+mMoV4qEqXb825loLSQBanvy/obU9ihwp9JrUQyPbgIIkpX zoJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=UmR5ArYjxZGIeXGnw2haxlZWQ2j6JF05kRSnp+2VEoM=; fh=AdYF5RYt5fYx7GJKmBEOH7ZPgadoSF7n/ZKU5cjPlZM=; b=cXQ6NQoy2iASosA0EpoIHt4EcQJMt9r2G7/N0EYgIwvkA2TQZnPtNB6T3rACG5Cr5T MfIg0hkq5SB+5qo/SvBksC/ltMExt5JSqzrJiMBfmyl7hPRf6hOlEj5PYdJf78ghQEho bDfOGgqLzuV9DG6XaK7ceXr9plX9RON90f53VOsp5R3L2e/DzBw3/JCAADBQzPjcZ8NS sLUEqJ1eA0FdzGsykWaGrFQJfO9x4mDYbTS7ny8axZ2E9pgGlaMXJ7iPW4SpDjdsBED9 fD0qeL3RSWDzH7IsZ4Mm0t/4AZCOsh4c4j0aKjHhjziiNeiCnhmFC9VbNWiwsuMmwn5O ZABQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=weizFo6v; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-474eadc996dsi49873921cf.242.2025.03.04.17.24.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Mar 2025 17:24:32 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=weizFo6v; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpdSg-0007ta-7B; Tue, 04 Mar 2025 20:22:14 -0500 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 1tpdSe-0007tK-LC for qemu-devel@nongnu.org; Tue, 04 Mar 2025 20:22:12 -0500 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 1tpdSc-0006uK-RN for qemu-devel@nongnu.org; Tue, 04 Mar 2025 20:22:12 -0500 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-43bcc02ca41so11953505e9.0 for ; Tue, 04 Mar 2025 17:22:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741137729; x=1741742529; 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=UmR5ArYjxZGIeXGnw2haxlZWQ2j6JF05kRSnp+2VEoM=; b=weizFo6v4wnjRaEC0Grk/N/RBTcCg66kguq8IYTA7DYE/L6Nu8MjPqpfDiP15ZCvHz YtuScyd9TopoVqpu9WdjrfKaQGbFiX3BROFwzD40uOEEIf+Qh0OBL9N92R5vHdDqHdMv tvlk1STLE++ImPXO0K4yADfS3t2ZOPd6EWne8iVmSxN+1eHZDG5rSyRuqexkKqQamx2I VMwdofi/LBDCiODJZ7tRbT1PJNb2wbHu1i7JmH/118+RoR5vxBI5Z2VfyC5tu7BxZ8GE i6CoyArN62ruGDy7xoLdoxuXl+CLvU2EvXldGXkMFgKBF7TcU+ZiSa5rfZvDFqFLYxvo fUaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741137729; x=1741742529; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UmR5ArYjxZGIeXGnw2haxlZWQ2j6JF05kRSnp+2VEoM=; b=KOW02BBazUUq/wqVyM/H4reFFL2NikcNxfsESuQgHHjRnvWj+yhH1hNFyGLt+73+PT tYcNtM6D0iDguHDhwlLc9Wphqc54rVgG7q8D8AVsDvks0aqFpEmTzjtYPtykSZlhumpe bGF4x8lsUJxD7k1GvSHwdqu5c+iGUhibse9Dm40Y9ATPLjfZ3UODWL0tGI4p/yKwLTni KbTT19d85THxCVNQRZfba0n5RH4nUV5pS429ALkIZKeF+bAfnQ2V5QwmatKUOpMqNuo2 8mEaL8V1HE9tFP2+DYq2ov4NTCy+qB+8sWQbL+rQiTejR2h9GLdCA3mysv3Pvrm69jDb PYHw== X-Gm-Message-State: AOJu0YyEMJrUYzi53F1oK7VWeZA00hUwqGrGL4UmeYf6/ZqEZxj1ZMRb odpj/8voKLrZyCB+BGJaSKv8MgFQ2qke7WVIMQdUncJeJk7x9LU2nLQ0z5w/NjCpRIDIZ5DllNd xVwI= X-Gm-Gg: ASbGncsCuHQq81jZpwUSl/wCFsv5hwtSP+P4Iv4jxDl1PkrtQskf7lCBEm3PAA1x3j9 B4OuuCwWV4dShJ4p8a/jrKdRCN2pMu7t+WczTUYdWMiESI0DYbfNpmjnodhhIi7P1PIf/l3+d5z WUdVxl7hoy4BlGeAv0Fn3mPm/YL9EZSA24Qpm2Ws350TesTrOWDneMT0deqKtWIF7xrSiEEvQW5 4N5282yHLF6hMph83Ds2XGGaE2tchK81wh7m2A3wTdMetViQyeDIKkADg3HEP62GIcsSeHvcxEV xwC8qlE1TgN1rGtiqcFjhTekuCB/QJUqHjTPUwxlGK/PraEMMi0KGWiLfutf67LHo7Rs0a/MHyt 4tqCX0+wb4tiEPksPnZ4= X-Received: by 2002:a05:6000:188b:b0:38f:2bd4:4f83 with SMTP id ffacd0b85a97d-3911f728a05mr750808f8f.16.1741137728704; Tue, 04 Mar 2025 17:22:08 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390e4795da5sm19606063f8f.15.2025.03.04.17.22.07 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 04 Mar 2025 17:22:08 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Alexander Graf , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Phil Dennis-Jordan , Akihiko Odaki Subject: [PULL 02/41] hw/misc/pvpanic: Add MMIO interface Date: Wed, 5 Mar 2025 02:21:17 +0100 Message-ID: <20250305012157.96463-3-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250305012157.96463-1-philmd@linaro.org> References: <20250305012157.96463-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=philmd@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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Alexander Graf In addition to the ISA and PCI variants of pvpanic, let's add an MMIO platform device that we can use in embedded arm environments. Signed-off-by: Alexander Graf Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Signed-off-by: Phil Dennis-Jordan Reviewed-by: Akihiko Odaki Tested-by: Akihiko Odaki Message-ID: <20241223221645.29911-8-phil@philjordan.eu> Signed-off-by: Philippe Mathieu-Daudé --- include/hw/misc/pvpanic.h | 1 + hw/misc/pvpanic-mmio.c | 60 +++++++++++++++++++++++++++++++++++++++ hw/misc/Kconfig | 4 +++ hw/misc/meson.build | 1 + 4 files changed, 66 insertions(+) create mode 100644 hw/misc/pvpanic-mmio.c diff --git a/include/hw/misc/pvpanic.h b/include/hw/misc/pvpanic.h index 9a71a5ad0d7..049a94c1125 100644 --- a/include/hw/misc/pvpanic.h +++ b/include/hw/misc/pvpanic.h @@ -26,6 +26,7 @@ #define TYPE_PVPANIC_ISA_DEVICE "pvpanic" #define TYPE_PVPANIC_PCI_DEVICE "pvpanic-pci" +#define TYPE_PVPANIC_MMIO_DEVICE "pvpanic-mmio" #define PVPANIC_IOPORT_PROP "ioport" diff --git a/hw/misc/pvpanic-mmio.c b/hw/misc/pvpanic-mmio.c new file mode 100644 index 00000000000..70097cecc74 --- /dev/null +++ b/hw/misc/pvpanic-mmio.c @@ -0,0 +1,60 @@ +/* + * QEMU simulated pvpanic device (MMIO frontend) + * + * Copyright © 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" + +#include "hw/qdev-properties.h" +#include "hw/misc/pvpanic.h" +#include "hw/sysbus.h" +#include "standard-headers/misc/pvpanic.h" + +OBJECT_DECLARE_SIMPLE_TYPE(PVPanicMMIOState, PVPANIC_MMIO_DEVICE) + +#define PVPANIC_MMIO_SIZE 0x2 + +struct PVPanicMMIOState { + SysBusDevice parent_obj; + + PVPanicState pvpanic; +}; + +static void pvpanic_mmio_initfn(Object *obj) +{ + PVPanicMMIOState *s = PVPANIC_MMIO_DEVICE(obj); + + pvpanic_setup_io(&s->pvpanic, DEVICE(s), PVPANIC_MMIO_SIZE); + sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->pvpanic.mr); +} + +static const Property pvpanic_mmio_properties[] = { + DEFINE_PROP_UINT8("events", PVPanicMMIOState, pvpanic.events, + PVPANIC_PANICKED | PVPANIC_CRASH_LOADED), +}; + +static void pvpanic_mmio_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + + device_class_set_props(dc, pvpanic_mmio_properties); + set_bit(DEVICE_CATEGORY_MISC, dc->categories); +} + +static const TypeInfo pvpanic_mmio_info = { + .name = TYPE_PVPANIC_MMIO_DEVICE, + .parent = TYPE_SYS_BUS_DEVICE, + .instance_size = sizeof(PVPanicMMIOState), + .instance_init = pvpanic_mmio_initfn, + .class_init = pvpanic_mmio_class_init, +}; + +static void pvpanic_register_types(void) +{ + type_register_static(&pvpanic_mmio_info); +} + +type_init(pvpanic_register_types) diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index 82bd68b4bb8..ec0fa5aa9f8 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -148,6 +148,10 @@ config PVPANIC_ISA depends on ISA_BUS select PVPANIC_COMMON +config PVPANIC_MMIO + bool + select PVPANIC_COMMON + config AUX bool select I2C diff --git a/hw/misc/meson.build b/hw/misc/meson.build index 0b5187a2f74..6d47de482c5 100644 --- a/hw/misc/meson.build +++ b/hw/misc/meson.build @@ -126,6 +126,7 @@ system_ss.add(when: 'CONFIG_ARMSSE_MHU', if_true: files('armsse-mhu.c')) system_ss.add(when: 'CONFIG_PVPANIC_ISA', if_true: files('pvpanic-isa.c')) system_ss.add(when: 'CONFIG_PVPANIC_PCI', if_true: files('pvpanic-pci.c')) +system_ss.add(when: 'CONFIG_PVPANIC_MMIO', if_true: files('pvpanic-mmio.c')) system_ss.add(when: 'CONFIG_AUX', if_true: files('auxbus.c')) system_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files( 'aspeed_hace.c',