From patchwork Mon May 12 08:39:31 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: 889338 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp1497264wrr; Mon, 12 May 2025 01:41:50 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWv7AWoMYFvhySvlh3mDSrYm3/LUWQmVBrTnXvic//mJXpqT5dYn5XSeM58X6n948PA1TAYmw==@linaro.org X-Google-Smtp-Source: AGHT+IGTmR9XHrq99TMji2NydIcHrI2ZJowWeJZHJfFP55iYZHJLQllrK74RBL8PH8IjvkFJB6bY X-Received: by 2002:a05:6214:240d:b0:6e6:630c:71e8 with SMTP id 6a1803df08f44-6f6e47a7b97mr241433126d6.7.1747039310201; Mon, 12 May 2025 01:41:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747039310; cv=none; d=google.com; s=arc-20240605; b=GPnEm7uRHtAVjxEWWAnbyh562bS5Bxf8/S/55j6k64o1ckBfO54YAZLJF9UPlWmy6t mo+rZDdQqDFLYZVN+aOsS3vlWUWLyWA+g14MuKq4MimebY1P2MypIoOOGbqU4PECctD3 Y0iNYTiseLOIDNI+p++jInakcHoB9moOCreghpu96rtC/g5QDuXRSCR0G+gi7ooVU9Rl I+oLr/Gcc2KZDbd33sSfGTmMTYj/oYa+HQyJbZhjmEezVjC5aUq6JMbboIScy0mAvRDP rEN90U5giA1KeeswaJdWxUJA5csPKiZm8BxJqi2YBWYExS3/xR6P/Fh4slwXOLsNppVM nCXQ== 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=IixRHUe01KuZJgZLnpgydiMWWiime3ZZSmn+E7k3wcw=; fh=t+WM68hpZdukNUqoyhJ9Y8NKC5MnAAaNVsh7R6pJqwA=; b=NXDXhxA1tKyEtlNtkyR7KkDe0LpWhBwGjJ6id/FcG7xRd4vixQnYTrCA9siRWXgnHd Vc9+faqE1iv2IiX8AYumhL+veRbg/uhhX+Onpz8FZoY24WDte5qqqKdE2t4yEaMT/PNt juw7/B8cc4cbFstNCD1nsWOPDWutOjOOs96G819XwjnHB5WoSc750Sxfi7+b6zd1mD6X NujroVNtgpnbujRQbHAf6NPaC/RMLjHW9KcJk5Kux72fhacbPfPRTbLPZ63iEElMVoIg eVJJ4zOsboWk2DNSQovAirARbdxHIPWm41G4hjmDZLq5E8XsneYzzohXnowRrfJ7NIuX W5gQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dgyKQIBz; 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 6a1803df08f44-6f6e3a42c99si86183556d6.189.2025.05.12.01.41.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 May 2025 01:41:50 -0700 (PDT) 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=dgyKQIBz; 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 1uEOj7-0007wi-Cd; Mon, 12 May 2025 04:41:36 -0400 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 1uEOhz-0007Eb-AX for qemu-devel@nongnu.org; Mon, 12 May 2025 04:40:29 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uEOhu-0001hZ-Nx for qemu-devel@nongnu.org; Mon, 12 May 2025 04:40:21 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-3a0b6aa08e5so3195000f8f.1 for ; Mon, 12 May 2025 01:40:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747039215; x=1747644015; 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=IixRHUe01KuZJgZLnpgydiMWWiime3ZZSmn+E7k3wcw=; b=dgyKQIBzJbIjjW3nLerrqaOjaINT9MvaHMVSuz/XCF65FiY5BbyWUF4Na4doKOWgRc bbeEdRjiGTEnWVQMEfrLU3/3tD7Nl6L44q657xnQAGA20K41moUzJ7h8Usyf45/TJVDa +T5kD7iAACA572N4wPDGAarbBFDa3vL/AFFh6cafrxKin5IrY8v9B6gjQAu8GnVkbrNW DPlCXRddFJkaKO4zC4r7schQGn32qR/p/vG4VUMu0P7FStvJmmj/IO9U8NIuPrwNRoEz enYheIimRIY6sgrgRzgv6eKbgtMNjpruRV7KMHIuhxtpgebN/SBx7iPEIJlzolEdcJJ2 eRYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747039215; x=1747644015; 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=IixRHUe01KuZJgZLnpgydiMWWiime3ZZSmn+E7k3wcw=; b=hOyKISo/Hzdnp6qaUwetvedS/cYxJRT3bhU0OdyZIOpPW0s0+GbWfURQNoYg2I07Q/ 4W/yOMk6GGG7PdqciELpQSxTEyjVEDzCGEyHFznW7uyfkv1jHvcY2kQVXoHWlurkz14K 3vnPld35/9bNUv6Da7Vd88f93mhxCL9hZknLNRuT4WzxuExbxLy/JbYg/VvP7HRotC6u uZVjJN9Fpk09kkdedPpxt43H6W97p0Y81reosuEf6ONfpVQ7AAbtJ7HLXI/X3HA5KZaz UniB9cj91lAKEBhSFSzk2eKdFE3qV8GYkId3nkIjh6Lm1wj74/Yw9hJ10upAsoRFVCjE y2qg== X-Gm-Message-State: AOJu0YxWad8/LCjuj/zwfyWvGI58fdcAXL8TobR5i8EOQTPlkiUA1nKa AHwcrTkZV0x9wlPL1Sf7oXxu0gXL/qsPA3xpwoUtjhmogCYg9N1PVfxrvw3bUDBpM0Ojisqosx8 YYcRggg== X-Gm-Gg: ASbGncs3+UBhvZRX/YauWavXWhxHtbwytCgpgdL1h5khAUr6k13JeM4WkuWuN1a6jxJ Fm5n+QmxQ+eXeFVapt+NLLz9TwPIYD7RrtJl47asaL9goF7GrIL5qR1eWzD9JWoBSyAIqnKKqk7 6lR/Dq51Qlv3nvUm0o3Cr2xwAd+MSNmhsbe9g4MgIphbGOu8qwl0eBiSYfgb050fF2vtAEFu5y0 gHcOe23Nco9TvdwcvH2fpAa71DQphaUFU8PRYMg1fBhQhT4PfoDY2fpsc9Ah95h95YY0wu1KIPP I04w/cQ75eHMAOUlWWUWosSqNutJSvh0yv8mHZoB6OBlj1zFQFed+b1ZbrhY+D15+00HxJpkJLD AKZFImokanNcyJvV0lU/XZTk= X-Received: by 2002:adf:fdcd:0:b0:3a1:f768:588a with SMTP id ffacd0b85a97d-3a1f7685969mr7962231f8f.10.1747039215080; Mon, 12 May 2025 01:40:15 -0700 (PDT) Received: from localhost.localdomain (129.163.185.81.rev.sfr.net. [81.185.163.129]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a1f58f2fc4sm11835252f8f.56.2025.05.12.01.40.11 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 12 May 2025 01:40:14 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yanan Wang , Kevin Wolf , Richard Henderson , Marcel Apfelbaum , qemu-block@nongnu.org, Fabiano Rosas , Fam Zheng , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= , Jason Wang , Laurent Vivier , Paolo Bonzini , Dmitry Fleytman , Eduardo Habkost , Hanna Reitz , Zhao Liu , John Snow , Gerd Hoffmann , "Michael S. Tsirkin" , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Thomas Huth Subject: [PATCH v4 02/19] hw/i386/pc: Remove PCMachineClass::broken_reserved_end field Date: Mon, 12 May 2025 10:39:31 +0200 Message-ID: <20250512083948.39294-3-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250512083948.39294-1-philmd@linaro.org> References: <20250512083948.39294-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=philmd@linaro.org; helo=mail-wr1-x42f.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=unavailable 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 The PCMachineClass::broken_reserved_end field was only used by the pc-q35-2.4 and pc-i440fx-2.4 machines, which got removed. Remove it and simplify pc_memory_init(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé Reviewed-by: Thomas Huth Reviewed-by: Zhao Liu --- include/hw/i386/pc.h | 1 - hw/i386/pc.c | 13 +++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 9563674e2da..f4a874b17fc 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -107,7 +107,6 @@ struct PCMachineClass { /* RAM / address space compat: */ bool gigabyte_align; bool has_reserved_memory; - bool broken_reserved_end; bool enforce_amd_1tb_hole; bool isa_bios_alias; diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 70656157ca0..c8bb4a3ee47 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -999,14 +999,13 @@ void pc_memory_init(PCMachineState *pcms, if (machine->device_memory) { uint64_t *val = g_malloc(sizeof(*val)); - uint64_t res_mem_end = machine->device_memory->base; - - if (!pcmc->broken_reserved_end) { - res_mem_end += memory_region_size(&machine->device_memory->mr); - } + uint64_t res_mem_end; if (pcms->cxl_devices_state.is_enabled) { res_mem_end = cxl_resv_end; + } else { + res_mem_end = machine->device_memory->base + + memory_region_size(&machine->device_memory->mr); } *val = cpu_to_le64(ROUND_UP(res_mem_end, 1 * GiB)); fw_cfg_add_file(fw_cfg, "etc/reserved-memory-end", val, sizeof(*val)); @@ -1044,9 +1043,7 @@ uint64_t pc_pci_hole64_start(void) hole64_start = pc_get_cxl_range_end(pcms); } else if (pcmc->has_reserved_memory && (ms->ram_size < ms->maxram_size)) { pc_get_device_memory_range(pcms, &hole64_start, &size); - if (!pcmc->broken_reserved_end) { - hole64_start += size; - } + hole64_start += size; } else { hole64_start = pc_above_4g_end(pcms); }