From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:400e:c01::242; helo=mail-pl0-x242.google.com; envelope-from=heyi.guo@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pl0-x242.google.com (mail-pl0-x242.google.com [IPv6:2607:f8b0:400e:c01::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 7CB332242384D for ; Wed, 28 Feb 2018 22:52:08 -0800 (PST) Received: by mail-pl0-x242.google.com with SMTP id 93-v6so3127957plc.9 for ; Wed, 28 Feb 2018 22:58:16 -0800 (PST) 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=AYSvTpkKH3HkKndCwIKm4x8MwR03fLPgznyqaVdDMa8=; b=aaPDSb9iNRBZGRVw9Tl6EWkzr/pSosfiiv04t850nnMzRzL6NOCgIVPCR36xnXMf4d WSuJ8Vo4zCXS4jXO5n/3xRl53CgYmte47zlA4InVIWKC++SL+7WYnYaAEngjoEtXYLfV KNkvKF/VcCswgYpOiSfhcW8sY/ZZ5Q5FK0oR0= 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=AYSvTpkKH3HkKndCwIKm4x8MwR03fLPgznyqaVdDMa8=; b=BbmxM6lxN8B7+/00OWV/TGNgHYPLaTQDTPKpEQkbRIe3A3B1zqCU9mtIsyn0qU6TDx 8XUT0IPQhjdqKI4FjT+/nI61dZJmoh7+WcYb2Zj4K0GBgFlVr/gw2Ir2ooxEXXhP0BXY iM0bIBMMOSV8oJUb53u9SnUySPv8SVU9tQAhHVziWGuSNPE1DXUirkf70SS0i/gx96tO k3zGmmVKg+gUrAW4k8gJeqaPGkDkAG/UNvoHqMUpQ/LC0RsLdr8saRtUBIflwV20sXLb yVcmjJiSg3ZDfWGhCm/8QwG3zPltYBZtn67ZVH9+rZD32EfGWV87LRvNiVq+w0y1ApTW 0pxw== X-Gm-Message-State: APf1xPCKWadWY9Ed/NVehbfyOfU32TRNmltdVPXUXcSPvjEnE/mPXu+M DLHvqr0KHcv9PlCRgXvY6Fq2CjUNuGo= X-Google-Smtp-Source: AG47ELsEbCRbEaRwzsTkkI4nu6UWYYl+DBS7F8kkgDe/K5TfwC5y+bXEnJfIwkAl1um/WokB+CZQJA== X-Received: by 2002:a17:902:518d:: with SMTP id y13-v6mr955163plh.121.1519887496119; Wed, 28 Feb 2018 22:58:16 -0800 (PST) Received: from localhost.localdomain ([45.56.152.115]) by smtp.gmail.com with ESMTPSA id p63sm6489867pfk.74.2018.02.28.22.58.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 28 Feb 2018 22:58:15 -0800 (PST) From: Heyi Guo To: edk2-devel@lists.01.org Cc: Heyi Guo , Ruiyu Ni , Ard Biesheuvel , Star Zeng , Eric Dong , Laszlo Ersek , Michael D Kinney Date: Thu, 1 Mar 2018 14:57:23 +0800 Message-Id: <1519887444-75510-6-git-send-email-heyi.guo@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519887444-75510-1-git-send-email-heyi.guo@linaro.org> References: <1519887444-75510-1-git-send-email-heyi.guo@linaro.org> Subject: [PATCH v5 5/6] MdeModulePkg/PciBus: convert host address to device address X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Mar 2018 06:52:08 -0000 According to UEFI spec 2.7, PciRootBridgeIo->Configuration() should return host address (CPU view ddress) rather than device address (PCI view address), so in function GetMmioAddressTranslationOffset we need to convert the range to device address before comparing. And device address = host address + translation offset. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Heyi Guo Cc: Ruiyu Ni Cc: Ard Biesheuvel Cc: Star Zeng Cc: Eric Dong Cc: Laszlo Ersek Cc: Michael D Kinney --- MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.c index 190f4b0dc7ed..fef3eceb7f62 100644 --- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.c +++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.c @@ -1812,10 +1812,14 @@ GetMmioAddressTranslationOffset ( return (UINT64) -1; } + // According to UEFI 2.7, EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL::Configuration() + // returns host address instead of device address, while AddrTranslationOffset + // is not zero, and device address = host address + AddrTranslationOffset, so + // we convert host address to device address for range compare. while (Configuration->Desc == ACPI_ADDRESS_SPACE_DESCRIPTOR) { if ((Configuration->ResType == ACPI_ADDRESS_SPACE_TYPE_MEM) && - (Configuration->AddrRangeMin <= AddrRangeMin) && - (Configuration->AddrRangeMin + Configuration->AddrLen >= AddrRangeMin + AddrLen) + (Configuration->AddrRangeMin + Configuration->AddrTranslationOffset <= AddrRangeMin) && + (Configuration->AddrRangeMin + Configuration->AddrLen + Configuration->AddrTranslationOffset >= AddrRangeMin + AddrLen) ) { return Configuration->AddrTranslationOffset; } -- 2.7.4