Re: [U-Boot] [Patch V3 2/3] fm: fdt: Move fman ucode fixup to Fman driver code
> -Original Message- > From: Scott Wood [mailto:o...@buserror.net] > Sent: Wednesday, February 17, 2016 5:23 AM > To: Qianyu Gong ; york sun ; u- > b...@lists.denx.de > Subject: Re: [U-Boot] [Patch V3 2/3] fm: fdt: Move fman ucode fixup to Fman > driver code > > On Mon, 2016-02-15 at 05:44 +, Qianyu Gong wrote: > > > -Original Message- > > > From: york sun > > > Sent: Friday, February 12, 2016 1:39 AM > > > To: Scott Wood ; Qianyu Gong > > > ; u- b...@lists.denx.de > > > Subject: Re: [U-Boot] [Patch V3 2/3] fm: fdt: Move fman ucode fixup > > > to Fman driver code > > > > > > On 02/08/2016 11:25 AM, Scott Wood wrote: > > > > On Mon, 2016-02-08 at 19:22 +, york sun wrote: > > > > > On 02/08/2016 11:18 AM, Scott Wood wrote: > > > > > > On Mon, 2016-02-08 at 19:03 +, york sun wrote: > > > > > > > On 02/01/2016 09:06 AM, york sun wrote: > > > > > > > > On 01/25/2016 09:40 PM, Qianyu Gong wrote: > > > > > > > > > > > > > > > > > > > -Original Message- > > > > > > > > > > From: Scott Wood [mailto:o...@buserror.net] > > > > > > > > > > Sent: Tuesday, January 26, 2016 1:17 AM > > > > > > > > > > To: Qianyu Gong ; > > > > > > > > > > u-boot@lists.denx.de > > > > > > > > > > Cc: b07...@freescale.com; Shaohui Xie > > > > > > > > > > > > > > > > > > > > Subject: Re: [U-Boot] [Patch V3 2/3] fm: fdt: Move > > > > > > > > > > fman ucode fixup to Fman driver code > > > > > > > > > > > > > > > > > > > > On Mon, 2016-01-25 at 19:37 +0800, Gong Qianyu wrote: > > > > > > > > > > > Both Freescale Layerscape and powerpc/mpc85xx > > > > > > > > > > > platforms are using > > > > > > > > > > > fdt_fixup_fman_firmware() to insert Fman ucode blob > > > > > > > > > > > into the device tree. So move the function to driver > > > > > > > > > > > code. > > > > > > > > > > > > > > > > > > > > > > Signed-off-by: Gong Qianyu > > > > > > > > > > > --- > > > > > > > > > > > V3: > > > > > > > > > > > - Remove file changes about "qe.h". > > > > > > > > > > >(Should be put in the first patch of this > > > > > > > > > > > patchset) > > > > > > > > > > > V2: > > > > > > > > > > > - New patch. > > > > > > > > > > > > > > > > > > > > > > arch/powerpc/cpu/mpc85xx/fdt.c | 125 > > > > > > > > > > > ++ > > > > > > > > > > > - > > > > > > > > > > > drivers/net/fm/Makefile| 1 + > > > > > > > > > > > drivers/net/fm/fdt.c | 129 > > > > > > > > > > > + > > > > > > > > > > > include/fsl_fman.h | 1 + > > > > > > > > > > > 4 files changed, 136 insertions(+), 120 > > > > > > > > > > > deletions(-) > > > > > > > > > > > > > > > > > > > > Again, pass -M -C to git format-patch. > > > > > > > > > > > > > > > > > > > > -Scott > > > > > > > > > > > > > > > > > > I don't understand but I've already used "git > > > > > > > > > format-patch -M -C > > > > > > > > > - -stat ...". > > > > > > > > > > > > > > > > > > > > > > > > > Scott means using -M and -C, git should detect the moving > > > > > > > > instead of adding and deleting the same code. Try to add > > > > > > > > --find-copies-harder to see if it generates a smaller > > > > > > > > patch. > > > > > > > > > > > > > > > > > > > > > > Qianyu, > > > > > > > > > > > > > > Since you are on holiday, I tried it for you. Adjusting "-M -C" > > > > > > > doesn't > > > > > > > work. > > > > > > > Even you are moving the function from one file to another, > > > > > > > "git format -patch" > > > > > > > cannot detect the moving because both files exist before and > > > > > > > after this change, and the change set is not significant > > > > > > > enough to be detected. > > > > > > > > > > > > It looks like the patch is creating drivers/net/fm/fdt.c... > > > > > > > > > > > > Actually you were right. This patch creates a new file. There are > > > also other small changes here and there. Maybe that's the reason git > > > doesn't detect the move. > > > > > > Anyway, let me know if you have further comment. I am testing these > > > patches. > > > > > > York > > > > Hi York, > > > > Thanks! I did make small changes in the function to make it work for > > both powerpc and arm platforms. > > Those changes should have been a separate patch -- otherwise it's a lot of > work to > see what those changes are and review them. > > -Scott OK.. Thanks for your reminder. Regards, Qianyu ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [Patch V3 2/3] fm: fdt: Move fman ucode fixup to Fman driver code
On Mon, 2016-02-15 at 05:44 +, Qianyu Gong wrote: > > -Original Message- > > From: york sun > > Sent: Friday, February 12, 2016 1:39 AM > > To: Scott Wood ; Qianyu Gong ; u- > > b...@lists.denx.de > > Subject: Re: [U-Boot] [Patch V3 2/3] fm: fdt: Move fman ucode fixup to > > Fman > > driver code > > > > On 02/08/2016 11:25 AM, Scott Wood wrote: > > > On Mon, 2016-02-08 at 19:22 +, york sun wrote: > > > > On 02/08/2016 11:18 AM, Scott Wood wrote: > > > > > On Mon, 2016-02-08 at 19:03 +, york sun wrote: > > > > > > On 02/01/2016 09:06 AM, york sun wrote: > > > > > > > On 01/25/2016 09:40 PM, Qianyu Gong wrote: > > > > > > > > > > > > > > > > > -Original Message- > > > > > > > > > From: Scott Wood [mailto:o...@buserror.net] > > > > > > > > > Sent: Tuesday, January 26, 2016 1:17 AM > > > > > > > > > To: Qianyu Gong ; u-boot@lists.denx.de > > > > > > > > > Cc: b07...@freescale.com; Shaohui Xie > > > > > > > > > Subject: Re: [U-Boot] [Patch V3 2/3] fm: fdt: Move fman > > > > > > > > > ucode > > > > > > > > > fixup to Fman driver code > > > > > > > > > > > > > > > > > > On Mon, 2016-01-25 at 19:37 +0800, Gong Qianyu wrote: > > > > > > > > > > Both Freescale Layerscape and powerpc/mpc85xx platforms > > > > > > > > > > are > > > > > > > > > > using > > > > > > > > > > fdt_fixup_fman_firmware() to insert Fman ucode blob into > > > > > > > > > > the > > > > > > > > > > device tree. So move the function to driver code. > > > > > > > > > > > > > > > > > > > > Signed-off-by: Gong Qianyu > > > > > > > > > > --- > > > > > > > > > > V3: > > > > > > > > > > - Remove file changes about "qe.h". > > > > > > > > > >(Should be put in the first patch of this patchset) > > > > > > > > > > V2: > > > > > > > > > > - New patch. > > > > > > > > > > > > > > > > > > > > arch/powerpc/cpu/mpc85xx/fdt.c | 125 > > > > > > > > > > ++ > > > > > > > > > > - > > > > > > > > > > drivers/net/fm/Makefile| 1 + > > > > > > > > > > drivers/net/fm/fdt.c | 129 > > > > > > > > > > + > > > > > > > > > > include/fsl_fman.h | 1 + > > > > > > > > > > 4 files changed, 136 insertions(+), 120 deletions(-) > > > > > > > > > > > > > > > > > > Again, pass -M -C to git format-patch. > > > > > > > > > > > > > > > > > > -Scott > > > > > > > > > > > > > > > > I don't understand but I've already used "git format-patch -M > > > > > > > > -C > > > > > > > > - -stat ...". > > > > > > > > > > > > > > > > > > > > > > Scott means using -M and -C, git should detect the moving > > > > > > > instead of > > > > > > > adding and > > > > > > > deleting the same code. Try to add --find-copies-harder to see > > > > > > > if it > > > > > > > generates a > > > > > > > smaller patch. > > > > > > > > > > > > > > > > > > > Qianyu, > > > > > > > > > > > > Since you are on holiday, I tried it for you. Adjusting "-M -C" > > > > > > doesn't > > > > > > work. > > > > > > Even you are moving the function from one file to another, "git > > > > > > format > > > > > > -patch" > > > > > > cannot detect the moving because both files exist before and after > > > > > > this > > > > > > change, > > > > > > and the change set is not significant enough to be detected. > > > > > > > > > > It looks like the patch is creating drivers/net/fm/fdt.c... > > > > > > > > > Actually you were right. This patch creates a new file. There are also > > other > > small changes here and there. Maybe that's the reason git doesn't detect > > the move. > > > > Anyway, let me know if you have further comment. I am testing these > > patches. > > > > York > > Hi York, > > Thanks! I did make small changes in the function to make it work for both > powerpc > and arm platforms. Those changes should have been a separate patch -- otherwise it's a lot of work to see what those changes are and review them. -Scott ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [Patch V3 2/3] fm: fdt: Move fman ucode fixup to Fman driver code
> -Original Message- > From: york sun > Sent: Friday, February 12, 2016 1:39 AM > To: Scott Wood ; Qianyu Gong ; u- > b...@lists.denx.de > Subject: Re: [U-Boot] [Patch V3 2/3] fm: fdt: Move fman ucode fixup to Fman > driver code > > On 02/08/2016 11:25 AM, Scott Wood wrote: > > On Mon, 2016-02-08 at 19:22 +, york sun wrote: > >> On 02/08/2016 11:18 AM, Scott Wood wrote: > >>> On Mon, 2016-02-08 at 19:03 +, york sun wrote: > >>>> On 02/01/2016 09:06 AM, york sun wrote: > >>>>> On 01/25/2016 09:40 PM, Qianyu Gong wrote: > >>>>>> > >>>>>>> -Original Message- > >>>>>>> From: Scott Wood [mailto:o...@buserror.net] > >>>>>>> Sent: Tuesday, January 26, 2016 1:17 AM > >>>>>>> To: Qianyu Gong ; u-boot@lists.denx.de > >>>>>>> Cc: b07...@freescale.com; Shaohui Xie > >>>>>>> Subject: Re: [U-Boot] [Patch V3 2/3] fm: fdt: Move fman ucode > >>>>>>> fixup to Fman driver code > >>>>>>> > >>>>>>> On Mon, 2016-01-25 at 19:37 +0800, Gong Qianyu wrote: > >>>>>>>> Both Freescale Layerscape and powerpc/mpc85xx platforms are > >>>>>>>> using > >>>>>>>> fdt_fixup_fman_firmware() to insert Fman ucode blob into the > >>>>>>>> device tree. So move the function to driver code. > >>>>>>>> > >>>>>>>> Signed-off-by: Gong Qianyu > >>>>>>>> --- > >>>>>>>> V3: > >>>>>>>> - Remove file changes about "qe.h". > >>>>>>>>(Should be put in the first patch of this patchset) > >>>>>>>> V2: > >>>>>>>> - New patch. > >>>>>>>> > >>>>>>>> arch/powerpc/cpu/mpc85xx/fdt.c | 125 > >>>>>>>> ++ > >>>>>>>> - > >>>>>>>> drivers/net/fm/Makefile| 1 + > >>>>>>>> drivers/net/fm/fdt.c | 129 > >>>>>>>> + > >>>>>>>> include/fsl_fman.h | 1 + > >>>>>>>> 4 files changed, 136 insertions(+), 120 deletions(-) > >>>>>>> > >>>>>>> Again, pass -M -C to git format-patch. > >>>>>>> > >>>>>>> -Scott > >>>>>> > >>>>>> I don't understand but I've already used "git format-patch -M -C > >>>>>> - -stat ...". > >>>>>> > >>>>> > >>>>> Scott means using -M and -C, git should detect the moving instead of > >>>>> adding and > >>>>> deleting the same code. Try to add --find-copies-harder to see if it > >>>>> generates a > >>>>> smaller patch. > >>>>> > >>>> > >>>> Qianyu, > >>>> > >>>> Since you are on holiday, I tried it for you. Adjusting "-M -C" doesn't > >>>> work. > >>>> Even you are moving the function from one file to another, "git format > >>>> -patch" > >>>> cannot detect the moving because both files exist before and after this > >>>> change, > >>>> and the change set is not significant enough to be detected. > >>> > >>> It looks like the patch is creating drivers/net/fm/fdt.c... > >>> > > Actually you were right. This patch creates a new file. There are also other > small changes here and there. Maybe that's the reason git doesn't detect the > move. > > Anyway, let me know if you have further comment. I am testing these patches. > > York Hi York, Thanks! I did make small changes in the function to make it work for both powerpc and arm platforms. Regards, Qianyu ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [Patch V3 2/3] fm: fdt: Move fman ucode fixup to Fman driver code
On 02/08/2016 11:25 AM, Scott Wood wrote: > On Mon, 2016-02-08 at 19:22 +, york sun wrote: >> On 02/08/2016 11:18 AM, Scott Wood wrote: >>> On Mon, 2016-02-08 at 19:03 +, york sun wrote: >>>> On 02/01/2016 09:06 AM, york sun wrote: >>>>> On 01/25/2016 09:40 PM, Qianyu Gong wrote: >>>>>> >>>>>>> -Original Message- >>>>>>> From: Scott Wood [mailto:o...@buserror.net] >>>>>>> Sent: Tuesday, January 26, 2016 1:17 AM >>>>>>> To: Qianyu Gong ; u-boot@lists.denx.de >>>>>>> Cc: b07...@freescale.com; Shaohui Xie >>>>>>> Subject: Re: [U-Boot] [Patch V3 2/3] fm: fdt: Move fman ucode >>>>>>> fixup to >>>>>>> Fman >>>>>>> driver code >>>>>>> >>>>>>> On Mon, 2016-01-25 at 19:37 +0800, Gong Qianyu wrote: >>>>>>>> Both Freescale Layerscape and powerpc/mpc85xx platforms are >>>>>>>> using >>>>>>>> fdt_fixup_fman_firmware() to insert Fman ucode blob into the >>>>>>>> device >>>>>>>> tree. So move the function to driver code. >>>>>>>> >>>>>>>> Signed-off-by: Gong Qianyu >>>>>>>> --- >>>>>>>> V3: >>>>>>>> - Remove file changes about "qe.h". >>>>>>>>(Should be put in the first patch of this patchset) >>>>>>>> V2: >>>>>>>> - New patch. >>>>>>>> >>>>>>>> arch/powerpc/cpu/mpc85xx/fdt.c | 125 >>>>>>>> ++ >>>>>>>> - >>>>>>>> drivers/net/fm/Makefile| 1 + >>>>>>>> drivers/net/fm/fdt.c | 129 >>>>>>>> + >>>>>>>> include/fsl_fman.h | 1 + >>>>>>>> 4 files changed, 136 insertions(+), 120 deletions(-) >>>>>>> >>>>>>> Again, pass -M -C to git format-patch. >>>>>>> >>>>>>> -Scott >>>>>> >>>>>> I don't understand but I've already used "git format-patch -M -C - >>>>>> -stat >>>>>> ...". >>>>>> >>>>> >>>>> Scott means using -M and -C, git should detect the moving instead of >>>>> adding and >>>>> deleting the same code. Try to add --find-copies-harder to see if it >>>>> generates a >>>>> smaller patch. >>>>> >>>> >>>> Qianyu, >>>> >>>> Since you are on holiday, I tried it for you. Adjusting "-M -C" doesn't >>>> work. >>>> Even you are moving the function from one file to another, "git format >>>> -patch" >>>> cannot detect the moving because both files exist before and after this >>>> change, >>>> and the change set is not significant enough to be detected. >>> >>> It looks like the patch is creating drivers/net/fm/fdt.c... >>> Actually you were right. This patch creates a new file. There are also other small changes here and there. Maybe that's the reason git doesn't detect the move. Anyway, let me know if you have further comment. I am testing these patches. York ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [Patch V3 2/3] fm: fdt: Move fman ucode fixup to Fman driver code
On 02/08/2016 11:18 AM, Scott Wood wrote: > On Mon, 2016-02-08 at 19:03 +, york sun wrote: >> On 02/01/2016 09:06 AM, york sun wrote: >>> On 01/25/2016 09:40 PM, Qianyu Gong wrote: >>>> >>>>> -Original Message- >>>>> From: Scott Wood [mailto:o...@buserror.net] >>>>> Sent: Tuesday, January 26, 2016 1:17 AM >>>>> To: Qianyu Gong ; u-boot@lists.denx.de >>>>> Cc: b07...@freescale.com; Shaohui Xie >>>>> Subject: Re: [U-Boot] [Patch V3 2/3] fm: fdt: Move fman ucode fixup to >>>>> Fman >>>>> driver code >>>>> >>>>> On Mon, 2016-01-25 at 19:37 +0800, Gong Qianyu wrote: >>>>>> Both Freescale Layerscape and powerpc/mpc85xx platforms are using >>>>>> fdt_fixup_fman_firmware() to insert Fman ucode blob into the device >>>>>> tree. So move the function to driver code. >>>>>> >>>>>> Signed-off-by: Gong Qianyu >>>>>> --- >>>>>> V3: >>>>>> - Remove file changes about "qe.h". >>>>>>(Should be put in the first patch of this patchset) >>>>>> V2: >>>>>> - New patch. >>>>>> >>>>>> arch/powerpc/cpu/mpc85xx/fdt.c | 125 >>>>>> ++ >>>>>> - >>>>>> drivers/net/fm/Makefile| 1 + >>>>>> drivers/net/fm/fdt.c | 129 >>>>>> + >>>>>> include/fsl_fman.h | 1 + >>>>>> 4 files changed, 136 insertions(+), 120 deletions(-) >>>>> >>>>> Again, pass -M -C to git format-patch. >>>>> >>>>> -Scott >>>> >>>> I don't understand but I've already used "git format-patch -M -C --stat >>>> ...". >>>> >>> >>> Scott means using -M and -C, git should detect the moving instead of >>> adding and >>> deleting the same code. Try to add --find-copies-harder to see if it >>> generates a >>> smaller patch. >>> >> >> Qianyu, >> >> Since you are on holiday, I tried it for you. Adjusting "-M -C" doesn't >> work. >> Even you are moving the function from one file to another, "git format >> -patch" >> cannot detect the moving because both files exist before and after this >> change, >> and the change set is not significant enough to be detected. > > It looks like the patch is creating drivers/net/fm/fdt.c... > I was fooled and tried to adjust -M with numbers. I only noticed when I compared these two files before and after this patch. Even it is moving a chunk of code from file A to file B, git cannot generate a patch saying so. York ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [Patch V3 2/3] fm: fdt: Move fman ucode fixup to Fman driver code
On Mon, 2016-02-08 at 19:22 +, york sun wrote: > On 02/08/2016 11:18 AM, Scott Wood wrote: > > On Mon, 2016-02-08 at 19:03 +, york sun wrote: > > > On 02/01/2016 09:06 AM, york sun wrote: > > > > On 01/25/2016 09:40 PM, Qianyu Gong wrote: > > > > > > > > > > > -Original Message- > > > > > > From: Scott Wood [mailto:o...@buserror.net] > > > > > > Sent: Tuesday, January 26, 2016 1:17 AM > > > > > > To: Qianyu Gong ; u-boot@lists.denx.de > > > > > > Cc: b07...@freescale.com; Shaohui Xie > > > > > > Subject: Re: [U-Boot] [Patch V3 2/3] fm: fdt: Move fman ucode > > > > > > fixup to > > > > > > Fman > > > > > > driver code > > > > > > > > > > > > On Mon, 2016-01-25 at 19:37 +0800, Gong Qianyu wrote: > > > > > > > Both Freescale Layerscape and powerpc/mpc85xx platforms are > > > > > > > using > > > > > > > fdt_fixup_fman_firmware() to insert Fman ucode blob into the > > > > > > > device > > > > > > > tree. So move the function to driver code. > > > > > > > > > > > > > > Signed-off-by: Gong Qianyu > > > > > > > --- > > > > > > > V3: > > > > > > > - Remove file changes about "qe.h". > > > > > > >(Should be put in the first patch of this patchset) > > > > > > > V2: > > > > > > > - New patch. > > > > > > > > > > > > > > arch/powerpc/cpu/mpc85xx/fdt.c | 125 > > > > > > > ++ > > > > > > > - > > > > > > > drivers/net/fm/Makefile| 1 + > > > > > > > drivers/net/fm/fdt.c | 129 > > > > > > > + > > > > > > > include/fsl_fman.h | 1 + > > > > > > > 4 files changed, 136 insertions(+), 120 deletions(-) > > > > > > > > > > > > Again, pass -M -C to git format-patch. > > > > > > > > > > > > -Scott > > > > > > > > > > I don't understand but I've already used "git format-patch -M -C - > > > > > -stat > > > > > ...". > > > > > > > > > > > > > Scott means using -M and -C, git should detect the moving instead of > > > > adding and > > > > deleting the same code. Try to add --find-copies-harder to see if it > > > > generates a > > > > smaller patch. > > > > > > > > > > Qianyu, > > > > > > Since you are on holiday, I tried it for you. Adjusting "-M -C" doesn't > > > work. > > > Even you are moving the function from one file to another, "git format > > > -patch" > > > cannot detect the moving because both files exist before and after this > > > change, > > > and the change set is not significant enough to be detected. > > > > It looks like the patch is creating drivers/net/fm/fdt.c... > > > > I was fooled and tried to adjust -M with numbers. I only noticed when I > compared > these two files before and after this patch. > > Even it is moving a chunk of code from file A to file B, git cannot generate > a > patch saying so. It can show it as a copy with the portions not copied deleted, though maybe not enough was copied in this case. -Scott ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [Patch V3 2/3] fm: fdt: Move fman ucode fixup to Fman driver code
On Mon, 2016-02-08 at 19:03 +, york sun wrote: > On 02/01/2016 09:06 AM, york sun wrote: > > On 01/25/2016 09:40 PM, Qianyu Gong wrote: > > > > > > > -Original Message- > > > > From: Scott Wood [mailto:o...@buserror.net] > > > > Sent: Tuesday, January 26, 2016 1:17 AM > > > > To: Qianyu Gong ; u-boot@lists.denx.de > > > > Cc: b07...@freescale.com; Shaohui Xie > > > > Subject: Re: [U-Boot] [Patch V3 2/3] fm: fdt: Move fman ucode fixup to > > > > Fman > > > > driver code > > > > > > > > On Mon, 2016-01-25 at 19:37 +0800, Gong Qianyu wrote: > > > > > Both Freescale Layerscape and powerpc/mpc85xx platforms are using > > > > > fdt_fixup_fman_firmware() to insert Fman ucode blob into the device > > > > > tree. So move the function to driver code. > > > > > > > > > > Signed-off-by: Gong Qianyu > > > > > --- > > > > > V3: > > > > > - Remove file changes about "qe.h". > > > > >(Should be put in the first patch of this patchset) > > > > > V2: > > > > > - New patch. > > > > > > > > > > arch/powerpc/cpu/mpc85xx/fdt.c | 125 > > > > > ++ > > > > > - > > > > > drivers/net/fm/Makefile| 1 + > > > > > drivers/net/fm/fdt.c | 129 > > > > > + > > > > > include/fsl_fman.h | 1 + > > > > > 4 files changed, 136 insertions(+), 120 deletions(-) > > > > > > > > Again, pass -M -C to git format-patch. > > > > > > > > -Scott > > > > > > I don't understand but I've already used "git format-patch -M -C --stat > > > ...". > > > > > > > Scott means using -M and -C, git should detect the moving instead of > > adding and > > deleting the same code. Try to add --find-copies-harder to see if it > > generates a > > smaller patch. > > > > Qianyu, > > Since you are on holiday, I tried it for you. Adjusting "-M -C" doesn't > work. > Even you are moving the function from one file to another, "git format > -patch" > cannot detect the moving because both files exist before and after this > change, > and the change set is not significant enough to be detected. It looks like the patch is creating drivers/net/fm/fdt.c... -Scott ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [Patch V3 2/3] fm: fdt: Move fman ucode fixup to Fman driver code
On 02/01/2016 09:06 AM, york sun wrote: > On 01/25/2016 09:40 PM, Qianyu Gong wrote: >> >>> -Original Message- >>> From: Scott Wood [mailto:o...@buserror.net] >>> Sent: Tuesday, January 26, 2016 1:17 AM >>> To: Qianyu Gong ; u-boot@lists.denx.de >>> Cc: b07...@freescale.com; Shaohui Xie >>> Subject: Re: [U-Boot] [Patch V3 2/3] fm: fdt: Move fman ucode fixup to Fman >>> driver code >>> >>> On Mon, 2016-01-25 at 19:37 +0800, Gong Qianyu wrote: >>>> Both Freescale Layerscape and powerpc/mpc85xx platforms are using >>>> fdt_fixup_fman_firmware() to insert Fman ucode blob into the device >>>> tree. So move the function to driver code. >>>> >>>> Signed-off-by: Gong Qianyu >>>> --- >>>> V3: >>>> - Remove file changes about "qe.h". >>>>(Should be put in the first patch of this patchset) >>>> V2: >>>> - New patch. >>>> >>>> arch/powerpc/cpu/mpc85xx/fdt.c | 125 >>>> ++ >>>> - >>>> drivers/net/fm/Makefile| 1 + >>>> drivers/net/fm/fdt.c | 129 >>>> + >>>> include/fsl_fman.h | 1 + >>>> 4 files changed, 136 insertions(+), 120 deletions(-) >>> >>> Again, pass -M -C to git format-patch. >>> >>> -Scott >> >> I don't understand but I've already used "git format-patch -M -C --stat ...". >> > > Scott means using -M and -C, git should detect the moving instead of adding > and > deleting the same code. Try to add --find-copies-harder to see if it > generates a > smaller patch. > Qianyu, Since you are on holiday, I tried it for you. Adjusting "-M -C" doesn't work. Even you are moving the function from one file to another, "git format-patch" cannot detect the moving because both files exist before and after this change, and the change set is not significant enough to be detected. York ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [Patch V3 2/3] fm: fdt: Move fman ucode fixup to Fman driver code
On 01/25/2016 09:40 PM, Qianyu Gong wrote: > >> -Original Message- >> From: Scott Wood [mailto:o...@buserror.net] >> Sent: Tuesday, January 26, 2016 1:17 AM >> To: Qianyu Gong ; u-boot@lists.denx.de >> Cc: b07...@freescale.com; Shaohui Xie >> Subject: Re: [U-Boot] [Patch V3 2/3] fm: fdt: Move fman ucode fixup to Fman >> driver code >> >> On Mon, 2016-01-25 at 19:37 +0800, Gong Qianyu wrote: >>> Both Freescale Layerscape and powerpc/mpc85xx platforms are using >>> fdt_fixup_fman_firmware() to insert Fman ucode blob into the device >>> tree. So move the function to driver code. >>> >>> Signed-off-by: Gong Qianyu >>> --- >>> V3: >>> - Remove file changes about "qe.h". >>>(Should be put in the first patch of this patchset) >>> V2: >>> - New patch. >>> >>> arch/powerpc/cpu/mpc85xx/fdt.c | 125 >>> ++ >>> - >>> drivers/net/fm/Makefile| 1 + >>> drivers/net/fm/fdt.c | 129 >>> + >>> include/fsl_fman.h | 1 + >>> 4 files changed, 136 insertions(+), 120 deletions(-) >> >> Again, pass -M -C to git format-patch. >> >> -Scott > > I don't understand but I've already used "git format-patch -M -C --stat ...". > Scott means using -M and -C, git should detect the moving instead of adding and deleting the same code. Try to add --find-copies-harder to see if it generates a smaller patch. York ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [Patch V3 2/3] fm: fdt: Move fman ucode fixup to Fman driver code
> -Original Message- > From: Scott Wood [mailto:o...@buserror.net] > Sent: Tuesday, January 26, 2016 1:17 AM > To: Qianyu Gong ; u-boot@lists.denx.de > Cc: b07...@freescale.com; Shaohui Xie > Subject: Re: [U-Boot] [Patch V3 2/3] fm: fdt: Move fman ucode fixup to Fman > driver code > > On Mon, 2016-01-25 at 19:37 +0800, Gong Qianyu wrote: > > Both Freescale Layerscape and powerpc/mpc85xx platforms are using > > fdt_fixup_fman_firmware() to insert Fman ucode blob into the device > > tree. So move the function to driver code. > > > > Signed-off-by: Gong Qianyu > > --- > > V3: > > - Remove file changes about "qe.h". > >(Should be put in the first patch of this patchset) > > V2: > > - New patch. > > > > arch/powerpc/cpu/mpc85xx/fdt.c | 125 > > ++ > > - > > drivers/net/fm/Makefile| 1 + > > drivers/net/fm/fdt.c | 129 > > + > > include/fsl_fman.h | 1 + > > 4 files changed, 136 insertions(+), 120 deletions(-) > > Again, pass -M -C to git format-patch. > > -Scott I don't understand but I've already used "git format-patch -M -C --stat ...". Regards, Qianyu ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [Patch V3 2/3] fm: fdt: Move fman ucode fixup to Fman driver code
On Mon, 2016-01-25 at 19:37 +0800, Gong Qianyu wrote: > Both Freescale Layerscape and powerpc/mpc85xx platforms are using > fdt_fixup_fman_firmware() to insert Fman ucode blob into the device > tree. So move the function to driver code. > > Signed-off-by: Gong Qianyu > --- > V3: > - Remove file changes about "qe.h". >(Should be put in the first patch of this patchset) > V2: > - New patch. > > arch/powerpc/cpu/mpc85xx/fdt.c | 125 ++ > - > drivers/net/fm/Makefile| 1 + > drivers/net/fm/fdt.c | 129 > + > include/fsl_fman.h | 1 + > 4 files changed, 136 insertions(+), 120 deletions(-) Again, pass -M -C to git format-patch. -Scott ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [Patch V3 2/3] fm: fdt: Move fman ucode fixup to Fman driver code
Both Freescale Layerscape and powerpc/mpc85xx platforms are using fdt_fixup_fman_firmware() to insert Fman ucode blob into the device tree. So move the function to driver code. Signed-off-by: Gong Qianyu --- V3: - Remove file changes about "qe.h". (Should be put in the first patch of this patchset) V2: - New patch. arch/powerpc/cpu/mpc85xx/fdt.c | 125 ++- drivers/net/fm/Makefile| 1 + drivers/net/fm/fdt.c | 129 + include/fsl_fman.h | 1 + 4 files changed, 136 insertions(+), 120 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c index 50eef05..ced216c 100644 --- a/arch/powerpc/cpu/mpc85xx/fdt.c +++ b/arch/powerpc/cpu/mpc85xx/fdt.c @@ -19,7 +19,9 @@ #ifdef CONFIG_FSL_ESDHC #include #endif -#include /* For struct qe_firmware */ +#ifdef CONFIG_SYS_DPAA_FMAN +#include +#endif DECLARE_GLOBAL_DATA_PTR; @@ -488,125 +490,6 @@ static void ft_fixup_qe_snum(void *blob) } #endif -/** - * fdt_fixup_fman_firmware -- insert the Fman firmware into the device tree - * - * The binding for an Fman firmware node is documented in - * Documentation/powerpc/dts-bindings/fsl/dpaa/fman.txt. This node contains - * the actual Fman firmware binary data. The operating system is expected to - * be able to parse the binary data to determine any attributes it needs. - */ -#ifdef CONFIG_SYS_DPAA_FMAN -void fdt_fixup_fman_firmware(void *blob) -{ - int rc, fmnode, fwnode = -1; - uint32_t phandle; - struct qe_firmware *fmanfw; - const struct qe_header *hdr; - unsigned int length; - uint32_t crc; - const char *p; - - /* The first Fman we find will contain the actual firmware. */ - fmnode = fdt_node_offset_by_compatible(blob, -1, "fsl,fman"); - if (fmnode < 0) - /* Exit silently if there are no Fman devices */ - return; - - /* If we already have a firmware node, then also exit silently. */ - if (fdt_node_offset_by_compatible(blob, -1, "fsl,fman-firmware") > 0) - return; - - /* If the environment variable is not set, then exit silently */ - p = getenv("fman_ucode"); - if (!p) - return; - - fmanfw = (struct qe_firmware *) simple_strtoul(p, NULL, 16); - if (!fmanfw) - return; - - hdr = &fmanfw->header; - length = be32_to_cpu(hdr->length); - - /* Verify the firmware. */ - if ((hdr->magic[0] != 'Q') || (hdr->magic[1] != 'E') || - (hdr->magic[2] != 'F')) { - printf("Data at %p is not an Fman firmware\n", fmanfw); - return; - } - - if (length > CONFIG_SYS_QE_FMAN_FW_LENGTH) { - printf("Fman firmware at %p is too large (size=%u)\n", - fmanfw, length); - return; - } - - length -= sizeof(u32); /* Subtract the size of the CRC */ - crc = be32_to_cpu(*(u32 *)((void *)fmanfw + length)); - if (crc != crc32_no_comp(0, (void *)fmanfw, length)) { - printf("Fman firmware at %p has invalid CRC\n", fmanfw); - return; - } - - /* Increase the size of the fdt to make room for the node. */ - rc = fdt_increase_size(blob, fmanfw->header.length); - if (rc < 0) { - printf("Unable to make room for Fman firmware: %s\n", - fdt_strerror(rc)); - return; - } - - /* Create the firmware node. */ - fwnode = fdt_add_subnode(blob, fmnode, "fman-firmware"); - if (fwnode < 0) { - char s[64]; - fdt_get_path(blob, fmnode, s, sizeof(s)); - printf("Could not add firmware node to %s: %s\n", s, - fdt_strerror(fwnode)); - return; - } - rc = fdt_setprop_string(blob, fwnode, "compatible", "fsl,fman-firmware"); - if (rc < 0) { - char s[64]; - fdt_get_path(blob, fwnode, s, sizeof(s)); - printf("Could not add compatible property to node %s: %s\n", s, - fdt_strerror(rc)); - return; - } - phandle = fdt_create_phandle(blob, fwnode); - if (!phandle) { - char s[64]; - fdt_get_path(blob, fwnode, s, sizeof(s)); - printf("Could not add phandle property to node %s: %s\n", s, - fdt_strerror(rc)); - return; - } - rc = fdt_setprop(blob, fwnode, "fsl,firmware", fmanfw, fmanfw->header.length); - if (rc < 0) { - char s[64]; - fdt_get_path(blob, fwnode, s, sizeof(s)); - printf("Could not add firmware property to node %s: %s\n", s, - fdt_strerror(rc)); - return; - } - - /* Find all other Fman nodes and point them to th