From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: "Paolo Bonzini" <pbonzini@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Hervé Poussineau" <hpoussin@reactos.org>,
"Aurelien Jarno" <aurelien@aurel32.net>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Marcel Apfelbaum" <marcel@redhat.com>
Cc: qemu-devel@nongnu.org, Igor Mammedov <imammedo@redhat.com>
Subject: [Qemu-devel] [PATCH 14/29] piix4: add Reset Control Register
Date: Sun, 7 Jan 2018 23:45:43 -0300 [thread overview]
Message-ID: <20180108024558.17983-15-f4bug@amsat.org> (raw)
In-Reply-To: <20180108024558.17983-1-f4bug@amsat.org>
From: Hervé Poussineau <hpoussin@reactos.org>
The RCR I/O port (0xcf9) is used to generate a hard reset or a soft reset.
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
---
hw/isa/piix4.c | 39 +++++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c
index 314f7f7359..13f4eaa2dd 100644
--- a/hw/isa/piix4.c
+++ b/hw/isa/piix4.c
@@ -2,6 +2,7 @@
* QEMU PIIX4 PCI Bridge Emulation
*
* Copyright (c) 2006 Fabrice Bellard
+ * Copyright (c) 2018 Hervé Poussineau
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -33,6 +34,10 @@ PCIDevice *piix4_dev;
typedef struct PIIX4State {
PCIDevice dev;
+
+ /* Reset Control Register */
+ MemoryRegion rcr_mem;
+ uint8_t rcr;
} PIIX4State;
#define TYPE_PIIX4_PCI_DEVICE "PIIX4"
@@ -87,6 +92,34 @@ static const VMStateDescription vmstate_piix4 = {
}
};
+static void piix4_rcr_write(void *opaque, hwaddr addr, uint64_t val,
+ unsigned int len)
+{
+ PIIX4State *s = opaque;
+
+ if (val & 4) {
+ qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);
+ return;
+ }
+ s->rcr = val & 2; /* keep System Reset type only */
+}
+
+static uint64_t piix4_rcr_read(void *opaque, hwaddr addr, unsigned int len)
+{
+ PIIX4State *s = opaque;
+ return s->rcr;
+}
+
+static const MemoryRegionOps piix4_rcr_ops = {
+ .read = piix4_rcr_read,
+ .write = piix4_rcr_write,
+ .endianness = DEVICE_LITTLE_ENDIAN,
+ .impl = {
+ .min_access_size = 1,
+ .max_access_size = 1,
+ },
+};
+
static void piix4_realize(PCIDevice *pci_dev, Error **errp)
{
DeviceState *dev = DEVICE(pci_dev);
@@ -96,6 +129,12 @@ static void piix4_realize(PCIDevice *pci_dev, Error **errp)
pci_address_space_io(pci_dev), errp)) {
return;
}
+
+ memory_region_init_io(&s->rcr_mem, OBJECT(dev), &piix4_rcr_ops, s,
+ "reset-control", 1);
+ memory_region_add_subregion_overlap(pci_address_space_io(pci_dev), 0xcf9,
+ &s->rcr_mem, 1);
+
piix4_dev = pci_dev;
}
--
2.15.1
next prev parent reply other threads:[~2018-01-08 2:46 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-08 2:45 [Qemu-devel] [RFC PATCH 00/29] remove i386/pc dependency: generic SuperIO, PIIX cleanup Philippe Mathieu-Daudé
2018-01-08 2:45 ` [Qemu-devel] [PATCH 01/29] hw/acpi: add mem/nvdimm.h dependency Philippe Mathieu-Daudé
2018-01-08 2:45 ` [Qemu-devel] [PATCH 02/29] pci/pci_host: move generic definitions out of i386/pc.h Philippe Mathieu-Daudé
2018-01-08 2:45 ` [Qemu-devel] [PATCH 03/29] hw/isa: extract parallel-isa specific code Philippe Mathieu-Daudé
2018-01-08 2:45 ` [Qemu-devel] [PATCH 04/29] hw/dma/i8257: rename DMA_init() to i8257_dma_init() Philippe Mathieu-Daudé
2018-01-08 2:45 ` [Qemu-devel] [PATCH 05/29] hw/input/i8042: extract declarations from i386/pc.h into input/i8042.h Philippe Mathieu-Daudé
2018-01-08 2:54 ` David Gibson
2018-01-08 2:45 ` [Qemu-devel] [PATCH 06/29] hw/isa: add a generic isa_superio_init() Philippe Mathieu-Daudé
2018-01-14 18:22 ` Philippe Mathieu-Daudé
2018-01-08 2:45 ` [Qemu-devel] [PATCH 07/29] hw/i386/pc: use isa_superio_init() Philippe Mathieu-Daudé
2018-01-08 2:45 ` [Qemu-devel] [PATCH 08/29] hw/mips/fulong2e: " Philippe Mathieu-Daudé
2018-01-08 2:45 ` [Qemu-devel] [PATCH 09/29] hw/mips/malta: code movement Philippe Mathieu-Daudé
2018-01-08 2:45 ` [Qemu-devel] [PATCH 10/29] hw/mips/malta: add fdc37m81x_init() which uses isa_superio_init() Philippe Mathieu-Daudé
2018-01-08 2:45 ` [Qemu-devel] [PATCH 11/29] mc146818rtc: always register rtc to rtc list Philippe Mathieu-Daudé
2018-01-08 2:45 ` [Qemu-devel] [PATCH 12/29] piix4: rename some variables in realize function Philippe Mathieu-Daudé
2018-01-08 2:45 ` [Qemu-devel] [PATCH 13/29] piix4: convert reset function to QOM Philippe Mathieu-Daudé
2018-01-08 2:45 ` Philippe Mathieu-Daudé [this message]
2018-01-08 2:45 ` [Qemu-devel] [PATCH 15/29] piix4: add a i8259 interrupt controller as specified in datasheet Philippe Mathieu-Daudé
2018-01-08 2:45 ` [Qemu-devel] [RFC PATCH 16/29] Revert "irq: introduce qemu_irq_proxy()" Philippe Mathieu-Daudé
2018-01-08 2:45 ` [Qemu-devel] [PATCH 17/29] piix: move piix4 declaration into new southbridge/i82371_piix.h Philippe Mathieu-Daudé
2018-01-08 2:45 ` [Qemu-devel] [PATCH 18/29] piix4: add a i8257 dma controller as specified in datasheet Philippe Mathieu-Daudé
2018-01-08 2:45 ` [Qemu-devel] [PATCH 19/29] piix4: add a i8254 pit " Philippe Mathieu-Daudé
2018-01-08 2:45 ` [Qemu-devel] [PATCH 20/29] piix4: add a speaker " Philippe Mathieu-Daudé
2018-01-08 2:45 ` [Qemu-devel] [PATCH 21/29] piix: move southbridge related declarations/definitions to i82371_piix.h Philippe Mathieu-Daudé
2018-01-08 2:45 ` [Qemu-devel] [PATCH 22/29] piix3: extract piix3_init() from i440fx_init() Philippe Mathieu-Daudé
2018-01-08 2:45 ` [Qemu-devel] [PATCH 23/29] hw/i386: extract i440fx related declarations/definitions to i440fx.h Philippe Mathieu-Daudé
2018-01-08 2:45 ` [Qemu-devel] [PATCH 24/29] hw/i386: extract i440fx code from piix.c into i440fx.c Philippe Mathieu-Daudé
2018-01-08 2:45 ` [Qemu-devel] [PATCH 25/29] hw/i386: move piix from hw/pci-host to hw/southbridge Philippe Mathieu-Daudé
2018-01-08 2:45 ` [Qemu-devel] [PATCH 26/29] configs/mips-softmmu: use common CONFIG_PCI_PIIX instead of CONFIG_PIIX4 Philippe Mathieu-Daudé
2018-01-08 2:45 ` [Qemu-devel] [PATCH 27/29] piix3: convert reset function to QOM Philippe Mathieu-Daudé
2018-01-08 2:45 ` [Qemu-devel] [PATCH 28/29] piix: merge common code from isa/piix4.c with southbridge piix3 Philippe Mathieu-Daudé
2018-01-08 2:45 ` [Qemu-devel] [NOTFORMERGE PATCH 29/29] piix4: add isa_superio_init Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180108024558.17983-15-f4bug@amsat.org \
--to=f4bug@amsat.org \
--cc=aurelien@aurel32.net \
--cc=ehabkost@redhat.com \
--cc=hpoussin@reactos.org \
--cc=imammedo@redhat.com \
--cc=marcel@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).