From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: qemu-devel@nongnu.org
Cc: "Aurelien Jarno" <aurelien@aurel32.net>,
"Aleksandar Rikalo" <aleksandar.rikalo@syrmia.com>,
"Huacai Chen" <chenhuacai@kernel.org>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>
Subject: [PATCH 05/18] hw/pci-host/bonito: Simplify soft reset using FIELD_EX32()
Date: Thu, 31 Dec 2020 23:48:58 +0100 [thread overview]
Message-ID: <20201231224911.1467352-6-f4bug@amsat.org> (raw)
In-Reply-To: <20201231224911.1467352-1-f4bug@amsat.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/pci-host/bonito.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c
index fe94e6740b5..104c58331d0 100644
--- a/hw/pci-host/bonito.c
+++ b/hw/pci-host/bonito.c
@@ -244,7 +244,6 @@ static void bonito_writel(void *opaque, hwaddr addr,
{
PCIBonitoState *s = opaque;
uint32_t saddr;
- int reset = 0;
saddr = addr >> 2;
@@ -277,13 +276,12 @@ static void bonito_writel(void *opaque, hwaddr addr,
s->regs[saddr] = val;
break;
case BONITO_BONGENCFG:
- if (!(s->regs[saddr] & 0x04) && (val & 0x04)) {
- reset = 1; /* bit 2 jump from 0 to 1 cause reset */
- }
- s->regs[saddr] = val;
- if (reset) {
+ if (!FIELD_EX32(s->regs[saddr], BONGENCFG, CPUSELFRESET)
+ && FIELD_EX32(val, BONGENCFG, CPUSELFRESET)) {
+ /* bit 2 jump from 0 to 1 cause reset */
qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);
}
+ s->regs[saddr] = val;
break;
case BONITO_INTENSET:
s->regs[BONITO_INTENSET] = val;
--
2.26.2
next prev parent reply other threads:[~2020-12-31 22:52 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-31 22:48 [PATCH 00/18] hw/pci-host/bonito: Remap PCI "lo" regions when PCIMAP reg is modified Philippe Mathieu-Daudé
2020-12-31 22:48 ` [PATCH 01/18] hw/pci-host/bonito: Remove unused definitions Philippe Mathieu-Daudé
2021-01-03 1:37 ` Huacai Chen
2020-12-31 22:48 ` [PATCH 02/18] hw/pci-host/bonito: Display hexadecimal value with '0x' prefix Philippe Mathieu-Daudé
2021-01-03 1:38 ` Huacai Chen
2020-12-31 22:48 ` [PATCH 03/18] hw/pci-host/bonito: Use PCI_DEVFN() macro Philippe Mathieu-Daudé
2021-01-03 1:38 ` Huacai Chen
2020-12-31 22:48 ` [PATCH 04/18] hw/pci-host/bonito: Use pci_config_set_interrupt_pin() Philippe Mathieu-Daudé
2021-01-03 1:39 ` Huacai Chen
2020-12-31 22:48 ` Philippe Mathieu-Daudé [this message]
2020-12-31 22:48 ` [RFC PATCH 06/18] hw/pci-host/bonito: Do not allow big-endian targets Philippe Mathieu-Daudé
2020-12-31 22:49 ` [PATCH 07/18] hw/pci-host/bonito: Make BONPONCFG register read-only Philippe Mathieu-Daudé
2020-12-31 22:49 ` [RFC PATCH 08/18] hw/pci-host/bonito: Remap PCI "lo" regions when PCIMAP reg is modified Philippe Mathieu-Daudé
2020-12-31 22:49 ` [PATCH 09/18] hw/pci-host/bonito: Rename north bridge helpers Philippe Mathieu-Daudé
2020-12-31 22:49 ` [PATCH 10/18] hw/pci-host/bonito: Rename PCI host helpers Philippe Mathieu-Daudé
2020-12-31 22:49 ` [PATCH 11/18] hw/pci-host/bonito: Rename PCI function helpers Philippe Mathieu-Daudé
2020-12-31 22:49 ` [PATCH 12/18] hw/pci-host/bonito: Rename PCIBonitoState -> BonitoPciState Philippe Mathieu-Daudé
2020-12-31 22:49 ` [PATCH 13/18] hw/pci-host/bonito: Create PCI regions in bonito_host_realize() Philippe Mathieu-Daudé
2020-12-31 22:49 ` [RFC PATCH 14/18] hw/pci-host/bonito: Simplify using pci_host_conf_le_ops MemoryRegionOps Philippe Mathieu-Daudé
2020-12-31 22:49 ` [PATCH 15/18] hw/pci-host/bonito: Map north bridge region in bonito_host_realize() Philippe Mathieu-Daudé
2020-12-31 22:49 ` [PATCH 16/18] hw/pci-host/bonito: Create TYPE_PCI_BONITO " Philippe Mathieu-Daudé
2020-12-31 22:49 ` [PATCH 17/18] hw/pci-host/bonito: Declare TYPE_BONITO_PCI_HOST_BRIDGE in include/ Philippe Mathieu-Daudé
2020-12-31 22:49 ` [RFC PATCH 18/18] hw/mips/fuloong2e: Inline bonito_init() Philippe Mathieu-Daudé
2021-01-03 13:52 ` [PATCH 00/18] hw/pci-host/bonito: Remap PCI "lo" regions when PCIMAP reg is modified 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=20201231224911.1467352-6-f4bug@amsat.org \
--to=f4bug@amsat.org \
--cc=aleksandar.rikalo@syrmia.com \
--cc=aurelien@aurel32.net \
--cc=chenhuacai@kernel.org \
--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).