* [PULL v2 00/14] Misc HW patches for 2025-03-11
@ 2025-03-12 10:14 Philippe Mathieu-Daudé
2025-03-12 10:14 ` [PULL v2 14/14] hw/sd/sdhci: Remove need for SDHCI_VENDOR_IMX definition Philippe Mathieu-Daudé
2025-03-13 7:05 ` [PULL v2 00/14] Misc HW patches for 2025-03-11 Stefan Hajnoczi
0 siblings, 2 replies; 3+ messages in thread
From: Philippe Mathieu-Daudé @ 2025-03-12 10:14 UTC (permalink / raw)
To: qemu-devel; +Cc: Philippe Mathieu-Daudé
The following changes since commit 825b96dbcee23d134b691fc75618b59c5f53da32:
Merge tag 'migration-20250310-pull-request' of https://gitlab.com/farosas/qemu into staging (2025-03-11 09:32:07 +0800)
are available in the Git repository at:
https://github.com/philmd/qemu.git tags/hw-misc-20250312
for you to fetch changes up to 7f2a5272ff3893ef412c093aae66b7ed34ab3dfc:
hw/sd/sdhci: Remove need for SDHCI_VENDOR_IMX definition (2025-03-12 11:11:42 +0100)
Since v1:
- Fixed typo in last patch subject (Zoltan)
----------------------------------------------------------------
Misc HW patches
- Set correct values for MPC8569E's eSDHC (Zoltan)
- Emulate Ricoh RS5C372 RTC device (Bernhard)
- Array overflow fixes in SMSC91C111 netdev (Peter)
- Fix typo in Xen HVM (Philippe)
- Move graphic height/width/depth globals to their own file (Philippe)
- Introduce qemu_arch_available() helper (Philippe)
- Check fw_cfg's ACPI availability at runtime (Philippe)
- Remove virtio-mem dependency on CONFIG_DEVICES (Philippe)
- Sort HyperV SYNDBG API definitions (Pierrick)
- Remove need for SDHCI_VENDOR_FSL definition (Philippe)
----------------------------------------------------------------
BALATON Zoltan (1):
hw/sd/sdhci: Set reset value of interrupt registers
Bernhard Beschow (1):
hw/rtc: Add Ricoh RS5C372 RTC emulation
Peter Maydell (4):
hw/net/smc91c111: Sanitize packet numbers
hw/net/smc91c111: Sanitize packet length on tx
hw/net/smc91c111: Use MAX_PACKET_SIZE instead of magic numbers
hw/net/smc91c111: Don't allow data register access to overrun buffer
Philippe Mathieu-Daudé (7):
hw/xen/hvm: Fix Aarch64 typo
system: Extract target-specific globals to their own compilation unit
system: Replace arch_type global by qemu_arch_available() helper
hw/acpi: Introduce acpi_builtin() helper
hw/i386/fw_cfg: Check ACPI availability with acpi_builtin()
hw/virtio/virtio-mem: Remove CONFIG_DEVICES include
hw/sd/sdhci: Remove need for SDHCI_VENDOR_IMX definition
Pierrick Bouvier (1):
hw/hyperv/hyperv-proto: Move SYNDBG definitions from target/i386
MAINTAINERS | 2 +
include/hw/acpi/acpi.h | 3 +
include/hw/hyperv/hyperv-proto.h | 12 ++
include/hw/sd/sdhci.h | 2 +-
include/hw/xen/arch_hvm.h | 2 +-
include/system/arch_init.h | 2 +-
target/i386/kvm/hyperv-proto.h | 12 --
hw/acpi/acpi-stub.c | 8 ++
hw/acpi/core.c | 5 +
hw/arm/fsl-imx25.c | 2 -
hw/arm/fsl-imx6.c | 2 -
hw/arm/fsl-imx6ul.c | 2 -
hw/arm/fsl-imx7.c | 2 -
hw/arm/fsl-imx8mp.c | 2 -
hw/i386/fw_cfg.c | 8 +-
hw/net/smc91c111.c | 148 ++++++++++++++++---
hw/ppc/e500.c | 1 +
hw/rtc/rs5c372.c | 236 +++++++++++++++++++++++++++++++
hw/scsi/scsi-disk.c | 2 +-
hw/sd/sdhci.c | 18 ++-
hw/virtio/virtio-mem.c | 6 +-
system/arch_init.c | 19 +--
system/globals-target.c | 24 ++++
system/qdev-monitor.c | 4 +-
system/vl.c | 6 +-
tests/qtest/rs5c372-test.c | 43 ++++++
hw/rtc/Kconfig | 5 +
hw/rtc/meson.build | 1 +
hw/rtc/trace-events | 4 +
system/meson.build | 1 +
tests/qtest/meson.build | 1 +
31 files changed, 503 insertions(+), 82 deletions(-)
create mode 100644 hw/rtc/rs5c372.c
create mode 100644 system/globals-target.c
create mode 100644 tests/qtest/rs5c372-test.c
--
2.47.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PULL v2 14/14] hw/sd/sdhci: Remove need for SDHCI_VENDOR_IMX definition
2025-03-12 10:14 [PULL v2 00/14] Misc HW patches for 2025-03-11 Philippe Mathieu-Daudé
@ 2025-03-12 10:14 ` Philippe Mathieu-Daudé
2025-03-13 7:05 ` [PULL v2 00/14] Misc HW patches for 2025-03-11 Stefan Hajnoczi
1 sibling, 0 replies; 3+ messages in thread
From: Philippe Mathieu-Daudé @ 2025-03-12 10:14 UTC (permalink / raw)
To: qemu-devel; +Cc: Philippe Mathieu-Daudé, BALATON Zoltan, Bernhard Beschow
All instances of TYPE_IMX_USDHC set vendor=SDHCI_VENDOR_IMX.
No need to special-case it.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Bernhard Beschow <shentey@gmail.com>
Message-Id: <20250308213640.13138-3-philmd@linaro.org>
---
include/hw/sd/sdhci.h | 1 -
hw/arm/fsl-imx25.c | 2 --
hw/arm/fsl-imx6.c | 2 --
hw/arm/fsl-imx6ul.c | 2 --
hw/arm/fsl-imx7.c | 2 --
hw/arm/fsl-imx8mp.c | 2 --
hw/sd/sdhci.c | 14 ++++----------
7 files changed, 4 insertions(+), 21 deletions(-)
diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h
index f722d8eb1cc..51fb30ea528 100644
--- a/include/hw/sd/sdhci.h
+++ b/include/hw/sd/sdhci.h
@@ -109,7 +109,6 @@ struct SDHCIState {
typedef struct SDHCIState SDHCIState;
#define SDHCI_VENDOR_NONE 0
-#define SDHCI_VENDOR_IMX 1
#define SDHCI_VENDOR_FSL 2
/*
diff --git a/hw/arm/fsl-imx25.c b/hw/arm/fsl-imx25.c
index 5359a6d8d3b..02214ca1a1c 100644
--- a/hw/arm/fsl-imx25.c
+++ b/hw/arm/fsl-imx25.c
@@ -243,8 +243,6 @@ static void fsl_imx25_realize(DeviceState *dev, Error **errp)
&error_abort);
object_property_set_uint(OBJECT(&s->esdhc[i]), "capareg",
IMX25_ESDHC_CAPABILITIES, &error_abort);
- object_property_set_uint(OBJECT(&s->esdhc[i]), "vendor",
- SDHCI_VENDOR_IMX, &error_abort);
if (!sysbus_realize(SYS_BUS_DEVICE(&s->esdhc[i]), errp)) {
return;
}
diff --git a/hw/arm/fsl-imx6.c b/hw/arm/fsl-imx6.c
index dc86338b3a5..a114dc0d63d 100644
--- a/hw/arm/fsl-imx6.c
+++ b/hw/arm/fsl-imx6.c
@@ -327,8 +327,6 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp)
&error_abort);
object_property_set_uint(OBJECT(&s->esdhc[i]), "capareg",
IMX6_ESDHC_CAPABILITIES, &error_abort);
- object_property_set_uint(OBJECT(&s->esdhc[i]), "vendor",
- SDHCI_VENDOR_IMX, &error_abort);
if (!sysbus_realize(SYS_BUS_DEVICE(&s->esdhc[i]), errp)) {
return;
}
diff --git a/hw/arm/fsl-imx6ul.c b/hw/arm/fsl-imx6ul.c
index 34c4aa15cd0..ce8d3ef535f 100644
--- a/hw/arm/fsl-imx6ul.c
+++ b/hw/arm/fsl-imx6ul.c
@@ -531,8 +531,6 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp)
FSL_IMX6UL_USDHC2_IRQ,
};
- object_property_set_uint(OBJECT(&s->usdhc[i]), "vendor",
- SDHCI_VENDOR_IMX, &error_abort);
sysbus_realize(SYS_BUS_DEVICE(&s->usdhc[i]), &error_abort);
sysbus_mmio_map(SYS_BUS_DEVICE(&s->usdhc[i]), 0,
diff --git a/hw/arm/fsl-imx7.c b/hw/arm/fsl-imx7.c
index 3374018cde0..ed1f10bca26 100644
--- a/hw/arm/fsl-imx7.c
+++ b/hw/arm/fsl-imx7.c
@@ -471,8 +471,6 @@ static void fsl_imx7_realize(DeviceState *dev, Error **errp)
FSL_IMX7_USDHC3_IRQ,
};
- object_property_set_uint(OBJECT(&s->usdhc[i]), "vendor",
- SDHCI_VENDOR_IMX, &error_abort);
sysbus_realize(SYS_BUS_DEVICE(&s->usdhc[i]), &error_abort);
sysbus_mmio_map(SYS_BUS_DEVICE(&s->usdhc[i]), 0,
diff --git a/hw/arm/fsl-imx8mp.c b/hw/arm/fsl-imx8mp.c
index 1ea98e14635..c3f6da63220 100644
--- a/hw/arm/fsl-imx8mp.c
+++ b/hw/arm/fsl-imx8mp.c
@@ -524,8 +524,6 @@ static void fsl_imx8mp_realize(DeviceState *dev, Error **errp)
{ fsl_imx8mp_memmap[FSL_IMX8MP_USDHC3].addr, FSL_IMX8MP_USDHC3_IRQ },
};
- object_property_set_uint(OBJECT(&s->usdhc[i]), "vendor",
- SDHCI_VENDOR_IMX, &error_abort);
if (!sysbus_realize(SYS_BUS_DEVICE(&s->usdhc[i]), errp)) {
return;
}
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index fe87e18d5d2..69baf73ae9b 100644
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -1735,16 +1735,10 @@ usdhc_write(void *opaque, hwaddr offset, uint64_t val, unsigned size)
case USDHC_VENDOR_SPEC:
s->vendor_spec = value;
- switch (s->vendor) {
- case SDHCI_VENDOR_IMX:
- if (value & USDHC_IMX_FRC_SDCLK_ON) {
- s->prnsts &= ~SDHC_IMX_CLOCK_GATE_OFF;
- } else {
- s->prnsts |= SDHC_IMX_CLOCK_GATE_OFF;
- }
- break;
- default:
- break;
+ if (value & USDHC_IMX_FRC_SDCLK_ON) {
+ s->prnsts &= ~SDHC_IMX_CLOCK_GATE_OFF;
+ } else {
+ s->prnsts |= SDHC_IMX_CLOCK_GATE_OFF;
}
break;
--
2.47.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PULL v2 00/14] Misc HW patches for 2025-03-11
2025-03-12 10:14 [PULL v2 00/14] Misc HW patches for 2025-03-11 Philippe Mathieu-Daudé
2025-03-12 10:14 ` [PULL v2 14/14] hw/sd/sdhci: Remove need for SDHCI_VENDOR_IMX definition Philippe Mathieu-Daudé
@ 2025-03-13 7:05 ` Stefan Hajnoczi
1 sibling, 0 replies; 3+ messages in thread
From: Stefan Hajnoczi @ 2025-03-13 7:05 UTC (permalink / raw)
To: Philippe Mathieu-Daudé; +Cc: qemu-devel, Philippe Mathieu-Daudé
[-- Attachment #1: Type: text/plain, Size: 116 bytes --]
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/10.0 for any user-visible changes.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-03-13 7:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-12 10:14 [PULL v2 00/14] Misc HW patches for 2025-03-11 Philippe Mathieu-Daudé
2025-03-12 10:14 ` [PULL v2 14/14] hw/sd/sdhci: Remove need for SDHCI_VENDOR_IMX definition Philippe Mathieu-Daudé
2025-03-13 7:05 ` [PULL v2 00/14] Misc HW patches for 2025-03-11 Stefan Hajnoczi
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).