[Qemu-devel] [PATCH 0/2] mips: convert devices away from old_mmio

[Qemu-devel] [PATCH 0/2] mips: convert devices away from old_mmio

[Peter Maydell]

These patches convert a couple of devices used only by MIPS
boards from using the old_mmio MemoryRegionOps accessor functions.

 * vga-isa-mm: used by the MIPS 'jazz' boards "magnum" and "pica61"
 * bonito pci controller: used by the MIPS "fulong2e" board

Tested only with "make check".

thanks
-- PMM

Peter Maydell (2):
  hw/display/vga-isa-mm: Convert away from old_mmio
  hw/pci-host/bonito: Move away from old_mmio accessors

 hw/display/vga-isa-mm.c |  60 ++++-------------
 hw/pci-host/bonito.c    | 145 +++++-----------------------------------
 2 files changed, 28 insertions(+), 177 deletions(-)

-- 
2.17.1

[Qemu-devel] [PATCH 1/2] hw/display/vga-isa-mm: Convert away from old_mmio

[Peter Maydell]

Convert the vga-isa-mm device away from the old_mmio
MemoryRegion accessors.

This device is only used by the MIPS 'jazz' boards
"magnum" and "pica61".

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 hw/display/vga-isa-mm.c | 60 +++++++++--------------------------------
 1 file changed, 13 insertions(+), 47 deletions(-)

diff --git a/hw/display/vga-isa-mm.c b/hw/display/vga-isa-mm.c
index 232216cad0a..215e6497190 100644
--- a/hw/display/vga-isa-mm.c
+++ b/hw/display/vga-isa-mm.c
@@ -36,64 +36,30 @@ typedef struct ISAVGAMMState {
 } ISAVGAMMState;
 
 /* Memory mapped interface */
-static uint32_t vga_mm_readb (void *opaque, hwaddr addr)
+static uint64_t vga_mm_read(void *opaque, hwaddr addr, unsigned size)
 {
     ISAVGAMMState *s = opaque;
 
-    return vga_ioport_read(&s->vga, addr >> s->it_shift) & 0xff;
+    return vga_ioport_read(&s->vga, addr >> s->it_shift) &
+        MAKE_64BIT_MASK(0, size * 8);
 }
 
-static void vga_mm_writeb (void *opaque,
-                           hwaddr addr, uint32_t value)
+static void vga_mm_write(void *opaque, hwaddr addr, uint64_t value,
+                         unsigned size)
 {
     ISAVGAMMState *s = opaque;
 
-    vga_ioport_write(&s->vga, addr >> s->it_shift, value & 0xff);
-}
-
-static uint32_t vga_mm_readw (void *opaque, hwaddr addr)
-{
-    ISAVGAMMState *s = opaque;
-
-    return vga_ioport_read(&s->vga, addr >> s->it_shift) & 0xffff;
-}
-
-static void vga_mm_writew (void *opaque,
-                           hwaddr addr, uint32_t value)
-{
-    ISAVGAMMState *s = opaque;
-
-    vga_ioport_write(&s->vga, addr >> s->it_shift, value & 0xffff);
-}
-
-static uint32_t vga_mm_readl (void *opaque, hwaddr addr)
-{
-    ISAVGAMMState *s = opaque;
-
-    return vga_ioport_read(&s->vga, addr >> s->it_shift);
-}
-
-static void vga_mm_writel (void *opaque,
-                           hwaddr addr, uint32_t value)
-{
-    ISAVGAMMState *s = opaque;
-
-    vga_ioport_write(&s->vga, addr >> s->it_shift, value);
+    vga_ioport_write(&s->vga, addr >> s->it_shift,
+                     value & MAKE_64BIT_MASK(0, size * 8));
 }
 
 static const MemoryRegionOps vga_mm_ctrl_ops = {
-    .old_mmio = {
-        .read = {
-            vga_mm_readb,
-            vga_mm_readw,
-            vga_mm_readl,
-        },
-        .write = {
-            vga_mm_writeb,
-            vga_mm_writew,
-            vga_mm_writel,
-        },
-    },
+    .read = vga_mm_read,
+    .write = vga_mm_write,
+    .valid.min_access_size = 1,
+    .valid.max_access_size = 4,
+    .impl.min_access_size = 1,
+    .impl.max_access_size = 4,
     .endianness = DEVICE_NATIVE_ENDIAN,
 };
 
-- 
2.17.1

[Qemu-devel] [PATCH 2/2] hw/pci-host/bonito: Move away from old_mmio accessors

[Peter Maydell]

Move away from the old_mmio MemoryRegion accessors in the
bonito pci controller.

This device is used only in the MIPS "fulong2e" machine.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 hw/pci-host/bonito.c | 145 +++++--------------------------------------
 1 file changed, 15 insertions(+), 130 deletions(-)

diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c
index 2d25e9bf7ca..9868e2eccc6 100644
--- a/hw/pci-host/bonito.c
+++ b/hw/pci-host/bonito.c
@@ -460,8 +460,8 @@ static uint32_t bonito_sbridge_pciaddr(void *opaque, hwaddr addr)
     return pciaddr;
 }
 
-static void bonito_spciconf_writeb(void *opaque, hwaddr addr,
-                                   uint32_t val)
+static void bonito_spciconf_write(void *opaque, hwaddr addr, uint64_t val,
+                                  unsigned size)
 {
     PCIBonitoState *s = opaque;
     PCIDevice *d = PCI_DEVICE(s);
@@ -469,34 +469,8 @@ static void bonito_spciconf_writeb(void *opaque, hwaddr addr,
     uint32_t pciaddr;
     uint16_t status;
 
-    DPRINTF("bonito_spciconf_writeb "TARGET_FMT_plx" val %x\n", addr, val);
-    pciaddr = bonito_sbridge_pciaddr(s, addr);
-
-    if (pciaddr == 0xffffffff) {
-        return;
-    }
-
-    /* set the pci address in s->config_reg */
-    phb->config_reg = (pciaddr) | (1u << 31);
-    pci_data_write(phb->bus, phb->config_reg, val & 0xff, 1);
-
-    /* clear PCI_STATUS_REC_MASTER_ABORT and PCI_STATUS_REC_TARGET_ABORT */
-    status = pci_get_word(d->config + PCI_STATUS);
-    status &= ~(PCI_STATUS_REC_MASTER_ABORT | PCI_STATUS_REC_TARGET_ABORT);
-    pci_set_word(d->config + PCI_STATUS, status);
-}
-
-static void bonito_spciconf_writew(void *opaque, hwaddr addr,
-                                   uint32_t val)
-{
-    PCIBonitoState *s = opaque;
-    PCIDevice *d = PCI_DEVICE(s);
-    PCIHostState *phb = PCI_HOST_BRIDGE(s->pcihost);
-    uint32_t pciaddr;
-    uint16_t status;
-
-    DPRINTF("bonito_spciconf_writew "TARGET_FMT_plx" val %x\n", addr, val);
-    assert((addr & 0x1) == 0);
+    DPRINTF("bonito_spciconf_write "TARGET_FMT_plx" size %d val %x\n",
+            addr, size, val);
 
     pciaddr = bonito_sbridge_pciaddr(s, addr);
 
@@ -506,7 +480,7 @@ static void bonito_spciconf_writew(void *opaque, hwaddr addr,
 
     /* set the pci address in s->config_reg */
     phb->config_reg = (pciaddr) | (1u << 31);
-    pci_data_write(phb->bus, phb->config_reg, val, 2);
+    pci_data_write(phb->bus, phb->config_reg, val, size);
 
     /* clear PCI_STATUS_REC_MASTER_ABORT and PCI_STATUS_REC_TARGET_ABORT */
     status = pci_get_word(d->config + PCI_STATUS);
@@ -514,8 +488,7 @@ static void bonito_spciconf_writew(void *opaque, hwaddr addr,
     pci_set_word(d->config + PCI_STATUS, status);
 }
 
-static void bonito_spciconf_writel(void *opaque, hwaddr addr,
-                                   uint32_t val)
+static uint64_t bonito_spciconf_read(void *opaque, hwaddr addr, unsigned size)
 {
     PCIBonitoState *s = opaque;
     PCIDevice *d = PCI_DEVICE(s);
@@ -523,38 +496,12 @@ static void bonito_spciconf_writel(void *opaque, hwaddr addr,
     uint32_t pciaddr;
     uint16_t status;
 
-    DPRINTF("bonito_spciconf_writel "TARGET_FMT_plx" val %x\n", addr, val);
-    assert((addr & 0x3) == 0);
+    DPRINTF("bonito_spciconf_read "TARGET_FMT_plx" size %d\n", addr, size);
 
     pciaddr = bonito_sbridge_pciaddr(s, addr);
 
     if (pciaddr == 0xffffffff) {
-        return;
-    }
-
-    /* set the pci address in s->config_reg */
-    phb->config_reg = (pciaddr) | (1u << 31);
-    pci_data_write(phb->bus, phb->config_reg, val, 4);
-
-    /* clear PCI_STATUS_REC_MASTER_ABORT and PCI_STATUS_REC_TARGET_ABORT */
-    status = pci_get_word(d->config + PCI_STATUS);
-    status &= ~(PCI_STATUS_REC_MASTER_ABORT | PCI_STATUS_REC_TARGET_ABORT);
-    pci_set_word(d->config + PCI_STATUS, status);
-}
-
-static uint32_t bonito_spciconf_readb(void *opaque, hwaddr addr)
-{
-    PCIBonitoState *s = opaque;
-    PCIDevice *d = PCI_DEVICE(s);
-    PCIHostState *phb = PCI_HOST_BRIDGE(s->pcihost);
-    uint32_t pciaddr;
-    uint16_t status;
-
-    DPRINTF("bonito_spciconf_readb "TARGET_FMT_plx"\n", addr);
-    pciaddr = bonito_sbridge_pciaddr(s, addr);
-
-    if (pciaddr == 0xffffffff) {
-        return 0xff;
+        return MAKE_64BIT_MASK(0, size * 8);
     }
 
     /* set the pci address in s->config_reg */
@@ -565,79 +512,17 @@ static uint32_t bonito_spciconf_readb(void *opaque, hwaddr addr)
     status &= ~(PCI_STATUS_REC_MASTER_ABORT | PCI_STATUS_REC_TARGET_ABORT);
     pci_set_word(d->config + PCI_STATUS, status);
 
-    return pci_data_read(phb->bus, phb->config_reg, 1);
-}
-
-static uint32_t bonito_spciconf_readw(void *opaque, hwaddr addr)
-{
-    PCIBonitoState *s = opaque;
-    PCIDevice *d = PCI_DEVICE(s);
-    PCIHostState *phb = PCI_HOST_BRIDGE(s->pcihost);
-    uint32_t pciaddr;
-    uint16_t status;
-
-    DPRINTF("bonito_spciconf_readw "TARGET_FMT_plx"\n", addr);
-    assert((addr & 0x1) == 0);
-
-    pciaddr = bonito_sbridge_pciaddr(s, addr);
-
-    if (pciaddr == 0xffffffff) {
-        return 0xffff;
-    }
-
-    /* set the pci address in s->config_reg */
-    phb->config_reg = (pciaddr) | (1u << 31);
-
-    /* clear PCI_STATUS_REC_MASTER_ABORT and PCI_STATUS_REC_TARGET_ABORT */
-    status = pci_get_word(d->config + PCI_STATUS);
-    status &= ~(PCI_STATUS_REC_MASTER_ABORT | PCI_STATUS_REC_TARGET_ABORT);
-    pci_set_word(d->config + PCI_STATUS, status);
-
-    return pci_data_read(phb->bus, phb->config_reg, 2);
-}
-
-static uint32_t bonito_spciconf_readl(void *opaque, hwaddr addr)
-{
-    PCIBonitoState *s = opaque;
-    PCIDevice *d = PCI_DEVICE(s);
-    PCIHostState *phb = PCI_HOST_BRIDGE(s->pcihost);
-    uint32_t pciaddr;
-    uint16_t status;
-
-    DPRINTF("bonito_spciconf_readl "TARGET_FMT_plx"\n", addr);
-    assert((addr & 0x3) == 0);
-
-    pciaddr = bonito_sbridge_pciaddr(s, addr);
-
-    if (pciaddr == 0xffffffff) {
-        return 0xffffffff;
-    }
-
-    /* set the pci address in s->config_reg */
-    phb->config_reg = (pciaddr) | (1u << 31);
-
-    /* clear PCI_STATUS_REC_MASTER_ABORT and PCI_STATUS_REC_TARGET_ABORT */
-    status = pci_get_word(d->config + PCI_STATUS);
-    status &= ~(PCI_STATUS_REC_MASTER_ABORT | PCI_STATUS_REC_TARGET_ABORT);
-    pci_set_word(d->config + PCI_STATUS, status);
-
-    return pci_data_read(phb->bus, phb->config_reg, 4);
+    return pci_data_read(phb->bus, phb->config_reg, size);
 }
 
 /* south bridge PCI configure space. 0x1fe8 0000 - 0x1fef ffff */
 static const MemoryRegionOps bonito_spciconf_ops = {
-    .old_mmio = {
-        .read = {
-            bonito_spciconf_readb,
-            bonito_spciconf_readw,
-            bonito_spciconf_readl,
-        },
-        .write = {
-            bonito_spciconf_writeb,
-            bonito_spciconf_writew,
-            bonito_spciconf_writel,
-        },
-    },
+    .read = bonito_spciconf_read,
+    .write = bonito_spciconf_write,
+    .valid.min_access_size = 1,
+    .valid.max_access_size = 4,
+    .impl.min_access_size = 1,
+    .impl.max_access_size = 4,
     .endianness = DEVICE_NATIVE_ENDIAN,
 };
 
-- 
2.17.1

Re: [Qemu-devel] [PATCH 1/2] hw/display/vga-isa-mm: Convert away from old_mmio

[Philippe Mathieu-Daudé]

On 08/02/2018 12:51 PM, Peter Maydell wrote:
> Convert the vga-isa-mm device away from the old_mmio
> MemoryRegion accessors.
> 
> This device is only used by the MIPS 'jazz' boards
> "magnum" and "pica61".
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> ---
>  hw/display/vga-isa-mm.c | 60 +++++++++--------------------------------
>  1 file changed, 13 insertions(+), 47 deletions(-)
> 
> diff --git a/hw/display/vga-isa-mm.c b/hw/display/vga-isa-mm.c
> index 232216cad0a..215e6497190 100644
> --- a/hw/display/vga-isa-mm.c
> +++ b/hw/display/vga-isa-mm.c
> @@ -36,64 +36,30 @@ typedef struct ISAVGAMMState {
>  } ISAVGAMMState;
>  
>  /* Memory mapped interface */
> -static uint32_t vga_mm_readb (void *opaque, hwaddr addr)
> +static uint64_t vga_mm_read(void *opaque, hwaddr addr, unsigned size)
>  {
>      ISAVGAMMState *s = opaque;
>  
> -    return vga_ioport_read(&s->vga, addr >> s->it_shift) & 0xff;
> +    return vga_ioport_read(&s->vga, addr >> s->it_shift) &
> +        MAKE_64BIT_MASK(0, size * 8);
>  }
>  
> -static void vga_mm_writeb (void *opaque,
> -                           hwaddr addr, uint32_t value)
> +static void vga_mm_write(void *opaque, hwaddr addr, uint64_t value,
> +                         unsigned size)
>  {
>      ISAVGAMMState *s = opaque;
>  
> -    vga_ioport_write(&s->vga, addr >> s->it_shift, value & 0xff);
> -}
> -
> -static uint32_t vga_mm_readw (void *opaque, hwaddr addr)
> -{
> -    ISAVGAMMState *s = opaque;
> -
> -    return vga_ioport_read(&s->vga, addr >> s->it_shift) & 0xffff;
> -}
> -
> -static void vga_mm_writew (void *opaque,
> -                           hwaddr addr, uint32_t value)
> -{
> -    ISAVGAMMState *s = opaque;
> -
> -    vga_ioport_write(&s->vga, addr >> s->it_shift, value & 0xffff);
> -}
> -
> -static uint32_t vga_mm_readl (void *opaque, hwaddr addr)
> -{
> -    ISAVGAMMState *s = opaque;
> -
> -    return vga_ioport_read(&s->vga, addr >> s->it_shift);
> -}
> -
> -static void vga_mm_writel (void *opaque,
> -                           hwaddr addr, uint32_t value)
> -{
> -    ISAVGAMMState *s = opaque;
> -
> -    vga_ioport_write(&s->vga, addr >> s->it_shift, value);
> +    vga_ioport_write(&s->vga, addr >> s->it_shift,
> +                     value & MAKE_64BIT_MASK(0, size * 8));
>  }
>  
>  static const MemoryRegionOps vga_mm_ctrl_ops = {
> -    .old_mmio = {
> -        .read = {
> -            vga_mm_readb,
> -            vga_mm_readw,
> -            vga_mm_readl,
> -        },
> -        .write = {
> -            vga_mm_writeb,
> -            vga_mm_writew,
> -            vga_mm_writel,
> -        },
> -    },
> +    .read = vga_mm_read,
> +    .write = vga_mm_write,
> +    .valid.min_access_size = 1,
> +    .valid.max_access_size = 4,
> +    .impl.min_access_size = 1,
> +    .impl.max_access_size = 4,
>      .endianness = DEVICE_NATIVE_ENDIAN,
>  };
>  
> 

Re: [Qemu-devel] [PATCH 1/2] hw/display/vga-isa-mm: Convert away from old_mmio

[Hervé Poussineau]

Le 02/08/2018 à 17:51, Peter Maydell a écrit :
> Convert the vga-isa-mm device away from the old_mmio
> MemoryRegion accessors.
> 
> This device is only used by the MIPS 'jazz' boards
> "magnum" and "pica61".
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>   hw/display/vga-isa-mm.c | 60 +++++++++--------------------------------
>   1 file changed, 13 insertions(+), 47 deletions(-)
> 

Note: this device is only used by the MIPS "pica61" board, not the "magnum" one.
The commit message may be changed accordingly.

Reviewed-by: Hervé Poussineau <hpoussin@reactos.org>
Tested-by: Hervé Poussineau <hpoussin@reactos.org>

Re: [Qemu-devel] [PATCH 2/2] hw/pci-host/bonito: Move away from old_mmio accessors

[Richard Henderson]

On 08/02/2018 08:51 AM, Peter Maydell wrote:
> Move away from the old_mmio MemoryRegion accessors in the
> bonito pci controller.
> 
> This device is used only in the MIPS "fulong2e" machine.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>  hw/pci-host/bonito.c | 145 +++++--------------------------------------
>  1 file changed, 15 insertions(+), 130 deletions(-)

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>


r~

Re: [Qemu-devel] [PATCH 0/2] mips: convert devices away from old_mmio

[Peter Maydell]

On 2 August 2018 at 16:51, Peter Maydell <peter.maydell@linaro.org> wrote:
> These patches convert a couple of devices used only by MIPS
> boards from using the old_mmio MemoryRegionOps accessor functions.
>
>  * vga-isa-mm: used by the MIPS 'jazz' boards "magnum" and "pica61"
>  * bonito pci controller: used by the MIPS "fulong2e" board
>
> Tested only with "make check".
>
> thanks
> -- PMM
>
> Peter Maydell (2):
>   hw/display/vga-isa-mm: Convert away from old_mmio
>   hw/pci-host/bonito: Move away from old_mmio accessors

Ping -- other than a minor tweak to a commit message this
patchset has been reviewed. MIPS folks, could you take this
via your mips tree ?

thanks
-- PMM

Re: [Qemu-devel] [PATCH 0/2] mips: convert devices away from old_mmio

[Aleksandar Markovic]

> From: Peter Maydell <peter.maydell@linaro.org>
> Sent: Monday, August 20, 2018 11:50 AM
> Subject: Re: [Qemu-devel] [PATCH 0/2] mips: convert devices away from old_mmio
> 
> On 2 August 2018 at 16:51, Peter Maydell <peter.maydell@linaro.org> wrote:
> > These patches convert a couple of devices used only by MIPS
> > boards from using the old_mmio MemoryRegionOps accessor functions.
> >
> >  * vga-isa-mm: used by the MIPS 'jazz' boards "magnum" and "pica61"
> >  * bonito pci controller: used by the MIPS "fulong2e" board
> >
> > Tested only with "make check".
> >
> > thanks
> > -- PMM
> >
> > Peter Maydell (2):
> >   hw/display/vga-isa-mm: Convert away from old_mmio
> >   hw/pci-host/bonito: Move away from old_mmio accessors
> 
> Ping -- other than a minor tweak to a commit message this
> patchset has been reviewed. MIPS folks, could you take this
> via your mips tree ?
> 
> thanks
> -- PMM

Certainly, we'll include these patches in the next MIPS queue.

Thanks,
Aleksandar

Re: [Qemu-devel] [PATCH 0/2] mips: convert devices away from old_mmio

[Gerd Hoffmann]

On Thu, Aug 02, 2018 at 04:51:45PM +0100, Peter Maydell wrote:
> These patches convert a couple of devices used only by MIPS
> boards from using the old_mmio MemoryRegionOps accessor functions.
> 
>  * vga-isa-mm: used by the MIPS 'jazz' boards "magnum" and "pica61"
>  * bonito pci controller: used by the MIPS "fulong2e" board
> 
> Tested only with "make check".

Added to vga queue.

thanks,
  Gerd