From patchwork Mon Mar 26 08:25:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gary guo X-Patchwork-Id: 132401 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp3554501ljb; Mon, 26 Mar 2018 01:26:22 -0700 (PDT) X-Google-Smtp-Source: AG47ELta5SfcXUbWokCEb78hOjbbMMKb0MiyHGa+Dkji6emxfSgGy4IfSMUCc4sHYbIVyjAngeo1 X-Received: by 2002:a17:902:b414:: with SMTP id x20-v6mr13397707plr.165.1522052782248; Mon, 26 Mar 2018 01:26:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522052782; cv=none; d=google.com; s=arc-20160816; b=hXXKil0FA93JYsLGJcqgFIF+xa658MY7bTKmJNSH3IlsHrSTUjDl+gr/WfaiYcwMeC wSCWdx3eq1NzJKrTpfSMiwvFiKyzHtbwopiBRX9S8n1qFl3ODhxxxdAN/Yh0gIRmlRCz L7JF6eY8fJWsBIwIWuVozKrMgOQF6Ydn12uv4HCWnLpDCBSoovLuDhTvRNTVCOp8F/Vd hNFCNFq64Yg89pPEimhPdHSDpvVwGs1oCBuF+74NYQL13NvkdpOpQ9xLzubYGl8tny2b dhq+ejZaAP74FmYtNIrHve99Gqw1pZbpl7DVrNQIJyRjK/sdAg9Xo7SqKeFo/PPHDg63 TA2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=nzO9XL/nwIOwE3dYTpSC05zlBjLDOJ+hX/V9PHj2tvg=; b=K2VFlYXCNHT7L9aTNomCrJ5y1Ilr2Mm4T37PF4MDE2BNE+X62T9GTt6/SHHI9OGcqo KKyIOdmtuQbMONdZiVwELxqIMiQh2imjSAJFAvnn6qm0L+v0B3EKyti1HA5NXDm+y0+U 3qHYLkz/oNUAwSn1rJVfSStt+i4eSkRjnQspcn5On36q3vT1Iiaj96i8PIsqUx36U0P1 4n8rlJzCdAZhh0M8/GLZLJKldpGOmSlxkdTEnfd1dm5BePaZQj2VeHnGgJsBbETzpZN5 j+IWuqEiN/ls1Badd/lXqVhIGelj3ZoXseGPELqB3GIA4LL2VzSgAFSQrDbJ6NIaPa8D CMew== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=RBhn9c6T; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id n3-v6si15047772pld.85.2018.03.26.01.26.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Mar 2018 01:26:22 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=RBhn9c6T; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 8A41F225E4033; Mon, 26 Mar 2018 01:19:45 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:400e:c01::243; helo=mail-pl0-x243.google.com; envelope-from=heyi.guo@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pl0-x243.google.com (mail-pl0-x243.google.com [IPv6:2607:f8b0:400e:c01::243]) (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 1C0092214673B for ; Mon, 26 Mar 2018 01:19:43 -0700 (PDT) Received: by mail-pl0-x243.google.com with SMTP id s24-v6so1130742plq.6 for ; Mon, 26 Mar 2018 01:26:20 -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=8k1Nr4gaBYqvKbWXT7VIHCsREIqcUps/9gUqCCfesyI=; b=RBhn9c6Tuj1o5BLL4PnPwTMxLYfm6dc+EFCcKXqndbQ6p2XVip0V7EokdRS9EAjNv0 14WDLPrW0HMyNV4f54/jh5nKXIgpWE7ebJtQjqnAki0qxy/Qen8b6Aq1C5hWH2RpHQHP a6NbvEkK42vKZ7ta3uXZyJ3mWyHH6ILlODkzw= 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=8k1Nr4gaBYqvKbWXT7VIHCsREIqcUps/9gUqCCfesyI=; b=leKX09/nY55MxJiLgKXqEZGOMhTwniJz/Ze6/3xd7yxpFECDDQfr+J8DBXoP+ucCSP XGDHmMxrYauOtzwQIwNCuxlW+I3lP7vFa4jc7pqqzK74O5Ki3p9KqsolgYTi093Xon1e vs6022Qfo1H/M3VH6bvuxJXHp++QfUwBQkkiaJqqLljwCNisMkJjw2PkQogSdN+sJJjp smdA1t+oAyvUrUz+GoFyfpzvXNEC+ZObpIxUO2WcmOMT/IAPLbKEnAhfFMWBvms1cQ4W y9TognVNf4dMrBOPWXoqRH4BVUpTqepDs95fPODZmAGVO/psQGeI85ZQnBymJOtuv2r2 RtKw== X-Gm-Message-State: AElRT7HOllUr+ARgBFIR1S0ShCSlBB16JDh6xUh52vQwWh18uiGX77w4 OP6c0+D7zNq6YgFSwDN7bUsEw6mgiAg= X-Received: by 2002:a17:902:63:: with SMTP id 90-v6mr40366540pla.125.1522052779707; Mon, 26 Mar 2018 01:26:19 -0700 (PDT) Received: from localhost.localdomain ([104.237.91.79]) by smtp.gmail.com with ESMTPSA id q87sm32735249pfa.29.2018.03.26.01.26.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 26 Mar 2018 01:26:19 -0700 (PDT) From: Heyi Guo To: edk2-devel@lists.01.org Date: Mon, 26 Mar 2018 16:25:35 +0800 Message-Id: <1522052735-68033-2-git-send-email-heyi.guo@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1522052735-68033-1-git-send-email-heyi.guo@linaro.org> References: <1522052735-68033-1-git-send-email-heyi.guo@linaro.org> Subject: [edk2] [PATCH edk2-non-osi v2 1/1] Hisilicon/Sm750Dxe: Unify binary and fix GOP frame buffer base 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: , Cc: Michael D Kinney , Heyi Guo , Yi Li , Leif Lindholm , Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Sm750Dxe is a generic PCIe device driver for SM750 VGA device, so it is not necessary to maintain two different binary images for D03 and D05 respectively. The main difference between D03 and D05 is the implementation of SerialPortLib, which causes BaseDebugLibSerialPort to be different. So we switch to null DebugLib for release build and get a unified Sm750Dxe binary. The code in SM750 driver treated the address returned from PciIo->GetBarAttributes() as device address; this should be fixed after edk2 commit dc080d3 since GetBarAttributes() returns host address from then on. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Heyi Guo Signed-off-by: Yi Li Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Michael D Kinney --- Platform/Hisilicon/D03/Drivers/Sm750Dxe/UefiSmi.inf | 32 -------------------- Platform/Hisilicon/{D05 => }/Drivers/Sm750Dxe/UefiSmi.inf | 0 Platform/Hisilicon/D03/Drivers/Sm750Dxe/SmiGraphicsOutput.efi | Bin 17728 -> 0 bytes Platform/Hisilicon/D05/Drivers/Sm750Dxe/SmiGraphicsOutput.efi | Bin 18592 -> 0 bytes Platform/Hisilicon/Drivers/Sm750Dxe/SmiGraphicsOutput.efi | Bin 0 -> 17760 bytes 5 files changed, 32 deletions(-) diff --git a/Platform/Hisilicon/D03/Drivers/Sm750Dxe/SmiGraphicsOutput.efi b/Platform/Hisilicon/D03/Drivers/Sm750Dxe/SmiGraphicsOutput.efi deleted file mode 100644 index 16c91e2b18ef..000000000000 Binary files a/Platform/Hisilicon/D03/Drivers/Sm750Dxe/SmiGraphicsOutput.efi and /dev/null differ diff --git a/Platform/Hisilicon/D05/Drivers/Sm750Dxe/SmiGraphicsOutput.efi b/Platform/Hisilicon/D05/Drivers/Sm750Dxe/SmiGraphicsOutput.efi deleted file mode 100644 index b8de0259c785..000000000000 Binary files a/Platform/Hisilicon/D05/Drivers/Sm750Dxe/SmiGraphicsOutput.efi and /dev/null differ diff --git a/Platform/Hisilicon/Drivers/Sm750Dxe/SmiGraphicsOutput.efi b/Platform/Hisilicon/Drivers/Sm750Dxe/SmiGraphicsOutput.efi new file mode 100644 index 000000000000..3ae8ddfb647f Binary files /dev/null and b/Platform/Hisilicon/Drivers/Sm750Dxe/SmiGraphicsOutput.efi differ -- 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Ard Biesheuvel diff --git a/Platform/Hisilicon/D03/Drivers/Sm750Dxe/UefiSmi.inf b/Platform/Hisilicon/D03/Drivers/Sm750Dxe/UefiSmi.inf deleted file mode 100644 index a2618331440f..000000000000 --- a/Platform/Hisilicon/D03/Drivers/Sm750Dxe/UefiSmi.inf +++ /dev/null @@ -1,32 +0,0 @@ -#/** @file -# -# Copyright (c) 2016, Hisilicon Limited. All rights reserved. -# Copyright (c) 2016, Linaro Limited. All rights reserved. -# -# This program and the accompanying materials -# are licensed and made available under the terms and conditions of the BSD License -# which accompanies this distribution. The full text of the license may be found at -# http://opensource.org/licenses/bsd-license.php -# -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -# -#**/ - - -[Defines] - INF_VERSION = 0x00010005 - BASE_NAME = SmiGraphicsOutput - FILE_GUID = BFB7B510-B09B-11DB-96E3-005056C00008 - MODULE_TYPE = UEFI_DRIVER - VERSION_STRING = 1.0 - - PCI_VENDOR_ID = 0x126F - PCI_DEVICE_ID = 0x0750 - PCI_CLASS_CODE = 0x030000 - PCI_REVISION = 0xA1 - COMPRESS = TRUE - -[Binaries] - PE32|SmiGraphicsOutput.efi|* - diff --git a/Platform/Hisilicon/D05/Drivers/Sm750Dxe/UefiSmi.inf b/Platform/Hisilicon/Drivers/Sm750Dxe/UefiSmi.inf similarity index 100% rename from Platform/Hisilicon/D05/Drivers/Sm750Dxe/UefiSmi.inf rename to Platform/Hisilicon/Drivers/Sm750Dxe/UefiSmi.inf