From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c09::242; helo=mail-wm0-x242.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) (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 8855A202E53E8 for ; Tue, 26 Jun 2018 03:44:31 -0700 (PDT) Received: by mail-wm0-x242.google.com with SMTP id x6-v6so1324037wmc.3 for ; Tue, 26 Jun 2018 03:44:31 -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=dh9E9ZL1kkwDK7Vjpkvh1WhzMDl3Lw0uYUeUc00UC6A=; b=S984D2RJKAzCY+ElstbArskpT669MXg3PaCWP6zete7nYK2OrvHgJVm4SmznYT3ZGd KtQ7HSd46WmS2FRowgbssAvPhdVluU3YFoOO6lbAjKdRrZcpqAvxhGO1R5+1B7Ts20qF Rz/FkeRkK+PaS8k8YSWSfp5hOt99PnwNwiQhU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dh9E9ZL1kkwDK7Vjpkvh1WhzMDl3Lw0uYUeUc00UC6A=; b=owZKOz31SJUcBYAYGx2ccDw2KAVxdOgHosvzU91zteKZvnYxywjrcJZGiPlWqZAokp achL3cNg+e3eBI9EGS5fxoDImPBJxUK97q5zxCvAQJQOadb5xjvFE1zN68/jAbQG9WtE OS+M53rgdcnKycvSuVso2mWYL/EKC+4OHomTJbUrmRMghQi7s3fmVgEkXSsBHqN525Bu SlsrdhCTcs9OJGC/mzQ33nVsaxm4djgOzkezVkv75CMOjxQ2vQ3wyf4j2OWRktpffJzu DkVCd1yBfRdkbxG3winkS4QIHTgM0DsdXAc3I9eBLyN/AeF1IRd7zfzOvs1eXLVzwQCi VsUw== X-Gm-Message-State: APt69E2QkZg4B4iNAtlSQyHWOluX+ZFBiuomeZIt1MLeKGrFP1Y4HeIi STqKiOuiawyIKBgc8NJEcLosE56fYfA= X-Google-Smtp-Source: AAOMgpeCyY53n9d9KHk5iswrFRZ1eNFTjsmC7I+Pf6yBJIrlNdGnUQVYicnwh+D6ZSAWawImw67AqQ== X-Received: by 2002:a1c:d7c3:: with SMTP id o186-v6mr1138107wmg.67.1530009869889; Tue, 26 Jun 2018 03:44:29 -0700 (PDT) Received: from dogfood.home ([2a01:cb1d:112:6f00:a044:5ea2:f748:d67a]) by smtp.gmail.com with ESMTPSA id m58-v6sm2557745wrf.61.2018.06.26.03.44.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Jun 2018 03:44:29 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org Cc: leif.lindholm@linaro.org, Ard Biesheuvel Date: Tue, 26 Jun 2018 12:44:24 +0200 Message-Id: <20180626104424.3524-3-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180626104424.3524-1-ard.biesheuvel@linaro.org> References: <20180626104424.3524-1-ard.biesheuvel@linaro.org> Subject: [PATCH edk2-platforms 2/2] Silicon/Socionext/SynQuacer: use single translated MMIO window for PCI1 X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Jun 2018 10:44:32 -0000 For testing purposes, reconfigure the second PCI host bridge to only expose a single MMIO window of 512 MB in size, and map it below 4 GB on the PCI side (so 32-bit BARs can be allocated from it) and above 4 GB on the CPU side. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Silicon/Socionext/SynQuacer/AcpiTables/AcpiSsdtRootPci.asl | 11 ----------- Silicon/Socionext/SynQuacer/DeviceTree/SynQuacer.dtsi | 11 +++++------ Silicon/Socionext/SynQuacer/Include/Platform/Pcie.h | 20 ++++++++++---------- Silicon/Socionext/SynQuacer/Library/SynQuacerPciHostBridgeLib/SynQuacerPciHostBridgeLib.c | 5 ++--- 4 files changed, 17 insertions(+), 30 deletions(-) diff --git a/Silicon/Socionext/SynQuacer/AcpiTables/AcpiSsdtRootPci.asl b/Silicon/Socionext/SynQuacer/AcpiTables/AcpiSsdtRootPci.asl index 77d4763d1a85..e59d4cf98ebe 100644 --- a/Silicon/Socionext/SynQuacer/AcpiTables/AcpiSsdtRootPci.asl +++ b/Silicon/Socionext/SynQuacer/AcpiTables/AcpiSsdtRootPci.asl @@ -235,17 +235,6 @@ DefinitionBlock ("SsdtPci.aml", "SSDT", 1, "SNI", "SYNQUACR", SYNQUACER_PCI_SEG1_MMIO32_SIZE // Length ) - QWordMemory ( // 64-bit BAR Windows - ResourceProducer, PosDecode, - MinFixed, MaxFixed, - Cacheable, ReadWrite, - 0x00000000, // Granularity - SYNQUACER_PCI_SEG1_MMIO64_MIN, // Min Base Address - SYNQUACER_PCI_SEG1_MMIO64_MAX, // Max Base Address - 0x00000000, // Translate - SYNQUACER_PCI_SEG1_MMIO64_SIZE // Length - ) - DWordIo ( // IO window ResourceProducer, MinFixed, diff --git a/Silicon/Socionext/SynQuacer/DeviceTree/SynQuacer.dtsi b/Silicon/Socionext/SynQuacer/DeviceTree/SynQuacer.dtsi index 37d642e4b237..57d111c65bc2 100644 --- a/Silicon/Socionext/SynQuacer/DeviceTree/SynQuacer.dtsi +++ b/Silicon/Socionext/SynQuacer/DeviceTree/SynQuacer.dtsi @@ -478,19 +478,18 @@ pcie1: pcie@70000000 { compatible = "socionext,synquacer-pcie-ecam", "snps,dw-pcie-ecam"; device_type = "pci"; - reg = <0x0 0x70000000 0x0 0x7f00000>; - bus-range = <0x0 0x7e>; + reg = <0x0 0x70000000 0x0 0xff00000>; + bus-range = <0x0 0xfe>; #address-cells = <3>; #size-cells = <2>; - ranges = <0x1000000 0x00 0x00000000 0x00 0x77f00000 0x0 0x00010000>, - <0x2000000 0x00 0x78000000 0x00 0x78000000 0x0 0x08000000>, - <0x3000000 0x3f 0x00000000 0x3f 0x00000000 0x1 0x00000000>; + ranges = <0x1000000 0x00 0x00000000 0x00 0x7ff00000 0x0 0x00010000>, + <0x2000000 0x3f 0xe0000000 0x00 0x20000000 0x0 0x20000000>; #interrupt-cells = <0x1>; interrupt-map-mask = <0x0 0x0 0x0 0x0>; interrupt-map = <0x0 0x0 0x0 0x0 &gic 0x0 0x0 GIC_SPI 182 IRQ_TYPE_LEVEL_HIGH>; - msi-map = <0x0 &its 0x10000 0x7f00>; + msi-map = <0x0 &its 0x10000 0xff00>; dma-coherent; }; diff --git a/Silicon/Socionext/SynQuacer/Include/Platform/Pcie.h b/Silicon/Socionext/SynQuacer/Include/Platform/Pcie.h index 798f59db2a94..643c1a581d0a 100644 --- a/Silicon/Socionext/SynQuacer/Include/Platform/Pcie.h +++ b/Silicon/Socionext/SynQuacer/Include/Platform/Pcie.h @@ -41,28 +41,28 @@ #define SYNQUACER_PCI_SEG0_MMIO64_SIZE 0x100000000 #define SYNQUACER_PCI_SEG1_CONFIG_BASE 0x70000000 -#define SYNQUACER_PCI_SEG1_CONFIG_SIZE 0x07f00000 +#define SYNQUACER_PCI_SEG1_CONFIG_SIZE 0x0ff00000 #define SYNQUACER_PCI_SEG1_DBI_BASE 0x583c0000 #define SYNQUACER_PCI_SEG1_EXS_BASE 0x58380000 #define SYNQUACER_PCI_SEG1_BUSNUM_MIN 0x0 -#define SYNQUACER_PCI_SEG1_BUSNUM_MAX 0x7e -#define SYNQUACER_PCI_SEG1_BUSNUM_RANGE 0x7f +#define SYNQUACER_PCI_SEG1_BUSNUM_MAX 0xfe +#define SYNQUACER_PCI_SEG1_BUSNUM_RANGE 0xff #define SYNQUACER_PCI_SEG1_PORTIO_MIN 0x0 #define SYNQUACER_PCI_SEG1_PORTIO_MAX 0xffff -#define SYNQUACER_PCI_SEG1_PORTIO_MEMBASE 0x77f00000 +#define SYNQUACER_PCI_SEG1_PORTIO_MEMBASE 0x7ff00000 #define SYNQUACER_PCI_SEG1_PORTIO_MEMSIZE 0x10000 #define SYNQUACER_PCI_SEG1_PORTIO_OFFSET 0x10000 -#define SYNQUACER_PCI_SEG1_MMIO32_MIN 0x78000000 -#define SYNQUACER_PCI_SEG1_MMIO32_MAX 0x7fffffff -#define SYNQUACER_PCI_SEG1_MMIO32_SIZE 0x08000000 -#define SYNQUACER_PCI_SEG1_MMIO32_XLATE 0x0 +#define SYNQUACER_PCI_SEG1_MMIO32_MIN 0x20000000 +#define SYNQUACER_PCI_SEG1_MMIO32_MAX 0x3fffffff +#define SYNQUACER_PCI_SEG1_MMIO32_SIZE 0x20000000 +#define SYNQUACER_PCI_SEG1_MMIO32_XLATE 0x3fc0000000 #define SYNQUACER_PCI_SEG1_MMIO64_MIN 0x3f00000000 -#define SYNQUACER_PCI_SEG1_MMIO64_MAX 0x3fffffffff -#define SYNQUACER_PCI_SEG1_MMIO64_SIZE 0x100000000 +#define SYNQUACER_PCI_SEG1_MMIO64_MAX 0x3fdfffffff +#define SYNQUACER_PCI_SEG1_MMIO64_SIZE 0xe0000000 #define SYNQUACER_PCI_LOCATION(s,b,d) (((s) << 16) | ((b) << 8) | (d)) #define SYNQUACER_PCI_SLOT0_LOCATION SYNQUACER_PCI_LOCATION(1, 0, 0) diff --git a/Silicon/Socionext/SynQuacer/Library/SynQuacerPciHostBridgeLib/SynQuacerPciHostBridgeLib.c b/Silicon/Socionext/SynQuacer/Library/SynQuacerPciHostBridgeLib/SynQuacerPciHostBridgeLib.c index 7c096f0801dd..cf8ea6da2095 100644 --- a/Silicon/Socionext/SynQuacer/Library/SynQuacerPciHostBridgeLib/SynQuacerPciHostBridgeLib.c +++ b/Silicon/Socionext/SynQuacer/Library/SynQuacerPciHostBridgeLib/SynQuacerPciHostBridgeLib.c @@ -121,7 +121,7 @@ PCI_ROOT_BRIDGE mPciRootBridges[] = { TRUE, // DmaAbove4G FALSE, // NoExtendedConfigSpace FALSE, // ResourceAssigned - PCI_ALLOCATION_ATTRIBUTES, // AllocationAttributes + EFI_PCI_HOST_BRIDGE_COMBINE_MEM_PMEM, // AllocationAttributes { SYNQUACER_PCI_SEG1_BUSNUM_MIN, SYNQUACER_PCI_SEG1_BUSNUM_MAX }, // Bus { SYNQUACER_PCI_SEG1_PORTIO_MIN, @@ -130,8 +130,7 @@ PCI_ROOT_BRIDGE mPciRootBridges[] = { { SYNQUACER_PCI_SEG1_MMIO32_MIN, SYNQUACER_PCI_SEG1_MMIO32_MAX, MAX_UINT64 - SYNQUACER_PCI_SEG1_MMIO32_XLATE + 1 }, // Mem - { SYNQUACER_PCI_SEG1_MMIO64_MIN, - SYNQUACER_PCI_SEG1_MMIO64_MAX }, // MemAbove4G + { MAX_UINT64, 0x0 }, // MemAbove4G { MAX_UINT64, 0x0 }, // PMem { MAX_UINT64, 0x0 }, // PMemAbove4G (EFI_DEVICE_PATH_PROTOCOL *)&mEfiPciRootBridgeDevicePath[1] -- 2.17.1