| Message ID | 20180919172101.8402-1-mark.cave-ayland@ilande.co.uk (mailing list archive) |
|---|---|
| Headers | show |
| Series | 40p: LSI SCSI IRQ routing patch roll-up | expand |
On Wed, Sep 19, 2018 at 06:20:56PM +0100, Mark Cave-Ayland wrote: > Here is the final set of 40p LSI SCSI routing patches with reviewer tags > rebased upon ppc-for-3.1 as requested by David. > > Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> So, when I requested that, I hadn't realized there were arm patches in here. I'm not terribly comfortable taking hw/arm patches through the ppc tree. So I'm not really sure our best way forward for merging this. > Mark Cave-Ayland (5): > scsi: add lsi53c8xx_handle_legacy_cmdline() function > scsi: move lsi53c8xx_create() callers to > lsi53c8xx_handle_legacy_cmdline() > scsi: remove unused lsi53c895a_create() and lsi53c810_create() > functions > lsi53c895a: add optional external IRQ via qdev > 40p: add fixed IRQ routing for LSI SCSI device > > hw/arm/realview.c | 3 ++- > hw/arm/versatilepb.c | 3 ++- > hw/hppa/machine.c | 4 +++- > hw/ppc/prep.c | 15 +++++++++------ > hw/scsi/lsi53c895a.c | 27 ++++++++++++++++----------- > include/hw/pci/pci.h | 3 +-- > 6 files changed, 33 insertions(+), 22 deletions(-) >
On 19 September 2018 at 19:55, David Gibson <david@gibson.dropbear.id.au> wrote: > On Wed, Sep 19, 2018 at 06:20:56PM +0100, Mark Cave-Ayland wrote: >> Here is the final set of 40p LSI SCSI routing patches with reviewer tags >> rebased upon ppc-for-3.1 as requested by David. >> >> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> > > So, when I requested that, I hadn't realized there were arm patches in > here. I'm not terribly comfortable taking hw/arm patches through the > ppc tree. So I'm not really sure our best way forward for merging > this. The arm changes are only the 2-line refactorings in patch 2 that touch a couple of arm boards (as well as an hppa one and a ppc one). I think the simplest thing is for you to take the whole set through ppc; otherwise we'd have to split up patch 2, take patch 1 through some tree, the various pieces of patch 2 through multiple trees and then 3-5 through ppc once those had all landed. Since it's an obviously-correct refactoring rather than a significant change to the boards, that seems like overkill. You can have my Acked-by: Peter Maydell <peter.maydell@linaro.org> for the arm parts. thanks -- PMM
On 20/09/2018 05:26, Peter Maydell wrote: > On 19 September 2018 at 19:55, David Gibson <david@gibson.dropbear.id.au> wrote: >> On Wed, Sep 19, 2018 at 06:20:56PM +0100, Mark Cave-Ayland wrote: >>> Here is the final set of 40p LSI SCSI routing patches with reviewer tags >>> rebased upon ppc-for-3.1 as requested by David. >>> >>> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> >> >> So, when I requested that, I hadn't realized there were arm patches in >> here. I'm not terribly comfortable taking hw/arm patches through the >> ppc tree. So I'm not really sure our best way forward for merging >> this. > > The arm changes are only the 2-line refactorings in patch 2 > that touch a couple of arm boards (as well as an hppa one and a > ppc one). I think the simplest thing is for you to take the > whole set through ppc; otherwise we'd have to split up patch 2, > take patch 1 through some tree, the various pieces of patch 2 > through multiple trees and then 3-5 through ppc once those had > all landed. Since it's an obviously-correct refactoring rather > than a significant change to the boards, that seems like overkill. > > You can have my > Acked-by: Peter Maydell <peter.maydell@linaro.org> > for the arm parts. I can confirm from my side that the changes are a simple mechanical change over to use the modified API, plus I took the (for me) unusual step of running a full QEMU build with no target list and then run "make check" to double-check I hadn't missed anything obvious. So based upon this I'm quite confident the non-PPC parts won't cause any issues. ATB, Mark.
On Wed, Sep 19, 2018 at 09:26:33PM -0700, Peter Maydell wrote: > On 19 September 2018 at 19:55, David Gibson <david@gibson.dropbear.id.au> wrote: > > On Wed, Sep 19, 2018 at 06:20:56PM +0100, Mark Cave-Ayland wrote: > >> Here is the final set of 40p LSI SCSI routing patches with reviewer tags > >> rebased upon ppc-for-3.1 as requested by David. > >> > >> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> > > > > So, when I requested that, I hadn't realized there were arm patches in > > here. I'm not terribly comfortable taking hw/arm patches through the > > ppc tree. So I'm not really sure our best way forward for merging > > this. > > The arm changes are only the 2-line refactorings in patch 2 > that touch a couple of arm boards (as well as an hppa one and a > ppc one). I think the simplest thing is for you to take the > whole set through ppc; otherwise we'd have to split up patch 2, > take patch 1 through some tree, the various pieces of patch 2 > through multiple trees and then 3-5 through ppc once those had > all landed. Since it's an obviously-correct refactoring rather > than a significant change to the boards, that seems like overkill. > > You can have my > Acked-by: Peter Maydell <peter.maydell@linaro.org> > for the arm parts. Fair enough. Merged to ppc-for-3.1.
On Thu, Sep 20, 2018 at 06:34:05AM +0100, Mark Cave-Ayland wrote: > On 20/09/2018 05:26, Peter Maydell wrote: > > > On 19 September 2018 at 19:55, David Gibson <david@gibson.dropbear.id.au> wrote: > >> On Wed, Sep 19, 2018 at 06:20:56PM +0100, Mark Cave-Ayland wrote: > >>> Here is the final set of 40p LSI SCSI routing patches with reviewer tags > >>> rebased upon ppc-for-3.1 as requested by David. > >>> > >>> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> > >> > >> So, when I requested that, I hadn't realized there were arm patches in > >> here. I'm not terribly comfortable taking hw/arm patches through the > >> ppc tree. So I'm not really sure our best way forward for merging > >> this. > > > > The arm changes are only the 2-line refactorings in patch 2 > > that touch a couple of arm boards (as well as an hppa one and a > > ppc one). I think the simplest thing is for you to take the > > whole set through ppc; otherwise we'd have to split up patch 2, > > take patch 1 through some tree, the various pieces of patch 2 > > through multiple trees and then 3-5 through ppc once those had > > all landed. Since it's an obviously-correct refactoring rather > > than a significant change to the boards, that seems like overkill. > > > > You can have my > > Acked-by: Peter Maydell <peter.maydell@linaro.org> > > for the arm parts. > > I can confirm from my side that the changes are a simple mechanical change over to > use the modified API, plus I took the (for me) unusual step of running a full QEMU > build with no target list and then run "make check" to double-check I hadn't missed > anything obvious. As an aside, can you please make that less unusual. I get patches which break the build of some target other than the one the author was thinking of pretty often, so I really think an all-targets build should be pretty much the minimum standard for testing prior to posting. > So based upon this I'm quite confident the non-PPC parts won't > cause any issues. > > > ATB, > > Mark. >
Here is the final set of 40p LSI SCSI routing patches with reviewer tags rebased upon ppc-for-3.1 as requested by David. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Mark Cave-Ayland (5): scsi: add lsi53c8xx_handle_legacy_cmdline() function scsi: move lsi53c8xx_create() callers to lsi53c8xx_handle_legacy_cmdline() scsi: remove unused lsi53c895a_create() and lsi53c810_create() functions lsi53c895a: add optional external IRQ via qdev 40p: add fixed IRQ routing for LSI SCSI device hw/arm/realview.c | 3 ++- hw/arm/versatilepb.c | 3 ++- hw/hppa/machine.c | 4 +++- hw/ppc/prep.c | 15 +++++++++------ hw/scsi/lsi53c895a.c | 27 ++++++++++++++++----------- include/hw/pci/pci.h | 3 +-- 6 files changed, 33 insertions(+), 22 deletions(-)