| Message ID | 1562620038-7017-2-git-send-email-arbab@linux.ibm.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Support the updated NPU in POWER9P; npu3 | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch master (4db38a36b31045f0a116d388ddeac850b38c8680) |
| snowpatch_ozlabs/snowpatch_job_snowpatch-skiboot | success | Test snowpatch/job/snowpatch-skiboot on branch master |
| snowpatch_ozlabs/snowpatch_job_snowpatch-skiboot-dco | success | Signed-off-by present |
On Tuesday, 9 July 2019 7:07:11 AM AEST Reza Arbab wrote: > How did I notice one dup in aa56d9a2abdb ("Remove duplicate npu-common.o > from $(HW_OBJS)"), but not the other five? Remove them too. I have my theories ;) Reviewed-by: Alistair Popple <alistair@popple.id.au> > Signed-off-by: Reza Arbab <arbab@linux.ibm.com> > --- > hw/Makefile.inc | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/hw/Makefile.inc b/hw/Makefile.inc > index 0e8c257fb80a..b6727bdfc133 100644 > --- a/hw/Makefile.inc > +++ b/hw/Makefile.inc > @@ -6,10 +6,8 @@ HW_OBJS += nx.o nx-rng.o nx-crypto.o nx-compress.o nx-842.o > nx-gzip.o HW_OBJS += phb3.o sfc-ctrl.o fake-rtc.o bt.o p8-i2c.o prd.o > HW_OBJS += dts.o lpc-rtc.o npu.o npu-hw-procedures.o xive.o phb4.o > HW_OBJS += fake-nvram.o lpc-mbox.o npu2.o npu2-hw-procedures.o > -HW_OBJS += npu2-common.o phys-map.o sbe-p9.o capp.o occ-sensor.o vas.o > -HW_OBJS += npu2-opencapi.o phys-map.o sbe-p9.o capp.o occ-sensor.o > -HW_OBJS += vas.o sbe-p8.o dio-p9.o > -HW_OBJS += lpc-port80h.o > +HW_OBJS += npu2-common.o npu2-opencapi.o phys-map.o sbe-p9.o capp.o > +HW_OBJS += occ-sensor.o vas.o sbe-p8.o dio-p9.o lpc-port80h.o > HW=hw/built-in.a > > include $(SRC)/hw/fsp/Makefile.inc
On 9/7/19 7:07 am, Reza Arbab wrote: > How did I notice one dup in aa56d9a2abdb ("Remove duplicate npu-common.o > from $(HW_OBJS)"), but not the other five? Remove them too. > > Signed-off-by: Reza Arbab <arbab@linux.ibm.com> And apparently I haven't noticed any of them every time I've looked at that makefile... Reviewed-by: Andrew Donnellan <ajd@linux.ibm.com> > --- > hw/Makefile.inc | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/hw/Makefile.inc b/hw/Makefile.inc > index 0e8c257fb80a..b6727bdfc133 100644 > --- a/hw/Makefile.inc > +++ b/hw/Makefile.inc > @@ -6,10 +6,8 @@ HW_OBJS += nx.o nx-rng.o nx-crypto.o nx-compress.o nx-842.o nx-gzip.o > HW_OBJS += phb3.o sfc-ctrl.o fake-rtc.o bt.o p8-i2c.o prd.o > HW_OBJS += dts.o lpc-rtc.o npu.o npu-hw-procedures.o xive.o phb4.o > HW_OBJS += fake-nvram.o lpc-mbox.o npu2.o npu2-hw-procedures.o > -HW_OBJS += npu2-common.o phys-map.o sbe-p9.o capp.o occ-sensor.o vas.o > -HW_OBJS += npu2-opencapi.o phys-map.o sbe-p9.o capp.o occ-sensor.o > -HW_OBJS += vas.o sbe-p8.o dio-p9.o > -HW_OBJS += lpc-port80h.o > +HW_OBJS += npu2-common.o npu2-opencapi.o phys-map.o sbe-p9.o capp.o > +HW_OBJS += occ-sensor.o vas.o sbe-p8.o dio-p9.o lpc-port80h.o > HW=hw/built-in.a > > include $(SRC)/hw/fsp/Makefile.inc >
On Tue, Jul 9, 2019 at 7:09 AM Reza Arbab <arbab@linux.ibm.com> wrote: > > How did I notice one dup in aa56d9a2abdb ("Remove duplicate npu-common.o > from $(HW_OBJS)"), but not the other five? Remove them too. > > Signed-off-by: Reza Arbab <arbab@linux.ibm.com> > --- > hw/Makefile.inc | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/hw/Makefile.inc b/hw/Makefile.inc > index 0e8c257fb80a..b6727bdfc133 100644 > --- a/hw/Makefile.inc > +++ b/hw/Makefile.inc > @@ -6,10 +6,8 @@ HW_OBJS += nx.o nx-rng.o nx-crypto.o nx-compress.o nx-842.o nx-gzip.o > HW_OBJS += phb3.o sfc-ctrl.o fake-rtc.o bt.o p8-i2c.o prd.o > HW_OBJS += dts.o lpc-rtc.o npu.o npu-hw-procedures.o xive.o phb4.o > HW_OBJS += fake-nvram.o lpc-mbox.o npu2.o npu2-hw-procedures.o > -HW_OBJS += npu2-common.o phys-map.o sbe-p9.o capp.o occ-sensor.o vas.o > -HW_OBJS += npu2-opencapi.o phys-map.o sbe-p9.o capp.o occ-sensor.o Looks like screwed up conflict resolutions. It might be a better idea to split the common files into seperate groups to make this sort of thing easier to spot (and avoid in the first place). > -HW_OBJS += vas.o sbe-p8.o dio-p9.o > -HW_OBJS += lpc-port80h.o > +HW_OBJS += npu2-common.o npu2-opencapi.o phys-map.o sbe-p9.o capp.o > +HW_OBJS += occ-sensor.o vas.o sbe-p8.o dio-p9.o lpc-port80h.o > HW=hw/built-in.a > > include $(SRC)/hw/fsp/Makefile.inc > -- > 1.8.3.1 >
On Tue, Jul 09, 2019 at 01:36:17PM +1000, Oliver O'Halloran wrote: >On Tue, Jul 9, 2019 at 7:09 AM Reza Arbab <arbab@linux.ibm.com> wrote: >> --- a/hw/Makefile.inc >> +++ b/hw/Makefile.inc >> @@ -6,10 +6,8 @@ HW_OBJS += nx.o nx-rng.o nx-crypto.o nx-compress.o nx-842.o nx-gzip.o >> HW_OBJS += phb3.o sfc-ctrl.o fake-rtc.o bt.o p8-i2c.o prd.o >> HW_OBJS += dts.o lpc-rtc.o npu.o npu-hw-procedures.o xive.o phb4.o >> HW_OBJS += fake-nvram.o lpc-mbox.o npu2.o npu2-hw-procedures.o >> -HW_OBJS += npu2-common.o phys-map.o sbe-p9.o capp.o occ-sensor.o vas.o >> -HW_OBJS += npu2-opencapi.o phys-map.o sbe-p9.o capp.o occ-sensor.o > >Looks like screwed up conflict resolutions. It might be a better idea >to split the common files into seperate groups to make this sort of >thing easier to spot (and avoid in the first place). Could also put one item per line, alphabetized. Not very compact, but it prevents this kind of thing and also makes diffs much easier to read. We have a few other files with long lists: core/Makefile.inc hdata/Makefile.inc hw/Makefile.inc hw/fsp/Makefile.inc hw/ipmi/Makefile.inc
Reza Arbab <arbab@linux.ibm.com> writes: > On Tue, Jul 09, 2019 at 01:36:17PM +1000, Oliver O'Halloran wrote: >>On Tue, Jul 9, 2019 at 7:09 AM Reza Arbab <arbab@linux.ibm.com> wrote: >>> --- a/hw/Makefile.inc >>> +++ b/hw/Makefile.inc >>> @@ -6,10 +6,8 @@ HW_OBJS += nx.o nx-rng.o nx-crypto.o nx-compress.o nx-842.o nx-gzip.o >>> HW_OBJS += phb3.o sfc-ctrl.o fake-rtc.o bt.o p8-i2c.o prd.o >>> HW_OBJS += dts.o lpc-rtc.o npu.o npu-hw-procedures.o xive.o phb4.o >>> HW_OBJS += fake-nvram.o lpc-mbox.o npu2.o npu2-hw-procedures.o >>> -HW_OBJS += npu2-common.o phys-map.o sbe-p9.o capp.o occ-sensor.o vas.o >>> -HW_OBJS += npu2-opencapi.o phys-map.o sbe-p9.o capp.o occ-sensor.o >> >>Looks like screwed up conflict resolutions. It might be a better idea >>to split the common files into seperate groups to make this sort of >>thing easier to spot (and avoid in the first place). > > Could also put one item per line, alphabetized. Not very compact, but it > prevents this kind of thing and also makes diffs much easier to read. > We have a few other files with long lists: > > core/Makefile.inc > hdata/Makefile.inc > hw/Makefile.inc > hw/fsp/Makefile.inc > hw/ipmi/Makefile.inc I have a WIP patch that will make things either more complicated or simpler in this regard, I'll see if I can get it in a state to submit though :)
diff --git a/hw/Makefile.inc b/hw/Makefile.inc index 0e8c257fb80a..b6727bdfc133 100644 --- a/hw/Makefile.inc +++ b/hw/Makefile.inc @@ -6,10 +6,8 @@ HW_OBJS += nx.o nx-rng.o nx-crypto.o nx-compress.o nx-842.o nx-gzip.o HW_OBJS += phb3.o sfc-ctrl.o fake-rtc.o bt.o p8-i2c.o prd.o HW_OBJS += dts.o lpc-rtc.o npu.o npu-hw-procedures.o xive.o phb4.o HW_OBJS += fake-nvram.o lpc-mbox.o npu2.o npu2-hw-procedures.o -HW_OBJS += npu2-common.o phys-map.o sbe-p9.o capp.o occ-sensor.o vas.o -HW_OBJS += npu2-opencapi.o phys-map.o sbe-p9.o capp.o occ-sensor.o -HW_OBJS += vas.o sbe-p8.o dio-p9.o -HW_OBJS += lpc-port80h.o +HW_OBJS += npu2-common.o npu2-opencapi.o phys-map.o sbe-p9.o capp.o +HW_OBJS += occ-sensor.o vas.o sbe-p8.o dio-p9.o lpc-port80h.o HW=hw/built-in.a include $(SRC)/hw/fsp/Makefile.inc
How did I notice one dup in aa56d9a2abdb ("Remove duplicate npu-common.o from $(HW_OBJS)"), but not the other five? Remove them too. Signed-off-by: Reza Arbab <arbab@linux.ibm.com> --- hw/Makefile.inc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)