From patchwork Fri Apr 8 09:45:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 65379 Delivered-To: patch@linaro.org Received: by 10.112.43.237 with SMTP id z13csp569405lbl; Fri, 8 Apr 2016 02:46:14 -0700 (PDT) X-Received: by 10.107.4.10 with SMTP id 10mr9493960ioe.22.1460108762220; Fri, 08 Apr 2016 02:46:02 -0700 (PDT) Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id q90si3839881ioi.168.2016.04.08.02.46.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Apr 2016 02:46:02 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 1E2D21A1FD8; Fri, 8 Apr 2016 02:45:44 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-wm0-x22a.google.com (mail-wm0-x22a.google.com [IPv6:2a00:1450:400c:c09::22a]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 181F21A1FD3 for ; Fri, 8 Apr 2016 02:45:43 -0700 (PDT) Received: by mail-wm0-x22a.google.com with SMTP id v188so12592558wme.1 for ; Fri, 08 Apr 2016 02:45:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=eGB/7WHIQMjLlOPVbH2kH8A5fDK/pmj53RPVFqwLuZU=; b=gRNJ2Xcx3Z1ZRUx15iCkqxs/0jYJSBdDd6B0aLi3PrIXqqG5wbt2WxCWtvCLcMM+KJ iqDmtf4ktqlZDfttLbmWKqacc3L7f0I9umQlCHx0Lw361gdefBN5l9G1ACdUIUmpKQn1 w9FKUp9BfXilNXtI/iabKKn1HVPYiLZ3Vz91I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=eGB/7WHIQMjLlOPVbH2kH8A5fDK/pmj53RPVFqwLuZU=; b=l8hydrkFIPWpo4mng7triplhoZimr/55OecSnjG92frfn95AeeEGUmJxNR4PwDAR2C 3Iydz4/5ROl7rf1SraLMCn7qeR6O125CxSHA0Al3E2hdLN+55+QU+4orwkp8KiGDIGu8 EwQ+gUZdygey0ahWKTW0+SgqEX0I2h4IaM5fVweLbVB3Qm/f25WZVBeqMxOS2B3tYCry 7SLSLB6B+hMl6HvFXi3BI4PqI5SgeI5kIwEnCcWYvz0oSnZ/+MpddtX68ufd/+wQwrSR r2h3yLaeUpofH19D9El/AzCupeHFDm5zySu+1w+qX6iEIkcAu4o9fX+dxUTt11E7JegK PvXw== X-Gm-Message-State: AD7BkJL97G8IsFAZf75USMmdpdt4gl6wRsOkLYxl19wQ+Kj+7ZYwrLb/+Pl9MK5hMr5lRehH X-Received: by 10.194.190.6 with SMTP id gm6mr8486573wjc.115.1460108741788; Fri, 08 Apr 2016 02:45:41 -0700 (PDT) Received: from localhost.localdomain ([195.55.142.58]) by smtp.gmail.com with ESMTPSA id s10sm9710681wjp.3.2016.04.08.02.45.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 08 Apr 2016 02:45:41 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org, lersek@redhat.com Date: Fri, 8 Apr 2016 11:45:02 +0200 Message-Id: <1460108711-12122-16-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1460108711-12122-1-git-send-email-ard.biesheuvel@linaro.org> References: <1460108711-12122-1-git-send-email-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH v2 15/24] ArmVirtPkg/VirtFdtDxe: drop PCI host bridge handling X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Now that the PCI host bridge driver parses the DT node that describes the PCI host bridge directly via the FDT client protocol, we can drop the handling from VirtFdtDxe completely. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- ArmVirtPkg/ArmVirtQemu.dsc | 7 - ArmVirtPkg/ArmVirtQemuKernel.dsc | 7 - ArmVirtPkg/ArmVirtXen.dsc | 7 - ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.c | 203 -------------------- ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf | 9 - 5 files changed, 233 deletions(-) -- 2.5.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index 651cbfc84787..163b4bf612a3 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -212,13 +212,6 @@ [PcdsDynamicDefault.common] ## PL031 RealTimeClock gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x0 - gArmPlatformTokenSpaceGuid.PcdPciBusMin|0x0 - gArmPlatformTokenSpaceGuid.PcdPciBusMax|0x0 - gArmPlatformTokenSpaceGuid.PcdPciIoBase|0x0 - gArmPlatformTokenSpaceGuid.PcdPciIoSize|0x0 - gArmPlatformTokenSpaceGuid.PcdPciIoTranslation|0x0 - gArmPlatformTokenSpaceGuid.PcdPciMmio32Base|0x0 - gArmPlatformTokenSpaceGuid.PcdPciMmio32Size|0x0 gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x0 # diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc index e6306830c402..50b84e192304 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc @@ -197,13 +197,6 @@ [PcdsDynamicDefault.common] ## PL031 RealTimeClock gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x0 - gArmPlatformTokenSpaceGuid.PcdPciBusMin|0x0 - gArmPlatformTokenSpaceGuid.PcdPciBusMax|0x0 - gArmPlatformTokenSpaceGuid.PcdPciIoBase|0x0 - gArmPlatformTokenSpaceGuid.PcdPciIoSize|0x0 - gArmPlatformTokenSpaceGuid.PcdPciIoTranslation|0x0 - gArmPlatformTokenSpaceGuid.PcdPciMmio32Base|0x0 - gArmPlatformTokenSpaceGuid.PcdPciMmio32Size|0x0 gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x0 # diff --git a/ArmVirtPkg/ArmVirtXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc index 0af82be42913..2677c1900c49 100644 --- a/ArmVirtPkg/ArmVirtXen.dsc +++ b/ArmVirtPkg/ArmVirtXen.dsc @@ -133,13 +133,6 @@ [PcdsDynamicDefault.common] ## PL031 RealTimeClock gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x0 - gArmPlatformTokenSpaceGuid.PcdPciBusMin|0x0 - gArmPlatformTokenSpaceGuid.PcdPciBusMax|0x0 - gArmPlatformTokenSpaceGuid.PcdPciIoBase|0x0 - gArmPlatformTokenSpaceGuid.PcdPciIoSize|0x0 - gArmPlatformTokenSpaceGuid.PcdPciIoTranslation|0x0 - gArmPlatformTokenSpaceGuid.PcdPciMmio32Base|0x0 - gArmPlatformTokenSpaceGuid.PcdPciMmio32Size|0x0 gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x0 gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|3 diff --git a/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.c b/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.c index 0a47092e35ce..31e0ca7db8b4 100644 --- a/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.c +++ b/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.c @@ -45,7 +45,6 @@ typedef enum { PropertyTypeRtc, PropertyTypeVirtio, PropertyTypeUart, - PropertyTypePciHost, PropertyTypeXen, } PROPERTY_TYPE; @@ -58,7 +57,6 @@ STATIC CONST PROPERTY CompatibleProperties[] = { { PropertyTypeRtc, "arm,pl031" }, { PropertyTypeVirtio, "virtio,mmio" }, { PropertyTypeUart, "arm,pl011" }, - { PropertyTypePciHost, "pci-host-ecam-generic" }, { PropertyTypeXen, "xen,xen" }, { PropertyTypeUnknown, "" } }; @@ -88,176 +86,6 @@ GetTypeFromNode ( return PropertyTypeUnknown; } -// -// We expect the "ranges" property of "pci-host-ecam-generic" to consist of -// records like this. -// -#pragma pack (1) -typedef struct { - UINT32 Type; - UINT64 ChildBase; - UINT64 CpuBase; - UINT64 Size; -} DTB_PCI_HOST_RANGE_RECORD; -#pragma pack () - -#define DTB_PCI_HOST_RANGE_RELOCATABLE BIT31 -#define DTB_PCI_HOST_RANGE_PREFETCHABLE BIT30 -#define DTB_PCI_HOST_RANGE_ALIASED BIT29 -#define DTB_PCI_HOST_RANGE_MMIO32 BIT25 -#define DTB_PCI_HOST_RANGE_MMIO64 (BIT25 | BIT24) -#define DTB_PCI_HOST_RANGE_IO BIT24 -#define DTB_PCI_HOST_RANGE_TYPEMASK (BIT31 | BIT30 | BIT29 | BIT25 | BIT24) - -/** - Process the device tree node describing the generic PCI host controller. - - param[in] DeviceTreeBase Pointer to the device tree. - - param[in] Node Offset of the device tree node whose "compatible" - property is "pci-host-ecam-generic". - - param[in] RegProp Pointer to the "reg" property of Node. The caller - is responsible for ensuring that the size of the - property is 4 UINT32 cells. - - @retval EFI_SUCCESS Parsing successful, properties parsed from Node - have been stored in dynamic PCDs. - - @retval EFI_PROTOCOL_ERROR Parsing failed. PCDs are left unchanged. -**/ -STATIC -EFI_STATUS -EFIAPI -ProcessPciHost ( - IN CONST VOID *DeviceTreeBase, - IN INT32 Node, - IN CONST VOID *RegProp - ) -{ - UINT64 ConfigBase, ConfigSize; - CONST VOID *Prop; - INT32 Len; - UINT32 BusMin, BusMax; - UINT32 RecordIdx; - UINT64 IoBase, IoSize, IoTranslation; - UINT64 MmioBase, MmioSize, MmioTranslation; - - // - // Fetch the ECAM window. - // - ConfigBase = fdt64_to_cpu (((CONST UINT64 *)RegProp)[0]); - ConfigSize = fdt64_to_cpu (((CONST UINT64 *)RegProp)[1]); - - // - // Fetch the bus range (note: inclusive). - // - Prop = fdt_getprop (DeviceTreeBase, Node, "bus-range", &Len); - if (Prop == NULL || Len != 2 * sizeof(UINT32)) { - DEBUG ((EFI_D_ERROR, "%a: 'bus-range' not found or invalid\n", - __FUNCTION__)); - return EFI_PROTOCOL_ERROR; - } - BusMin = fdt32_to_cpu (((CONST UINT32 *)Prop)[0]); - BusMax = fdt32_to_cpu (((CONST UINT32 *)Prop)[1]); - - // - // Sanity check: the config space must accommodate all 4K register bytes of - // all 8 functions of all 32 devices of all buses. - // - if (BusMax < BusMin || BusMax - BusMin == MAX_UINT32 || - DivU64x32 (ConfigSize, SIZE_4KB * 8 * 32) < BusMax - BusMin + 1) { - DEBUG ((EFI_D_ERROR, "%a: invalid 'bus-range' and/or 'reg'\n", - __FUNCTION__)); - return EFI_PROTOCOL_ERROR; - } - - // - // Iterate over "ranges". - // - Prop = fdt_getprop (DeviceTreeBase, Node, "ranges", &Len); - if (Prop == NULL || Len == 0 || - Len % sizeof (DTB_PCI_HOST_RANGE_RECORD) != 0) { - DEBUG ((EFI_D_ERROR, "%a: 'ranges' not found or invalid\n", __FUNCTION__)); - return EFI_PROTOCOL_ERROR; - } - - // - // IoBase, IoTranslation, MmioBase and MmioTranslation are initialized only - // in order to suppress '-Werror=maybe-uninitialized' warnings *incorrectly* - // emitted by some gcc versions. - // - IoBase = 0; - IoTranslation = 0; - MmioBase = 0; - MmioTranslation = 0; - - // - // IoSize and MmioSize are initialized to zero because the logic below - // requires it. - // - IoSize = 0; - MmioSize = 0; - for (RecordIdx = 0; RecordIdx < Len / sizeof (DTB_PCI_HOST_RANGE_RECORD); - ++RecordIdx) { - CONST DTB_PCI_HOST_RANGE_RECORD *Record; - - Record = (CONST DTB_PCI_HOST_RANGE_RECORD *)Prop + RecordIdx; - switch (fdt32_to_cpu (Record->Type) & DTB_PCI_HOST_RANGE_TYPEMASK) { - case DTB_PCI_HOST_RANGE_IO: - IoBase = fdt64_to_cpu (Record->ChildBase); - IoSize = fdt64_to_cpu (Record->Size); - IoTranslation = fdt64_to_cpu (Record->CpuBase) - IoBase; - break; - - case DTB_PCI_HOST_RANGE_MMIO32: - MmioBase = fdt64_to_cpu (Record->ChildBase); - MmioSize = fdt64_to_cpu (Record->Size); - MmioTranslation = fdt64_to_cpu (Record->CpuBase) - MmioBase; - - if (MmioBase > MAX_UINT32 || MmioSize > MAX_UINT32 || - MmioBase + MmioSize > SIZE_4GB) { - DEBUG ((EFI_D_ERROR, "%a: MMIO32 space invalid\n", __FUNCTION__)); - return EFI_PROTOCOL_ERROR; - } - - if (MmioTranslation != 0) { - DEBUG ((EFI_D_ERROR, "%a: unsupported nonzero MMIO32 translation " - "0x%Lx\n", __FUNCTION__, MmioTranslation)); - return EFI_UNSUPPORTED; - } - - break; - } - } - if (IoSize == 0 || MmioSize == 0) { - DEBUG ((EFI_D_ERROR, "%a: %a space empty\n", __FUNCTION__, - (IoSize == 0) ? "IO" : "MMIO32")); - return EFI_PROTOCOL_ERROR; - } - - PcdSet64 (PcdPciExpressBaseAddress, ConfigBase); - - PcdSet32 (PcdPciBusMin, BusMin); - PcdSet32 (PcdPciBusMax, BusMax); - - PcdSet64 (PcdPciIoBase, IoBase); - PcdSet64 (PcdPciIoSize, IoSize); - PcdSet64 (PcdPciIoTranslation, IoTranslation); - - PcdSet32 (PcdPciMmio32Base, (UINT32)MmioBase); - PcdSet32 (PcdPciMmio32Size, (UINT32)MmioSize); - - PcdSetBool (PcdPciDisableBusEnumeration, FALSE); - - DEBUG ((EFI_D_INFO, "%a: Config[0x%Lx+0x%Lx) Bus[0x%x..0x%x] " - "Io[0x%Lx+0x%Lx)@0x%Lx Mem[0x%Lx+0x%Lx)@0x%Lx\n", __FUNCTION__, ConfigBase, - ConfigSize, BusMin, BusMax, IoBase, IoSize, IoTranslation, MmioBase, - MmioSize, MmioTranslation)); - return EFI_SUCCESS; -} - - EFI_STATUS EFIAPI InitializeVirtFdtDxe ( @@ -277,7 +105,6 @@ InitializeVirtFdtDxe ( VIRTIO_TRANSPORT_DEVICE_PATH *DevicePath; EFI_HANDLE Handle; UINT64 RegBase; - BOOLEAN HavePci; Hob = GetFirstGuidHob(&gFdtHobGuid); if (Hob == NULL || GET_GUID_HOB_DATA_SIZE (Hob) != sizeof (UINT64)) { @@ -293,7 +120,6 @@ InitializeVirtFdtDxe ( DEBUG ((EFI_D_INFO, "%a: DTB @ 0x%p\n", __FUNCTION__, DeviceTreeBase)); RtcNode = -1; - HavePci = FALSE; // // Now enumerate the nodes and install peripherals that we are interested in, // i.e., GIC, RTC and virtio MMIO nodes @@ -323,13 +149,6 @@ InitializeVirtFdtDxe ( ASSERT (RegProp != NULL); switch (PropType) { - case PropertyTypePciHost: - ASSERT (Len == 2 * sizeof (UINT64)); - Status = ProcessPciHost (DeviceTreeBase, Node, RegProp); - ASSERT_EFI_ERROR (Status); - HavePci = TRUE; - break; - case PropertyTypeVirtio: ASSERT (Len == 16); // @@ -433,28 +252,6 @@ InitializeVirtFdtDxe ( "disabled") != 0) { DEBUG ((EFI_D_WARN, "Failed to set PL031 status to 'disabled'\n")); } - - if (HavePci) { - // - // Set the /chosen/linux,pci-probe-only property to 1, so that the PCI - // setup we will perform in the firmware is honored by the Linux OS, - // rather than torn down and done from scratch. This is generally a more - // sensible approach, and aligns with what ACPI based OSes do in general. - // - // In case we are exposing an emulated VGA PCI device to the guest, which - // may subsequently get exposed via the Graphics Output protocol and - // driven as an efifb by Linux, we need this setting to prevent the - // framebuffer from becoming unresponsive. - // - Node = fdt_path_offset (DeviceTreeBase, "/chosen"); - if (Node < 0) { - Node = fdt_add_subnode (DeviceTreeBase, 0, "/chosen"); - } - if (Node < 0 || - fdt_setprop_u32 (DeviceTreeBase, Node, "linux,pci-probe-only", 1) < 0) { - DEBUG ((EFI_D_WARN, "Failed to set /chosen/linux,pci-probe-only property\n")); - } - } } return EFI_SUCCESS; } diff --git a/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf b/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf index 6c8ba68599ae..8ebce337747f 100644 --- a/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf +++ b/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf @@ -51,15 +51,6 @@ [Guids] [Pcd] gArmPlatformTokenSpaceGuid.PcdPL031RtcBase - gArmPlatformTokenSpaceGuid.PcdPciBusMin - gArmPlatformTokenSpaceGuid.PcdPciBusMax - gArmPlatformTokenSpaceGuid.PcdPciIoBase - gArmPlatformTokenSpaceGuid.PcdPciIoSize - gArmPlatformTokenSpaceGuid.PcdPciIoTranslation - gArmPlatformTokenSpaceGuid.PcdPciMmio32Base - gArmPlatformTokenSpaceGuid.PcdPciMmio32Size - gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress - gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration [FeaturePcd] gArmVirtTokenSpaceGuid.PcdPureAcpiBoot