On Fri, May 04, 2018 at 10:45:50AM +0200, BALATON Zoltan wrote: > Signed-off-by: BALATON Zoltan <bala...@eik.bme.hu>
Applied to ppc-for-2.13. There won't be a pull request until after I'm back from holidays in a month, though. Sorry. > --- > hw/ppc/ppc440_pcix.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/ppc/ppc440_pcix.c b/hw/ppc/ppc440_pcix.c > index b1307e6..d8af04b 100644 > --- a/hw/ppc/ppc440_pcix.c > +++ b/hw/ppc/ppc440_pcix.c > @@ -257,7 +257,7 @@ static void ppc440_pcix_reg_write4(void *opaque, hwaddr > addr, > break; > case PCIX0_PIM2SAL: > s->pim[2].sa &= 0xffffffff00000000ULL; > - s->pim[2].sa = val; > + s->pim[2].sa |= val; > ppc440_pcix_update_pim(s, 2); > break; > case PCIX0_PIM2LAL: -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature