From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8577EC43334 for ; Fri, 1 Jul 2022 16:30:14 +0000 (UTC) Received: from localhost ([::1]:55870 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o7JX3-0005WK-GU for qemu-devel@archiver.kernel.org; Fri, 01 Jul 2022 12:30:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46990) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o7JEp-0000kZ-6O for qemu-devel@nongnu.org; Fri, 01 Jul 2022 12:11:24 -0400 Received: from mx0b-00069f02.pphosted.com ([205.220.177.32]:6862) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o7JEn-0002qB-Kd for qemu-devel@nongnu.org; Fri, 01 Jul 2022 12:11:22 -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 261G2vIM002381; Fri, 1 Jul 2022 16:11:10 GMT 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=VJlmpe4pYK56nIEHjuZWkSH5o0PHsSFuupV7x9j3pJ4=; b=tUthhc4ZnuAD23cgC1dxihfT0zruFf47wvaBCRd+P+IkV3YvaTLS1jHDpwdtw74VQELH N6r8ylkFvyxHZnwTaWMDehg7jV7okolfw6hmamGj5HXjkggluULijp9K3Qf6nJHWPAmW 7UIku5A8Z0fbBcEM4gwmHOyMD2eJwUJ783nmDFwJplueaMPJ19qHzSz84wD+Pmtb0q7K OEf5fR+ld7tarZeXQJBMuyoI/zYI1fPGdtDe4GRFT6blHdUiuhEEOfUc+ErX4qmqC11Z xeZn4ru32WHHj/gemV6T5H3LGOpD63Wh1/kwix4SKryB55min9n6LkL0DUMv7GOk1t5U BA== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3gwrscq9hj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 01 Jul 2022 16:11:10 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.16.1.2/8.16.1.2) with SMTP id 261G5h8g016107; Fri, 1 Jul 2022 16:11:09 GMT Received: from pps.reinject (localhost [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com with ESMTP id 3gwrt4sw8j-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 01 Jul 2022 16:11:09 +0000 Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.16.0.36/8.16.0.36) with SMTP id 261GAftQ029065; Fri, 1 Jul 2022 16:11:09 GMT Received: from paddy.uk.oracle.com (dhcp-10-175-184-247.vpn.oracle.com [10.175.184.247]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com with ESMTP id 3gwrt4svtm-8; Fri, 01 Jul 2022 16:11:08 +0000 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 v6 07/10] i386/pc: handle unitialized mr in pc_get_cxl_range_end() Date: Fri, 1 Jul 2022 17:10:11 +0100 Message-Id: <20220701161014.3850-8-joao.m.martins@oracle.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20220701161014.3850-1-joao.m.martins@oracle.com> References: <20220701161014.3850-1-joao.m.martins@oracle.com> X-Proofpoint-ORIG-GUID: 0VsQps7W65mOJs6avNlHINTotK0dSlQ6 X-Proofpoint-GUID: 0VsQps7W65mOJs6avNlHINTotK0dSlQ6 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 8655cc3b8894..d6dff71012ab 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -857,6 +857,19 @@ static uint64_t pc_get_cxl_range_end(PCMachineState *pcms) start = fw->mr.addr + memory_region_size(&fw->mr); } } + } else { + hwaddr cxl_size = MiB; + + start = pc_get_cxl_range_start(pcms); + if (pcms->cxl_devices_state.fixed_windows) { + GList *it; + + start = ROUND_UP(start + cxl_size, 256 * MiB); + for (it = pcms->cxl_devices_state.fixed_windows; it; it = it->next) { + CXLFixedWindow *fw = it->data; + start += fw->size; + } + } } return start; -- 2.17.2