[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v3 56/62] hw/i386/cxl: ensure maxram is greater than ram size for
From: |
Michael S. Tsirkin |
Subject: |
[PULL v3 56/62] hw/i386/cxl: ensure maxram is greater than ram size for calculating cxl range |
Date: |
Sun, 22 Oct 2023 05:26:26 -0400 |
From: Ani Sinha <anisinha@redhat.com>
pc_get_device_memory_range() finds the device memory size by calculating the
difference between maxram and ram sizes. This calculation makes sense only when
maxram is greater than the ram size. Make sure we check for that before calling
pc_get_device_memory_range().
Signed-off-by: Ani Sinha <anisinha@redhat.com>
Message-Id: <20231011105335.42296-1-anisinha@redhat.com>
Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/i386/pc.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 6293f57a0c..dbaefa7617 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -781,10 +781,12 @@ static void pc_get_device_memory_range(PCMachineState
*pcms,
static uint64_t pc_get_cxl_range_start(PCMachineState *pcms)
{
PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms);
+ MachineState *ms = MACHINE(pcms);
hwaddr cxl_base;
ram_addr_t size;
- if (pcmc->has_reserved_memory) {
+ if (pcmc->has_reserved_memory &&
+ (ms->ram_size < ms->maxram_size)) {
pc_get_device_memory_range(pcms, &cxl_base, &size);
cxl_base += size;
} else {
--
MST
- [PULL v3 46/62] hw/isa/piix: Rename functions to be shared for PCI interrupt triggering, (continued)
- [PULL v3 46/62] hw/isa/piix: Rename functions to be shared for PCI interrupt triggering, Michael S. Tsirkin, 2023/10/22
- [PULL v3 47/62] hw/isa/piix: Reuse PIIX3's PCI interrupt triggering in PIIX4, Michael S. Tsirkin, 2023/10/22
- [PULL v3 50/62] hw/i386/pc_piix: Make PIIX4 south bridge usable in PC machine, Michael S. Tsirkin, 2023/10/22
- [PULL v3 48/62] hw/isa/piix: Resolve duplicate code regarding PCI interrupt wiring, Michael S. Tsirkin, 2023/10/22
- [PULL v3 51/62] vhost-user-common: send get_inflight_fd once, Michael S. Tsirkin, 2023/10/22
- [PULL v3 49/62] hw/isa/piix: Implement multi-process QEMU support also for PIIX4, Michael S. Tsirkin, 2023/10/22
- [PULL v3 53/62] vhost-user-scsi: support reconnect to backend, Michael S. Tsirkin, 2023/10/22
- [PULL v3 52/62] vhost: move and rename the conn retry times, Michael S. Tsirkin, 2023/10/22
- [PULL v3 54/62] vhost-user-scsi: start vhost when guest kicks, Michael S. Tsirkin, 2023/10/22
- [PULL v3 55/62] vhost-user: fix lost reconnect, Michael S. Tsirkin, 2023/10/22
- [PULL v3 56/62] hw/i386/cxl: ensure maxram is greater than ram size for calculating cxl range,
Michael S. Tsirkin <=
- [PULL v3 57/62] tests/acpi: Allow update of DSDT.cxl, Michael S. Tsirkin, 2023/10/22
- [PULL v3 58/62] hw/cxl: Add QTG _DSM support for ACPI0017 device, Michael S. Tsirkin, 2023/10/22
- [PULL v3 60/62] vhost-user: Fix protocol feature bit conflict, Michael S. Tsirkin, 2023/10/22
- [PULL v3 59/62] tests/acpi: Update DSDT.cxl with QTG DSM, Michael S. Tsirkin, 2023/10/22
- [PULL v3 61/62] MAINTAINERS: Add include/hw/intc/i8259.h to the PC chip section, Michael S. Tsirkin, 2023/10/22
- [PULL v3 62/62] intel-iommu: Report interrupt remapping faults, fix return value, Michael S. Tsirkin, 2023/10/22
- Re: [PULL v3 00/62] virtio,pc,pci: features, cleanups, Stefan Hajnoczi, 2023/10/23