From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50162) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZq52-0005Je-PK for qemu-devel@nongnu.org; Mon, 02 Jul 2018 00:04:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZq50-0005Xt-UQ for qemu-devel@nongnu.org; Mon, 02 Jul 2018 00:04:48 -0400 Date: Mon, 2 Jul 2018 14:02:52 +1000 From: David Gibson Message-ID: <20180702040252.GT3422@umbus.fritz.box> References: <20180629121040.246A27456B2@zero.eik.bme.hu> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="v15hXiddb3kq3Bam" Content-Disposition: inline In-Reply-To: <20180629121040.246A27456B2@zero.eik.bme.hu> Subject: Re: [Qemu-devel] [PATCH v7] ppc440_uc: Basic emulation of PPC440 DMA controller List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: BALATON Zoltan Cc: qemu-devel@nongnu.org, qemu-ppc@nongnu.org, Alexander Graf , Cedric Le Goater --v15hXiddb3kq3Bam Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Jun 29, 2018 at 02:04:33PM +0200, BALATON Zoltan wrote: > PPC440 SoCs such as the AMCC 460EX have a DMA controller which is used > by AmigaOS on the sam460ex. Implement the parts used by AmigaOS so it > can get further booting on the sam460ex machine. >=20 > Signed-off-by: BALATON Zoltan Applied to ppc-for-3.0, thanks. > --- > v7: fix warning about uninitialised variable > v6: > - CamelCase type names > - Check return value of cpu_physical_memory_map >=20 > hw/ppc/ppc440.h | 1 + > hw/ppc/ppc440_uc.c | 222 +++++++++++++++++++++++++++++++++++++++++++++++= ++++++ > hw/ppc/sam460ex.c | 3 + > 3 files changed, 226 insertions(+) >=20 > diff --git a/hw/ppc/ppc440.h b/hw/ppc/ppc440.h > index ad27db1..7cef936 100644 > --- a/hw/ppc/ppc440.h > +++ b/hw/ppc/ppc440.h > @@ -21,6 +21,7 @@ void ppc440_sdram_init(CPUPPCState *env, int nbanks, > hwaddr *ram_bases, hwaddr *ram_sizes, > int do_init); > void ppc4xx_ahb_init(CPUPPCState *env); > +void ppc4xx_dma_init(CPUPPCState *env, int dcr_base); > void ppc460ex_pcie_init(CPUPPCState *env); > =20 > #endif /* PPC440_H */ > diff --git a/hw/ppc/ppc440_uc.c b/hw/ppc/ppc440_uc.c > index 123f4ac..32802d7 100644 > --- a/hw/ppc/ppc440_uc.c > +++ b/hw/ppc/ppc440_uc.c > @@ -13,6 +13,7 @@ > #include "qemu/cutils.h" > #include "qemu/error-report.h" > #include "qapi/error.h" > +#include "qemu/log.h" > #include "cpu.h" > #include "hw/hw.h" > #include "exec/address-spaces.h" > @@ -803,6 +804,227 @@ void ppc4xx_ahb_init(CPUPPCState *env) > } > =20 > /***********************************************************************= ******/ > +/* DMA controller */ > + > +#define DMA0_CR_CE (1 << 31) > +#define DMA0_CR_PW (1 << 26 | 1 << 25) > +#define DMA0_CR_DAI (1 << 24) > +#define DMA0_CR_SAI (1 << 23) > +#define DMA0_CR_DEC (1 << 2) > + > +enum { > + DMA0_CR =3D 0x00, > + DMA0_CT, > + DMA0_SAH, > + DMA0_SAL, > + DMA0_DAH, > + DMA0_DAL, > + DMA0_SGH, > + DMA0_SGL, > + > + DMA0_SR =3D 0x20, > + DMA0_SGC =3D 0x23, > + DMA0_SLP =3D 0x25, > + DMA0_POL =3D 0x26, > +}; > + > +typedef struct { > + uint32_t cr; > + uint32_t ct; > + uint64_t sa; > + uint64_t da; > + uint64_t sg; > +} PPC4xxDmaChnl; > + > +typedef struct { > + int base; > + PPC4xxDmaChnl ch[4]; > + uint32_t sr; > +} PPC4xxDmaState; > + > +static uint32_t dcr_read_dma(void *opaque, int dcrn) > +{ > + PPC4xxDmaState *dma =3D opaque; > + uint32_t val =3D 0; > + int addr =3D dcrn - dma->base; > + int chnl =3D addr / 8; > + > + switch (addr) { > + case 0x00 ... 0x1f: > + switch (addr % 8) { > + case DMA0_CR: > + val =3D dma->ch[chnl].cr; > + break; > + case DMA0_CT: > + val =3D dma->ch[chnl].ct; > + break; > + case DMA0_SAH: > + val =3D dma->ch[chnl].sa >> 32; > + break; > + case DMA0_SAL: > + val =3D dma->ch[chnl].sa; > + break; > + case DMA0_DAH: > + val =3D dma->ch[chnl].da >> 32; > + break; > + case DMA0_DAL: > + val =3D dma->ch[chnl].da; > + break; > + case DMA0_SGH: > + val =3D dma->ch[chnl].sg >> 32; > + break; > + case DMA0_SGL: > + val =3D dma->ch[chnl].sg; > + break; > + } > + break; > + case DMA0_SR: > + val =3D dma->sr; > + break; > + default: > + qemu_log_mask(LOG_UNIMP, "%s: unimplemented register %x (%d, %x)= \n", > + __func__, dcrn, chnl, addr); > + } > + > + return val; > +} > + > +static void dcr_write_dma(void *opaque, int dcrn, uint32_t val) > +{ > + PPC4xxDmaState *dma =3D opaque; > + int addr =3D dcrn - dma->base; > + int chnl =3D addr / 8; > + > + switch (addr) { > + case 0x00 ... 0x1f: > + switch (addr % 8) { > + case DMA0_CR: > + dma->ch[chnl].cr =3D val; > + if (val & DMA0_CR_CE) { > + int count =3D dma->ch[chnl].ct & 0xffff; > + > + if (count) { > + int width, i, sidx, didx; > + uint8_t *rptr, *wptr; > + hwaddr rlen, wlen; > + > + sidx =3D didx =3D 0; > + width =3D 1 << ((val & DMA0_CR_PW) >> 25); > + rptr =3D cpu_physical_memory_map(dma->ch[chnl].sa, &= rlen, 0); > + wptr =3D cpu_physical_memory_map(dma->ch[chnl].da, &= wlen, 1); > + if (rptr && wptr) { > + if (!(val & DMA0_CR_DEC) && > + val & DMA0_CR_SAI && val & DMA0_CR_DAI) { > + /* optimise common case */ > + memmove(wptr, rptr, count * width); > + sidx =3D didx =3D count * width; > + } else { > + /* do it the slow way */ > + for (sidx =3D didx =3D i =3D 0; i < count; i= ++) { > + uint64_t v =3D ldn_le_p(rptr + sidx, wid= th); > + stn_le_p(wptr + didx, width, v); > + if (val & DMA0_CR_SAI) { > + sidx +=3D width; > + } > + if (val & DMA0_CR_DAI) { > + didx +=3D width; > + } > + } > + } > + } > + if (wptr) { > + cpu_physical_memory_unmap(wptr, wlen, 1, didx); > + } > + if (wptr) { > + cpu_physical_memory_unmap(rptr, rlen, 0, sidx); > + } > + } > + } > + break; > + case DMA0_CT: > + dma->ch[chnl].ct =3D val; > + break; > + case DMA0_SAH: > + dma->ch[chnl].sa &=3D 0xffffffffULL; > + dma->ch[chnl].sa |=3D (uint64_t)val << 32; > + break; > + case DMA0_SAL: > + dma->ch[chnl].sa &=3D 0xffffffff00000000ULL; > + dma->ch[chnl].sa |=3D val; > + break; > + case DMA0_DAH: > + dma->ch[chnl].da &=3D 0xffffffffULL; > + dma->ch[chnl].da |=3D (uint64_t)val << 32; > + break; > + case DMA0_DAL: > + dma->ch[chnl].da &=3D 0xffffffff00000000ULL; > + dma->ch[chnl].da |=3D val; > + break; > + case DMA0_SGH: > + dma->ch[chnl].sg &=3D 0xffffffffULL; > + dma->ch[chnl].sg |=3D (uint64_t)val << 32; > + break; > + case DMA0_SGL: > + dma->ch[chnl].sg &=3D 0xffffffff00000000ULL; > + dma->ch[chnl].sg |=3D val; > + break; > + } > + break; > + case DMA0_SR: > + dma->sr &=3D ~val; > + break; > + default: > + qemu_log_mask(LOG_UNIMP, "%s: unimplemented register %x (%d, %x)= \n", > + __func__, dcrn, chnl, addr); > + } > +} > + > +static void ppc4xx_dma_reset(void *opaque) > +{ > + PPC4xxDmaState *dma =3D opaque; > + int dma_base =3D dma->base; > + > + memset(dma, 0, sizeof(*dma)); > + dma->base =3D dma_base; > +} > + > +void ppc4xx_dma_init(CPUPPCState *env, int dcr_base) > +{ > + PPC4xxDmaState *dma; > + int i; > + > + dma =3D g_malloc0(sizeof(*dma)); > + dma->base =3D dcr_base; > + qemu_register_reset(&ppc4xx_dma_reset, dma); > + for (i =3D 0; i < 4; i++) { > + ppc_dcr_register(env, dcr_base + i * 8 + DMA0_CR, > + dma, &dcr_read_dma, &dcr_write_dma); > + ppc_dcr_register(env, dcr_base + i * 8 + DMA0_CT, > + dma, &dcr_read_dma, &dcr_write_dma); > + ppc_dcr_register(env, dcr_base + i * 8 + DMA0_SAH, > + dma, &dcr_read_dma, &dcr_write_dma); > + ppc_dcr_register(env, dcr_base + i * 8 + DMA0_SAL, > + dma, &dcr_read_dma, &dcr_write_dma); > + ppc_dcr_register(env, dcr_base + i * 8 + DMA0_DAH, > + dma, &dcr_read_dma, &dcr_write_dma); > + ppc_dcr_register(env, dcr_base + i * 8 + DMA0_DAL, > + dma, &dcr_read_dma, &dcr_write_dma); > + ppc_dcr_register(env, dcr_base + i * 8 + DMA0_SGH, > + dma, &dcr_read_dma, &dcr_write_dma); > + ppc_dcr_register(env, dcr_base + i * 8 + DMA0_SGL, > + dma, &dcr_read_dma, &dcr_write_dma); > + } > + ppc_dcr_register(env, dcr_base + DMA0_SR, > + dma, &dcr_read_dma, &dcr_write_dma); > + ppc_dcr_register(env, dcr_base + DMA0_SGC, > + dma, &dcr_read_dma, &dcr_write_dma); > + ppc_dcr_register(env, dcr_base + DMA0_SLP, > + dma, &dcr_read_dma, &dcr_write_dma); > + ppc_dcr_register(env, dcr_base + DMA0_POL, > + dma, &dcr_read_dma, &dcr_write_dma); > +} > + > +/***********************************************************************= ******/ > /* PCI Express controller */ > /* FIXME: This is not complete and does not work, only implemented parti= ally > * to allow firmware and guests to find an empty bus. Cards should use P= CI. > diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c > index dc730cc..4f9248e 100644 > --- a/hw/ppc/sam460ex.c > +++ b/hw/ppc/sam460ex.c > @@ -477,6 +477,9 @@ static void sam460ex_init(MachineState *machine) > /* MAL */ > ppc4xx_mal_init(env, 4, 16, &uic[2][3]); > =20 > + /* DMA */ > + ppc4xx_dma_init(env, 0x200); > + > /* 256K of L2 cache as memory */ > ppc4xx_l2sram_init(env); > /* FIXME: remove this after fixing l2sram mapping in ppc440_uc.c? */ --=20 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 --v15hXiddb3kq3Bam Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEdfRlhq5hpmzETofcbDjKyiDZs5IFAls5o+wACgkQbDjKyiDZ s5JYehAA2YMANqMMYmYtkNBBV+kKv3v/wi0Y0HwIywlWuBYGGb/igo/m0GJbkjc8 iLbQrEojKw3mtygE1eDwogfYD2x7advv/JCjDpH1WPluP8GBbOCPkk8oWMDYxoS+ B7XsmiOSbHPlKkLWwUGNVwldGX0iEP8iAbZBEaOkTySTbjUnFphXps0xrI+wKJ+Z gS+J2FluMJTCCScX9wzpiuaQf7xNQFawx0Th/+jDDr7E7TlaBAt0rNlQSrp7dz6Q 3MFiRJMmNbrV8F0Rxw7FtDZvCC33dMG6dvHkcgDFa5tQkBw+RhKuUwIP+T+UNRII +8HyPr1wCFeodCEhDE172qWZ3H2Ymew1QK3n2ovcY1gCzRwM7j9YD4CSLae4DzNI +y9BOjxu40CjzU3IFph1bkJCAS+7iEkxbbIKGJHywXsz0L8XHQ7E8JM00u/yG9ce WVmHdH5WkH4xF59NxhGXXAGm+4PuP//7c+fkTO8OKlaqL3I07gAdF80drGPCaIOB aBPlM5tgiVOLrY7nzyp8TrT1shfeIiEtyRmZQtjehznJpTAkcipcMUjgHDBPX6q4 XDLL+6ATR/rvhPibBPHvWV3sSyIpfyium9RK35XadAvfthhFuFYxUK9ShVR5RZL+ mnjkqvlmk/aj4wpx09DefdwkyEGZREhBFQGBkKIKx7VBED9Bfyw= =vTj5 -----END PGP SIGNATURE----- --v15hXiddb3kq3Bam--