From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.151; helo=mga17.intel.com; envelope-from=siyuan.fu@intel.com; receiver=edk2-devel@lists.01.org Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 109012115C33C for ; Sun, 28 Oct 2018 20:14:54 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Oct 2018 20:14:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,438,1534834800"; d="scan'208";a="269564893" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by orsmga005.jf.intel.com with ESMTP; 28 Oct 2018 20:14:54 -0700 Received: from fmsmsx125.amr.corp.intel.com (10.18.125.40) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.408.0; Sun, 28 Oct 2018 20:14:54 -0700 Received: from shsmsx101.ccr.corp.intel.com (10.239.4.153) by FMSMSX125.amr.corp.intel.com (10.18.125.40) with Microsoft SMTP Server (TLS) id 14.3.408.0; Sun, 28 Oct 2018 20:14:53 -0700 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.161]) by SHSMSX101.ccr.corp.intel.com ([169.254.1.102]) with mapi id 14.03.0415.000; Mon, 29 Oct 2018 11:14:51 +0800 From: "Fu, Siyuan" To: "Li, Songpeng" , "edk2-devel@lists.01.org" CC: "Ye, Ting" , "Wu, Jiaxin" Thread-Topic: [PATCH 2/4] MdeModulePkg/UefiPxeBcDxe: Add Conflict Detection Process. Thread-Index: AQHUbypPl7DZWlzA6kipV7wLdqx+NKU1jIRg Date: Mon, 29 Oct 2018 03:14:50 +0000 Message-ID: References: <20181029015326.8528-1-songpeng.li@intel.com> <20181029015326.8528-3-songpeng.li@intel.com> In-Reply-To: <20181029015326.8528-3-songpeng.li@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiMjg1MzJlNjAtODFmYi00OWEwLThlMjItZDc0MjRiOTk1ZmVjIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiOWt0dFhYOENqRmZ0YVE0U01ZSkR6RDIxdE1SZFwvTVc1azV4bnEzeHliV0JMcHR3XC9KejlrXC90MHdqUERRSXIxUiJ9 dlp-product: dlpe-windows dlp-version: 11.0.400.15 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH 2/4] MdeModulePkg/UefiPxeBcDxe: Add Conflict Detection Process. 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: Mon, 29 Oct 2018 03:14:55 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi, Songpeng The tag protocol guid is installed in driver binding start so it should be = marked as BY_START in INF file. > + gEdkiiPxeBcTagProtocolGuid ## SOMETIMES_CONSUMES BestRegards Fu Siyuan > -----Original Message----- > From: Li, Songpeng > Sent: Monday, October 29, 2018 9:53 AM > To: edk2-devel@lists.01.org > Cc: Ye, Ting ; Wu, Jiaxin ; Fu, > Siyuan > Subject: [PATCH 2/4] MdeModulePkg/UefiPxeBcDxe: Add Conflict Detection > Process. >=20 > The current PxeBc Driver in MdeModulePkg and NetworkPkg has no conflict > detection when both installed in platform, this process is for conflict > driver detect. >=20 > Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1278 > Cc: Ye Ting > Cc: Wu Jiaxin > Cc: Fu Siyuan > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Songpeng Li > --- > .../Network/UefiPxeBcDxe/PxeBcDriver.c | 19 ++++++++++++++++++- > .../Network/UefiPxeBcDxe/PxeBcImpl.h | 3 ++- > .../Network/UefiPxeBcDxe/UefiPxeBcDxe.inf | 1 + > 3 files changed, 21 insertions(+), 2 deletions(-) >=20 > diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.c > b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.c > index 76c140d8e3..bd16f8b2e2 100644 > --- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.c > +++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.c > @@ -1,7 +1,7 @@ > /** @file > The driver binding for UEFI PXEBC protocol. >=20 > -Copyright (c) 2007 - 2015, Intel Corporation. All rights reserved.
> +Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.
> This program and the accompanying materials > are licensed and made available under the terms and conditions of the BS= D > License > which accompanies this distribution. The full text of the license may b= e > found at > @@ -84,6 +84,19 @@ PxeBcDriverBindingSupported ( > EFI_PXE_BASE_CODE_PROTOCOL *PxeBc; > EFI_STATUS Status; >=20 > + Status =3D gBS->OpenProtocol ( > + ControllerHandle, > + &gEdkiiPxeBcTagProtocolGuid, > + NULL, > + This->DriverBindingHandle, > + ControllerHandle, > + EFI_OPEN_PROTOCOL_TEST_PROTOCOL > + ); > + > + if (!EFI_ERROR (Status)) { > + return EFI_ALREADY_STARTED; > + } > + > Status =3D gBS->OpenProtocol ( > ControllerHandle, > &gEfiPxeBaseCodeProtocolGuid, > @@ -370,6 +383,8 @@ PxeBcDriverBindingStart ( > &Private->PxeBc, > &gEfiLoadFileProtocolGuid, > &Private->LoadFile, > + &gEdkiiPxeBcTagProtocolGuid, > + NULL, > NULL > ); > if (EFI_ERROR (Status)) { > @@ -573,6 +588,8 @@ PxeBcDriverBindingStop ( > &Private->PxeBc, > &gEfiLoadFileProtocolGuid, > &Private->LoadFile, > + &gEdkiiPxeBcTagProtocolGuid, > + NULL, > NULL > ); >=20 > diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.h > b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.h > index e96b6f2c5d..0fceb35b82 100644 > --- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.h > +++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.h > @@ -1,6 +1,6 @@ > /** @file >=20 > -Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.
> +Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.
> This program and the accompanying materials > are licensed and made available under the terms and conditions of the BS= D > License > which accompanies this distribution. The full text of the license may b= e > found at > @@ -32,6 +32,7 @@ typedef struct _PXEBC_PRIVATE_DATA PXEBC_PRIVATE_DATA; > #include > #include > #include > +#include >=20 > #include > #include > diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf > b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf > index 0424019929..dc255534cb 100644 > --- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf > +++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf > @@ -94,6 +94,7 @@ > gEfiIp4ServiceBindingProtocolGuid ## TO_START > gEfiIp4ProtocolGuid ## TO_START > gEfiIp4Config2ProtocolGuid ## TO_START > + gEdkiiPxeBcTagProtocolGuid ## SOMETIMES_CONSUMES >=20 > [Pcd] > gEfiMdeModulePkgTokenSpaceGuid.PcdTftpBlockSize ## SOMETIMES_CONSUMES > -- > 2.18.0.windows.1