From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.115, mailfrom: siyuan.fu@intel.com) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by groups.io with SMTP; Sun, 21 Apr 2019 18:09:30 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Apr 2019 18:09:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,380,1549958400"; d="scan'208";a="142480905" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by fmsmga008.fm.intel.com with ESMTP; 21 Apr 2019 18:09:30 -0700 Received: from fmsmsx120.amr.corp.intel.com (10.18.124.208) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.408.0; Sun, 21 Apr 2019 18:09:29 -0700 Received: from shsmsx108.ccr.corp.intel.com (10.239.4.97) by fmsmsx120.amr.corp.intel.com (10.18.124.208) with Microsoft SMTP Server (TLS) id 14.3.408.0; Sun, 21 Apr 2019 18:09:29 -0700 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.93]) by SHSMSX108.ccr.corp.intel.com ([169.254.8.147]) with mapi id 14.03.0415.000; Mon, 22 Apr 2019 09:09:27 +0800 From: "Siyuan, Fu" To: "devel@edk2.groups.io" , "Xue, ShengfengX" CC: "Wu, Jiaxin" Subject: Re: [edk2-devel] [PATCH v5] NetworkPkg/UefiPxeBcDxe:Add two PCD to control PXE. Thread-Topic: [edk2-devel] [PATCH v5] NetworkPkg/UefiPxeBcDxe:Add two PCD to control PXE. Thread-Index: AQHU9c9yIlN0DhKpoEuJw3plLEesN6ZHZGUQ Date: Mon, 22 Apr 2019 01:09:27 +0000 Message-ID: References: <542dfcb8b550488532fff7e3bf6b1cddb94feb70.1555582287.git.shengfengx.xue@intel.com> In-Reply-To: <542dfcb8b550488532fff7e3bf6b1cddb94feb70.1555582287.git.shengfengx.xue@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiYWNkNDlkNGItN2E1Ny00ZGIxLTljM2YtNGU0NWEzMTQwODFiIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiUVArK2Z1cHQ2Q05CNzhFQWlmVFNqUFpOemZIYzFaa3A2RzZmVUtYZFwvRjRLS1FURnIrZ0hPQlNFeDFxOHFHYlEifQ== dlp-product: dlpe-windows dlp-version: 11.0.600.7 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: siyuan.fu@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Siyuan Fu > -----Original Message----- > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Xu= e, > ShengfengX > Sent: Thursday, April 18, 2019 6:13 PM > To: devel@edk2.groups.io > Cc: Xue, ShengfengX ; Fu, Siyuan > ; Wu, Jiaxin > Subject: [edk2-devel] [PATCH v5] NetworkPkg/UefiPxeBcDxe:Add two PCD to > control PXE. >=20 > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D1695 >=20 > Setup need provide an item for user to control IPV46 PXE boot. > Origin UefiPxeBcDxe driver doesn't have such interface. > This change added two PCD to control IPV4/6 PXE in PxeBcSupported(). > Platform code should override this two PCD according to Setup value. > code change no side effect on current PXE function with default PCD. >=20 > Signed-off-by: Xue ShengfengX > Cc: Siyuan Fu > Cc: Jiaxin Wu > --- > NetworkPkg/NetworkPkg.dec | 12 +++++++++++- > NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c | 12 +++++++++++- > NetworkPkg/UefiPxeBcDxe/PxeBcImpl.h | 5 ++++- > NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf | 4 +++- > 4 files changed, 29 insertions(+), 4 deletions(-) >=20 > diff --git a/NetworkPkg/NetworkPkg.dec b/NetworkPkg/NetworkPkg.dec > index 9b8ece4837..1aa7c1ed31 100644 > --- a/NetworkPkg/NetworkPkg.dec > +++ b/NetworkPkg/NetworkPkg.dec > @@ -3,7 +3,7 @@ > # > # This package provides network modules that conform to UEFI 2.4 > specification. > # > -# Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved. > +# Copyright (c) 2009 - 2019, Intel Corporation. All rights reserved. > # (C) Copyright 2015-2017 Hewlett Packard Enterprise Development LP
> # > # SPDX-License-Identifier: BSD-2-Clause-Patent > @@ -117,5 +117,15 @@ > # @Prompt Type Value of network boot policy used in iSCSI. >=20 > gEfiNetworkPkgTokenSpaceGuid.PcdIScsiAIPNetworkBootPolicy|0x08|UINT8|0x1= 000000 > 7 >=20 > + ## IPv4 PXE support > + # 0x01 =3D PXE Enabled > + # 0x00 =3D PXE Disabled > + gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01|UINT8|0x10000009 > + > + ## IPv6 PXE support > + # 0x01 =3D PXE Enabled > + # 0x00 =3D PXE Disabled > + gEfiNetworkPkgTokenSpaceGuid.PcdIPv6PXESupport|0x01|UINT8|0x1000000a > + > [UserExtensions.TianoCore."ExtraFiles"] > NetworkPkgExtra.uni > diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c > b/NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c > index 3c1d400d50..b35edb687d 100644 > --- a/NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c > +++ b/NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c > @@ -2,7 +2,7 @@ > Driver Binding functions implementationfor for UefiPxeBc Driver. >=20 > (C) Copyright 2014 Hewlett-Packard Development Company, L.P.
> - Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved. > + Copyright (c) 2007 - 2019, Intel Corporation. All rights reserved. >=20 > SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > @@ -1242,6 +1242,10 @@ PxeBcDriverEntryPoint ( > { > EFI_STATUS Status; >=20 > + if ((PcdGet8(PcdIPv4PXESupport) =3D=3D PXE_DISABLED) && > (PcdGet8(PcdIPv6PXESupport) =3D=3D PXE_DISABLED)) { > + return EFI_UNSUPPORTED; > + } > + > Status =3D EfiLibInstallDriverBindingComponentName2 ( > ImageHandle, > SystemTable, > @@ -1301,9 +1305,15 @@ PxeBcSupported ( > EFI_GUID *MtftpServiceBindingGuid; >=20 > if (IpVersion =3D=3D IP_VERSION_4) { > + if (PcdGet8(PcdIPv4PXESupport) =3D=3D PXE_DISABLED) { > + return EFI_UNSUPPORTED; > + } > DhcpServiceBindingGuid =3D &gEfiDhcp4ServiceBindingProtocolGuid; > MtftpServiceBindingGuid =3D &gEfiMtftp4ServiceBindingProtocolGuid; > } else { > + if (PcdGet8(PcdIPv6PXESupport) =3D=3D PXE_DISABLED) { > + return EFI_UNSUPPORTED; > + } > DhcpServiceBindingGuid =3D &gEfiDhcp6ServiceBindingProtocolGuid; > MtftpServiceBindingGuid =3D &gEfiMtftp6ServiceBindingProtocolGuid; > } > diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.h > b/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.h > index f0db4a0c1a..fa4950c623 100644 > --- a/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.h > +++ b/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.h > @@ -2,7 +2,7 @@ > This EFI_PXE_BASE_CODE_PROTOCOL and EFI_LOAD_FILE_PROTOCOL. > interfaces declaration. >=20 > - Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved. > + Copyright (c) 2007 - 2019, Intel Corporation. All rights reserved. >=20 > SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > @@ -78,6 +78,9 @@ typedef struct _PXEBC_VIRTUAL_NIC PXEBC_VIRTUAL_NIC; > #define PXEBC_PRIVATE_DATA_FROM_ID(a) CR (a, PXEBC_PRIVATE_DATA= , Id, > PXEBC_PRIVATE_DATA_SIGNATURE) > #define PXEBC_VIRTUAL_NIC_FROM_LOADFILE(a) CR (a, PXEBC_VIRTUAL_NIC, > LoadFile, PXEBC_VIRTUAL_NIC_SIGNATURE) >=20 > +#define PXE_ENABLED 0x01 > +#define PXE_DISABLED 0x00 > + > typedef union { > PXEBC_DHCP4_PACKET_CACHE Dhcp4; > PXEBC_DHCP6_PACKET_CACHE Dhcp6; > diff --git a/NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > b/NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > index fc31250dea..0341f1052a 100644 > --- a/NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > +++ b/NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > @@ -5,7 +5,7 @@ > # PXE-compatible device for network access or booting. This driver sup= ports > # both IPv4 and IPv6 network stack. > # > -# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved. > +# Copyright (c) 2007 - 2019, Intel Corporation. All rights reserved. > # > # SPDX-License-Identifier: BSD-2-Clause-Patent > # > @@ -102,6 +102,8 @@ > [Pcd] > gEfiMdeModulePkgTokenSpaceGuid.PcdTftpBlockSize ## SOMETIMES_CON= SUMES > gEfiNetworkPkgTokenSpaceGuid.PcdPxeTftpWindowSize ## SOMETIMES_CON= SUMES > + gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport ## CONSUMES > + gEfiNetworkPkgTokenSpaceGuid.PcdIPv6PXESupport ## CONSUMES >=20 > [UserExtensions.TianoCore."ExtraFiles"] > UefiPxeBcDxeExtra.uni > -- > 2.16.2.windows.1 >=20 >=20 >=20