From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4001:c06::241; helo=mail-io0-x241.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-io0-x241.google.com (mail-io0-x241.google.com [IPv6:2607:f8b0:4001:c06::241]) (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 63D4522106DC1 for ; Wed, 28 Mar 2018 06:30:42 -0700 (PDT) Received: by mail-io0-x241.google.com with SMTP id m83so3568051ioi.8 for ; Wed, 28 Mar 2018 06:37:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=4/pS62IU0q8i9QxRUWkxlGtGw8VkrljIQ4GiKK/DwJU=; b=PHlohx97TgvbdxGvd12jAvwmxryarFCDEZYCQf8UKWtK1s7hCLsvVkxTngJC1DBChe TXmbm4e7CLD1ufeoT5sNapGmY8xjlTkM1oVyIa32L33fhHsEnTu6KhFCT+aW8qI1zqWT NytT9CkpsNMTvEKYVEjn3uKp8XM5kAv/ymp4Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=4/pS62IU0q8i9QxRUWkxlGtGw8VkrljIQ4GiKK/DwJU=; b=nSwT5e+U9bg9W0FGmNMk+CCZr1US3lbafyNAKc5BI00Mi+5hoimoYwsSjqdCDR6cjt itqvSq0rZMl66Tfp8LGb5i+3008LzQC3XgsOFoQdcI2VoAoJ/VHO6Q3ZaBK8h0pmQ8G9 FxpkzU1rJMkNPbkMjHYHBeT5ESmebivqED7E9j+9ss/kTEAguIw8yLSbXTaIYpZZWvt7 xs1TfeBA3c3AhmGtyeJ3cHBN/3yza3/f3cbVVhUV+mCXgPGjXCI1j5lX1P4kmKi5M7X2 Ut2sr3IgEUnV5wnybdAi0yCY43XhzH6H3X/zqL1sko3Gqo6EEH6nrY3RDXtOslyFQNmf pXyw== X-Gm-Message-State: AElRT7ExjxY9ag0pqnWj8GXG2441h3JnWswg848yZb9AIG5C/PgeJi/x oeU9ScEYQzHhkoj5UX8hRyQnT+OFCTVoN6yBpQDH5w== X-Google-Smtp-Source: AG47ELsH+nx5TzkMdKijH9QelGj4DfYxlIWWSRt56Mf5Rdm6KIqWNDaX80tngK0iy7SKmeSyo8O5d6fSFz9ZPiMz0OY= X-Received: by 10.107.14.136 with SMTP id 130mr36548603ioo.170.1522244240122; Wed, 28 Mar 2018 06:37:20 -0700 (PDT) MIME-Version: 1.0 Received: by 10.107.187.67 with HTTP; Wed, 28 Mar 2018 06:37:19 -0700 (PDT) In-Reply-To: <1522052735-68033-2-git-send-email-heyi.guo@linaro.org> References: <1522052735-68033-1-git-send-email-heyi.guo@linaro.org> <1522052735-68033-2-git-send-email-heyi.guo@linaro.org> From: Ard Biesheuvel Date: Wed, 28 Mar 2018 15:37:19 +0200 Message-ID: To: Heyi Guo Cc: "edk2-devel@lists.01.org" , Yi Li , Leif Lindholm , Michael D Kinney 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 13:30:42 -0000 Content-Type: text/plain; charset="UTF-8" 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 >