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=ming.huang@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 9762E210EFAF5 for ; Thu, 23 Aug 2018 02:55:12 -0700 (PDT) Received: by mail-pl0-x242.google.com with SMTP id f6-v6so2189537plo.1 for ; Thu, 23 Aug 2018 02:55:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=U3FAmHC+VaxC4QT/T3Xd+8mi0IWbMl+zIOM4oJ2knns=; b=PxiKHLSNKjovZa/4iMSP89hObjZ8pRg4z4cDNFd8rA18FImZxB6SC48zo+DlUHnXZz iwpGkFVXY3nKjsK+6PgHsu4452zlrePHlRBrL/grO82yVgTFhLOWNZSNqZqXhCl9cO6V 7RpxWmwtxVQ2zBN3axPaywPMDn7Vve4QbyZyQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=U3FAmHC+VaxC4QT/T3Xd+8mi0IWbMl+zIOM4oJ2knns=; b=bj+DbJkXizgdIgG7AQ2AikWeHhSi7RFNJeSyOGsJ1JLkuHW/Gu5pXoG2iygPMgpym8 yIF9M2F0znj7dPDBHJGxsOZDMNwKpdlhnMOmSAXtY72Z+QD1PUfH1r8y3eyShjwO1Wus 4FZwHyYrX2bZ3/MPr6jac97esNL84jPTK2IU/K7liOG1KEl6TKHfsZfI8Xv82xJKgbvT rSc9CvQNCdVxp25pQoi3JYfCPD2p6s9lCRefUs+JIoEnBEiWpuNdtf7JHIhJRkdHBIR/ VZHRK0pWp74alubm6dWe99CcdEPCou2asIsnN8YPtx/HLV0GgCjMVlynXiBnGy/am1mW lQlg== X-Gm-Message-State: AOUpUlGLeCukelxI41CrozDEIZQr93dq81dN15VUd4DN43IfLPJ76Bfm Z8TIb1sF6JColht9PfrxVceAPA== X-Google-Smtp-Source: AA+uWPwxKbEqjFw0ws03gQjw6aR7r7ygnmrxGn3xaeaXDDXGhlY45P8UoJtkZj0Tn6sXcKwFtg+TOw== X-Received: by 2002:a17:902:82c5:: with SMTP id u5-v6mr23554176plz.83.1535018112293; Thu, 23 Aug 2018 02:55:12 -0700 (PDT) Received: from [10.84.0.214] ([64.64.108.140]) by smtp.gmail.com with ESMTPSA id q26-v6sm2172631pfj.127.2018.08.23.02.55.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Aug 2018 02:55:11 -0700 (PDT) To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org Cc: ard.biesheuvel@linaro.org, michael.d.kinney@intel.com, lersek@redhat.com, guoheyi@huawei.com, wanghuiqiang@huawei.com, huangming23@huawei.com, zhangjinsong2@huawei.com, huangdaode@hisilicon.com, john.garry@huawei.com, xinliang.liu@linaro.org, Heyi Guo References: <20180814080903.50466-1-ming.huang@linaro.org> <20180814080903.50466-40-ming.huang@linaro.org> From: Ming Message-ID: <0a8bf422-a3e0-8eff-c97d-82afd4d23f98@linaro.org> Date: Thu, 23 Aug 2018 17:54:48 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.0 MIME-Version: 1.0 In-Reply-To: <20180814080903.50466-40-ming.huang@linaro.org> Subject: Re: [PATCH edk2-platforms v2 39/43] Silicon/Hisilicon/Setup: Support SPCR table switch X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Aug 2018 09:55:12 -0000 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Hi Leif, How about this patch? On 8/14/2018 4:08 PM, Ming Huang wrote: > If install SPCR table, KVM will not output while install or boot > some OS, like ubuntu, so add SPCR switch setup item and set it > disable by default. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Ming Huang > Signed-off-by: Heyi Guo > --- > Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/AcpiPlatformDxe.inf | 1 + > Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/UpdateAcpiTable.c | 24 ++++++++++++++++++++ > 2 files changed, 25 insertions(+) > > diff --git a/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/AcpiPlatformDxe.inf b/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/AcpiPlatformDxe.inf > index 281a4f2ebd..3d133aff85 100644 > --- a/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/AcpiPlatformDxe.inf > +++ b/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/AcpiPlatformDxe.inf > @@ -51,6 +51,7 @@ > > [Guids] > gHisiEfiMemoryMapGuid > + gOemConfigGuid > > [Pcd] > gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiTableStorageFile ## CONSUMES > diff --git a/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/UpdateAcpiTable.c b/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/UpdateAcpiTable.c > index 54f49977c3..32878ca4f9 100644 > --- a/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/UpdateAcpiTable.c > +++ b/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/UpdateAcpiTable.c > @@ -16,8 +16,10 @@ > #include > #include > #include > +#include > #include > #include > +#include > #include > > #define CORECOUNT(X) ((X) * CORE_NUM_PER_SOCKET) > @@ -114,6 +116,25 @@ UpdateSlit ( > return EFI_SUCCESS; > } > > +STATIC > +EFI_STATUS > +IsNeedSpcr ( > + IN OUT EFI_ACPI_DESCRIPTION_HEADER *Table > + ) > +{ > + EFI_STATUS Status; > + OEM_CONFIG_DATA SetupData; > + UINTN DataSize = sizeof (OEM_CONFIG_DATA); > + > + Status = gRT->GetVariable (OEM_CONFIG_NAME, &gOemConfigGuid, NULL, &DataSize, &SetupData); > + if (!EFI_ERROR (Status) && (SetupData.EnableSpcr == FALSE)) { > + return EFI_ABORTED; > + } > + > + return EFI_SUCCESS; > +} > + > + > EFI_STATUS > UpdateAcpiTable ( > IN OUT EFI_ACPI_DESCRIPTION_HEADER *TableHeader > @@ -130,6 +151,9 @@ UpdateAcpiTable ( > case EFI_ACPI_6_0_SYSTEM_LOCALITY_INFORMATION_TABLE_SIGNATURE: > Status = UpdateSlit (TableHeader); > break; > + case EFI_ACPI_6_2_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_SIGNATURE: > + Status = IsNeedSpcr (TableHeader); > + break; > } > return Status; > } >