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:c00::243; helo=mail-pf0-x243.google.com; envelope-from=heyi.guo@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pf0-x243.google.com (mail-pf0-x243.google.com [IPv6:2607:f8b0:400e:c00::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 D9328224DD139 for ; Wed, 28 Mar 2018 16:59:37 -0700 (PDT) Received: by mail-pf0-x243.google.com with SMTP id h69so1954093pfe.13 for ; Wed, 28 Mar 2018 17:06:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:date:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=6TQoGhVwFPlpZUvhThReGJTOm1Z9Ln9S67+IKzVWyxE=; b=Lj1dsTjre2lIxGON/elN87FSOGI8NWr2omqLrMQZeCPEMl3sT7t5fNM/ltK11d5F0o TVXWqIhD4ksvPVDQqU+ChuXV0rPDavVgLKEh6jli39vJbUN0Y3L4+XdTG2X/cn7AKw/1 ZgBv6rEEeNJT1HJ8434zBwpaXGH2bzB2Buwb0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:date:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=6TQoGhVwFPlpZUvhThReGJTOm1Z9Ln9S67+IKzVWyxE=; b=TCJPB1d9WcIhhoSeDtmSpZs18V2kSNR1mTMCRjfVhU5EnWB7n7simUasSrNBjKhQX6 CLVYn6ahJOkSixg0/jxfAT9eacDT7ZI4yV2WKK2I1sgUAP/RY3kaxTfzbXSjK7ZPNZLK rDoZWqQ2TShLwNKI5h0GeMhywZ605Y1n4hIeIpFi2yxOe9dgQrMz8V26c4toNtOJVAhT VKfVj5ixt97teFqaSL6PWtjNqe1vVz2bMJibRejbdW0fPrNvrGXqVIq/Vn0/p+rI6uLI th4kVsce/TdnHNHMRcCZ0od4gTGgMPNQ7jbVoLrbkIYCFIu84KRZIMlABlypK+HGJvzC 3O+w== X-Gm-Message-State: AElRT7EKdBNiGHyy+osTDnKl6H5jkJxkkYun6bd7qyxIzGwyqT4aWx9K zWm6JH7JH47bJ913HjXb6wSQcA== X-Google-Smtp-Source: AIpwx4+eS68rkxbnoXo3uBKcleHWd1R5hxsYMW0tOZ9+3Gobjsgq8dbdbyeIZuXRsAHUc+ZfljhaJA== X-Received: by 10.99.49.74 with SMTP id x71mr3893332pgx.160.1522281976670; Wed, 28 Mar 2018 17:06:16 -0700 (PDT) Received: from SZX1000114654 ([104.237.91.79]) by smtp.gmail.com with ESMTPSA id 199sm9634404pfy.51.2018.03.28.17.06.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Mar 2018 17:06:16 -0700 (PDT) From: Guo Heyi X-Google-Original-From: Guo Heyi Date: Thu, 29 Mar 2018 08:06:12 +0800 To: Ard Biesheuvel Cc: Heyi Guo , "edk2-devel@lists.01.org" , Yi Li , Leif Lindholm , Michael D Kinney Message-ID: <20180329000612.GA97590@SZX1000114654> References: <1522052735-68033-1-git-send-email-heyi.guo@linaro.org> <1522052735-68033-2-git-send-email-heyi.guo@linaro.org> MIME-Version: 1.0 In-Reply-To: User-Agent: Mutt/1.5.24 (2015-08-30) Subject: Re: [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.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Mar 2018 23:59:38 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Ah, I made the change locally but forgot to send it out... Now it is there :) Thanks and regards, Heyi On Wed, Mar 28, 2018 at 03:37:19PM +0200, Ard Biesheuvel wrote: > On 26 March 2018 at 10:25, Heyi Guo wrote: > > 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 > > Reviewed-by: Ard Biesheuvel > > Obviously, this requires a matching update in edk2-platforms, so > please send that out and we can apply both at the same time. > > > > --- > > 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/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 > > 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 > >