From nobody Tue Feb 10 06:58:42 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=oracle.com ARC-Seal: i=1; a=rsa-sha256; t=1657824261; cv=none; d=zohomail.com; s=zohoarc; b=mJlJ9g5dE/BgxDva5+ikavPJ2bMATJmX8YyhkhPDinZzJDE8QPpq+smb58VtgUxZITIoIHdjjldvhDGWsaQrk+0TvEwWQ6leeDLteKTuDR/eUtuQB7EqQAmcIRZQBX3HcGhH95EldzqjpIYkvR19wiQvuMgmCaHP3xa8UpuBFUc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657824261; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=QMNe8ckb12GEwHvHx5t8fcVVzc8ilxAjIE96wJm3nAE=; b=dhi1DNcN98wTgjBs7J52qlHhk5Ak6KARS212k0kvTqOpBKXEV8rIYEIHxay0bR3CMeXILMK8+r9ecJhf6QRtaPUk/WJs+DvJ97N3MCqeNN4We4y8O90UHqgYDb5Trnnqh9PfplNeh7ChPEvDUF0natJIDWIy1oJcKTiLcq+mDJk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1657824261040930.2053625149911; Thu, 14 Jul 2022 11:44:21 -0700 (PDT) Received: from localhost ([::1]:47504 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oC3ox-0001Cz-VT for importer@patchew.org; Thu, 14 Jul 2022 14:44:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37488) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oC3aU-0006UJ-1B for qemu-devel@nongnu.org; Thu, 14 Jul 2022 14:29:23 -0400 Received: from mx0b-00069f02.pphosted.com ([205.220.177.32]:45932) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oC3aS-0008Ah-FB for qemu-devel@nongnu.org; Thu, 14 Jul 2022 14:29:21 -0400 Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 26EG79YR026610; Thu, 14 Jul 2022 18:29:13 GMT Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3h71r1dhy7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 14 Jul 2022 18:29:13 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.16.1.2/8.16.1.2) with SMTP id 26EIGsEZ022699; Thu, 14 Jul 2022 18:29:13 GMT Received: from pps.reinject (localhost [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com with ESMTP id 3h70465jxh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 14 Jul 2022 18:29:13 +0000 Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.16.0.36/8.16.0.36) with SMTP id 26EISiAL017868; Thu, 14 Jul 2022 18:29:12 GMT Received: from paddy.uk.oracle.com (dhcp-10-175-172-165.vpn.oracle.com [10.175.172.165]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com with ESMTP id 3h70465j62-8; Thu, 14 Jul 2022 18:29:12 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2021-07-09; bh=QMNe8ckb12GEwHvHx5t8fcVVzc8ilxAjIE96wJm3nAE=; b=EHUKcQdasr5resjdYI0fU7fTKTMXJbFuc/LKiLrf0vp7WwmtJJWbEVI7UXZXzIfuTonu sKnuHnBpmlJWj20f08g8a4l5hwTSDwLQF0aIvV0mQE/0JcR0gxaq9xUfmYC/h2SiSd0K qcEavpSZHvMbd1/N6m9sFdLaKvW32Q9npT0vq86cIcXibpkoJQMSjje7zuiP4wos5V7G n6jG4w70V4Bt+det0v46ju1AvvGBKgWyQ/K11d4HRomzX99AJqSBTAQN2XnncOT4g3hm URFqMXog2qJrhWHrFAzPgUdDg6Cgk0O7GWA+Tck7OjVqW2zW5Yct/Tan1/8MJpMnTBog Iw== From: Joao Martins To: qemu-devel@nongnu.org Cc: Igor Mammedov , Eduardo Habkost , "Michael S. Tsirkin" , Richard Henderson , Alex Williamson , Paolo Bonzini , Ani Sinha , Marcel Apfelbaum , "Dr. David Alan Gilbert" , Suravee Suthikulpanit , Joao Martins , Jonathan Cameron Subject: [PATCH v7 07/10] i386/pc: handle unitialized mr in pc_get_cxl_range_end() Date: Thu, 14 Jul 2022 19:28:17 +0100 Message-Id: <20220714182820.30970-8-joao.m.martins@oracle.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20220714182820.30970-1-joao.m.martins@oracle.com> References: <20220714182820.30970-1-joao.m.martins@oracle.com> X-Proofpoint-ORIG-GUID: m22fcFL5xFBiaX5Nggr0E2tOtdKJYIYm X-Proofpoint-GUID: m22fcFL5xFBiaX5Nggr0E2tOtdKJYIYm Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.220.177.32; envelope-from=joao.m.martins@oracle.com; helo=mx0b-00069f02.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @oracle.com) X-ZM-MESSAGEID: 1657824261884100001 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Remove pc_get_cxl_range_end() dependency on the CXL memory region, and replace with one that does not require the CXL host_mr to determine the start of CXL start. This in preparation to allow pc_pci_hole64_start() to be called early in pc_memory_init(), handle CXL memory region end when its underlying memory region isn't yet initialized. Cc: Jonathan Cameron Signed-off-by: Joao Martins --- hw/i386/pc.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 3fdcab4bb4f3..c654be6cf0bd 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -843,17 +843,15 @@ static uint64_t pc_get_cxl_range_start(PCMachineState= *pcms) =20 static uint64_t pc_get_cxl_range_end(PCMachineState *pcms) { - uint64_t start =3D 0; + uint64_t start =3D pc_get_cxl_range_start(pcms) + MiB; =20 - if (pcms->cxl_devices_state.host_mr.addr) { - start =3D pcms->cxl_devices_state.host_mr.addr + - memory_region_size(&pcms->cxl_devices_state.host_mr); - if (pcms->cxl_devices_state.fixed_windows) { - GList *it; - for (it =3D pcms->cxl_devices_state.fixed_windows; it; it =3D = it->next) { - CXLFixedWindow *fw =3D it->data; - start =3D fw->mr.addr + memory_region_size(&fw->mr); - } + if (pcms->cxl_devices_state.fixed_windows) { + GList *it; + + start =3D ROUND_UP(start, 256 * MiB); + for (it =3D pcms->cxl_devices_state.fixed_windows; it; it =3D it->= next) { + CXLFixedWindow *fw =3D it->data; + start +=3D fw->size; } } =20 --=20 2.17.2