Re: [PATCH v2 00/14] PPC440 devices misc clean up

[Daniel Henrique Barboza]

On 7/5/23 22:09, BALATON Zoltan wrote:
> On Wed, 5 Jul 2023, Daniel Henrique Barboza wrote:
> > Zoltan,
> >
> > Patches 1-9 are queued. Don't need to re-send those.
>
> Thanks, the last two patches are also reviewed and they don't depend on the 
> ones before so you could queue those too.

Just queued patch 13.

Patch 14 doesn't apply in ppc-next even after applying patch 13:

$ git am -s -m \[PATCH\ v2\ 14_14\]\ ppc440_pcix\:\ Stop\ using\ system\ io\ region\ 
for\ PCI\ bus\ -\ BALATON\ Zoltan\ \<balaton@eik.bme.hu\>\ -\ 2023-07-05\ 
1712.eml
Applying: ppc440_pcix: Stop using system io region for PCI bus
error: patch failed: hw/ppc/ppc440_pcix.c:490
error: hw/ppc/ppc440_pcix.c: patch does not apply
error: patch failed: hw/ppc/sam460ex.c:441
error: hw/ppc/sam460ex.c: patch does not apply
Patch failed at 0001 ppc440_pcix: Stop using system io region for PCI bus
hint: Use 'git am --show-current-patch=diff' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

I suspect we need  some of the previous (10, 11, 12) to apply it cleanly.



Thanks,

Daniel

> The only outstanding patches are those 3 that rename the type defines to match 
> their string values. We could come up with better names but those suggested by 
> Philippe are too long IMO so at least the patches in this series clean up the 
> current mess and we could rename these later. I'd rather not change the string 
> values too much as those are what QOM actually uses to ideintify the types but 
> we're free to change the defines. Currently we have:
> #define TYPE_PPC4xx_PCI_HOST_BRIDGE "ppc4xx-pcihost"
> and then a "ppc4xx-host-bridge" type without a define which is another type 
> which is quite confusing. I may have partly created this mess back when I first tried to 
> add sam460ex and did not know much about this but at least I'd like to improve it a 
> little and resolve some of it now.
>
> Regards,
> BALATON Zoltan