Re: [edk2-devel] [PATCH] MdeModulePkg/CapsulePei: Optimize the CapsulePei

["Leif Lindholm" <leif.lindholm@linaro.org>]

On Mon, Jun 03, 2019 at 08:18:03AM +0000, Gao, Zhichao wrote:
> 
> 
> > -----Original Message-----
> > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> > Leif Lindholm
> > Sent: Saturday, June 1, 2019 12:44 AM
> > To: devel@edk2.groups.io; Gao, Zhichao <zhichao.gao@intel.com>
> > Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>; Wang, Jian J
> > <jian.j.wang@intel.com>; Wu, Hao A <hao.a.wu@intel.com>; Ni, Ray
> > <ray.ni@intel.com>; Zeng, Star <star.zeng@intel.com>; Gao, Liming
> > <liming.gao@intel.com>; Sean Brogan <sean.brogan@microsoft.com>;
> > Michael Turner <Michael.Turner@microsoft.com>
> > Subject: Re: [edk2-devel] [PATCH] MdeModulePkg/CapsulePei: Optimize the
> > CapsulePei
> > 
> > On Fri, May 31, 2019 at 01:46:14AM +0000, Gao, Zhichao wrote:
> > > > So what modifications were made to the code on the way from the
> > > > project Mu repository? That would be useful to mention in the commit
> > message.
> > >
> > > I would add this info blow commit message(not in commit message). It
> > > is helpful for review. But it may not be useful to add them in the
> > > commit message.
> > > On my opinion, the commit message should contain the summary and
> > impact of the changes.
> > 
> > You are importing a file from a different repository, produced by a different
> > company. As part of that import, you are claiming Intel copyright for 2019 for
> > the code provided in the patch.
> > 
> > This means that you are making a legal claim to the intellectual property
> > provided by the patch on behalf of Intel.
> > Either:
> > - you have modified the code compared to the original, at which
> >   point the commit mesage *must* reflect this - it is no longer the
> >   contribution that the original message describes.
> >   For an example, see how Laszlo reflected his changes to 94e0dd1afe53.
> 
> Sorry. I can't understand the example. But maybe I got your point. I
> would update the commit message with the MU link and mention what
> changes I made. Then I would update the copyright of Intel. Is that
> the correct flow?

Yes, this is correct.
Me, Ard and Laszlo tend to follow the format set out in
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/submitting-patches.rst?h=v5.2-rc3#n468
but there is no official form for this in edk2.
The importance is that the information is kept in the commit message, though.

> By the way, I have done that in V2 but the link and change info
> didn't include to the commit message. I would put them into the
> commit message in next patch.

Excellent, thank you.

Best Regards,

Leif

> Thanks,
> Zhichao
> 
> > - the Intel copyright addition is a mistake (and must be dropped).
> > 
> > Regards,
> > 
> > Leif
> > 
> > >
> > > Thanks,
> > > Zhichao
> > >
> > > >
> > > > Regards,
> > > >
> > > > Leif
> > > >
> > > > > And I also make some minor changes on it.
> > > > >
> > > > > Thanks,
> > > > > Zhichao
> > > > >
> > > > > > -----Original Message-----
> > > > > > From: Leif Lindholm [mailto:leif.lindholm@linaro.org]
> > > > > > Sent: Wednesday, May 29, 2019 7:12 PM
> > > > > > To: devel@edk2.groups.io; Gao, Zhichao <zhichao.gao@intel.com>
> > > > > > Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>; Wang, Jian J
> > > > > > <jian.j.wang@intel.com>; Wu, Hao A <hao.a.wu@intel.com>; Ni, Ray
> > > > > > <ray.ni@intel.com>; Zeng, Star <star.zeng@intel.com>; Gao,
> > > > > > Liming <liming.gao@intel.com>; Sean Brogan
> > > > > > <sean.brogan@microsoft.com>; Michael Turner
> > > > > > <Michael.Turner@microsoft.com>
> > > > > > Subject: Re: [edk2-devel] [PATCH] MdeModulePkg/CapsulePei:
> > > > > > Optimize the CapsulePei
> > > > > >
> > > > > > On Wed, May 29, 2019 at 08:45:55AM +0800, Gao, Zhichao wrote:
> > > > > > > From: Bret Barkelew <Bret.Barkelew@microsoft.com>
> > > > > >
> > > > > > If this code is from Microsoft...
> > > > > >
> > > > > > >
> > > > > > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1853
> > > > > > >
> > > > > > > Sperate the capsule check function from GetCapsuleDescriptors
> > > > > > > and name it to AreCapsulesStaged.
> > > > > > > Rename GetCapsuleDescriptors to GetScatterGatherHeadEntries.
> > > > > > > And optimize its to remove the duplicated code.
> > > > > > >
> > > > > > > Cc: Jian J Wang <jian.j.wang@intel.com>
> > > > > > > Cc: Hao A Wu <hao.a.wu@intel.com>
> > > > > > > Cc: Ray Ni <ray.ni@intel.com>
> > > > > > > Cc: Star Zeng <star.zeng@intel.com>
> > > > > > > Cc: Liming Gao <liming.gao@intel.com>
> > > > > > > Cc: Sean Brogan <sean.brogan@microsoft.com>
> > > > > > > Cc: Michael Turner <Michael.Turner@microsoft.com>
> > > > > > > Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
> > > > > > > Signed-off-by: Zhichao gao <zhichao.gao@intel.com>
> > > > > > > ---
> > > > > > >  MdeModulePkg/Universal/CapsulePei/Capsule.h   |   3 +-
> > > > > > >  .../Universal/CapsulePei/CapsulePei.inf       |   3 +-
> > > > > > >  .../Universal/CapsulePei/UefiCapsule.c        | 357 ++++++++++-------
> > -
> > > > > > >  3 files changed, 194 insertions(+), 169 deletions(-)
> > > > > > >
> > > > > > > diff --git a/MdeModulePkg/Universal/CapsulePei/Capsule.h
> > > > > > > b/MdeModulePkg/Universal/CapsulePei/Capsule.h
> > > > > > > index baf40423af..fc20dd8b92 100644
> > > > > > > --- a/MdeModulePkg/Universal/CapsulePei/Capsule.h
> > > > > > > +++ b/MdeModulePkg/Universal/CapsulePei/Capsule.h
> > > > > > > @@ -1,6 +1,6 @@
> > > > > > >  /** @file
> > > > > > >
> > > > > > > -Copyright (c) 2006 - 2018, Intel Corporation. All rights
> > > > > > > reserved.<BR>
> > > > > > > +Copyright (c) 2006 - 2019, Intel Corporation. All rights
> > > > > > > +reserved.<BR>
> > > > > > >
> > > > > > >  SPDX-License-Identifier: BSD-2-Clause-Patent
> > > > > > >
> > > > > > > @@ -30,6 +30,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
> > > > > > > #include <Library/PcdLib.h>  #include
> > > > > > > <Library/ReportStatusCodeLib.h> #include
> > > > > > > <Library/DebugAgentLib.h>
> > > > > > > +#include <Library/MemoryAllocationLib.h>
> > > > > > >  #include <IndustryStandard/PeImage.h>  #include
> > > > > > > "Common/CommonHeader.h"
> > > > > > >
> > > > > > > diff --git a/MdeModulePkg/Universal/CapsulePei/CapsulePei.inf
> > > > > > > b/MdeModulePkg/Universal/CapsulePei/CapsulePei.inf
> > > > > > > index 5d43df3075..9c88b3986f 100644
> > > > > > > --- a/MdeModulePkg/Universal/CapsulePei/CapsulePei.inf
> > > > > > > +++ b/MdeModulePkg/Universal/CapsulePei/CapsulePei.inf
> > > > > > > @@ -6,7 +6,7 @@
> > > > > > >  #  This external input must be validated carefully to avoid
> > > > > > > security issue like  #  buffer overflow, integer overflow.
> > > > > > >  #
> > > > > > > -# Copyright (c) 2006 - 2018, Intel Corporation. All rights
> > > > > > > reserved.<BR>
> > > > > > > +# Copyright (c) 2006 - 2019, Intel Corporation. All rights
> > > > > > > +reserved.<BR>
> > > > > >
> > > > > > ...why does Intel get the copyright?
> > > > > >
> > > > > > /
> > > > > >     Leif
> > > > >
> > > > >
> > > > >
> > >
> > >
> > >
> > 
> > 
> 
> 
> 
>