From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.groups.io with SMTP id smtpd.web09.27941.1650882908880469168 for ; Mon, 25 Apr 2022 03:35:09 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=FKYPL0/9; spf=pass (domain: redhat.com, ip: 170.10.129.124, mailfrom: kraxel@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1650882908; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ck8SWNVgz4AZ3lvtyvC/MZbnU8zZ5kUfk+6WHGSlkfo=; b=FKYPL0/9MQuSvZxSfLvITlmS6qP0gn/fbuGZpi/wE6Nb+OwdttoGx90DJ3j6cq86G/NScS YLnf/M7ZWuvPZf2De2oOnIm79vYvdD1HA53tK4AcfPoqgAc7AouFrwvZvWMHj+F2+RQhEa GkYPgAeV/xgQEB9zgEj60KSIMlwaBLI= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-401-yMXZzy-jOIS8tPH_ZSTz_Q-1; Mon, 25 Apr 2022 06:35:05 -0400 X-MC-Unique: yMXZzy-jOIS8tPH_ZSTz_Q-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7D34B805F46; Mon, 25 Apr 2022 10:35:04 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.192.9]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C215F2166B2F; Mon, 25 Apr 2022 10:34:51 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id CF76F1800617; Mon, 25 Apr 2022 12:34:46 +0200 (CEST) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Jiewen Yao , Oliver Steffen , Leif Lindholm , Pawel Polawski , Hao A Wu , Abner Chang , Liming Gao , Ray Ni , Jordan Justen , Jian J Wang , Ard Biesheuvel , Gerd Hoffmann Subject: [PATCH v6 2/6] OvmfPkg/FdtPciHostBridgeLib: io range is not mandatory Date: Mon, 25 Apr 2022 12:34:42 +0200 Message-Id: <20220425103446.496763-3-kraxel@redhat.com> In-Reply-To: <20220425103446.496763-1-kraxel@redhat.com> References: <20220425103446.496763-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true io range is not mandatory according to pcie spec, so allow host bridges without io address space. Signed-off-by: Gerd Hoffmann --- .../FdtPciHostBridgeLib/FdtPciHostBridgeLib.c | 45 ++++++++++--------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.c b/OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.c index 98828e0b262b..14b41a533e96 100644 --- a/OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.c +++ b/OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.c @@ -292,13 +292,8 @@ ProcessPciHost ( } } - if ((*IoSize == 0) || (*Mmio32Size == 0)) { - DEBUG (( - DEBUG_ERROR, - "%a: %a space empty\n", - __FUNCTION__, - (*IoSize == 0) ? "IO" : "MMIO32" - )); + if (*Mmio32Size == 0) { + DEBUG ((DEBUG_ERROR, "%a: MMIO32 space empty\n", __FUNCTION__)); return EFI_PROTOCOL_ERROR; } @@ -333,13 +328,15 @@ ProcessPciHost ( return Status; } - // - // Map the MMIO window that provides I/O access - the PCI host bridge code - // is not aware of this translation and so it will only map the I/O view - // in the GCD I/O map. - // - Status = MapGcdMmioSpace (*IoBase + IoTranslation, *IoSize); - ASSERT_EFI_ERROR (Status); + if (*IoSize != 0) { + // + // Map the MMIO window that provides I/O access - the PCI host bridge code + // is not aware of this translation and so it will only map the I/O view + // in the GCD I/O map. + // + Status = MapGcdMmioSpace (*IoBase + IoTranslation, *IoSize); + ASSERT_EFI_ERROR (Status); + } return Status; } @@ -413,17 +410,21 @@ PciHostBridgeGetRootBridges ( AllocationAttributes = EFI_PCI_HOST_BRIDGE_COMBINE_MEM_PMEM; - Io.Base = IoBase; - Io.Limit = IoBase + IoSize - 1; + if (IoSize != 0) { + Io.Base = IoBase; + Io.Limit = IoBase + IoSize - 1; + } else { + Io.Base = MAX_UINT64; + Io.Limit = 0; + } + Mem.Base = Mmio32Base; Mem.Limit = Mmio32Base + Mmio32Size - 1; - if (sizeof (UINTN) == sizeof (UINT64)) { - MemAbove4G.Base = Mmio64Base; - MemAbove4G.Limit = Mmio64Base + Mmio64Size - 1; - if (Mmio64Size > 0) { - AllocationAttributes |= EFI_PCI_HOST_BRIDGE_MEM64_DECODE; - } + if ((sizeof (UINTN) == sizeof (UINT64)) && (Mmio64Size != 0)) { + MemAbove4G.Base = Mmio64Base; + MemAbove4G.Limit = Mmio64Base + Mmio64Size - 1; + AllocationAttributes |= EFI_PCI_HOST_BRIDGE_MEM64_DECODE; } else { // // UEFI mandates a 1:1 virtual-to-physical mapping, so on a 32-bit -- 2.35.1