[Qemu-devel] [PATCH 0/8] sparc: IOMMU tidy-up and reorganisation

Mark Cave-Ayland posted 8 patches 6 years, 4 months ago
Failed in applying to current master (apply log)
hw/dma/Makefile.objs           |    1 -
hw/dma/sparc32_dma.c           |    2 +-
hw/dma/sun4m_iommu.c           |  406 ---------------------------------------
hw/dma/trace-events            |   10 -
hw/intc/slavio_intctl.c        |    1 -
hw/net/lance.c                 |    2 +-
hw/pci-host/apb.c              |  256 +------------------------
hw/sparc/Makefile.objs         |    2 +-
hw/sparc/sun4m.c               |    2 +-
hw/sparc/sun4m_iommu.c         |  407 ++++++++++++++++++++++++++++++++++++++++
hw/sparc/trace-events          |   10 +
hw/sparc64/Makefile.objs       |    1 +
hw/sparc64/sun4u.c             |    8 +-
hw/sparc64/sun4u_iommu.c       |  342 +++++++++++++++++++++++++++++++++
hw/sparc64/trace-events        |    5 +
hw/timer/slavio_timer.c        |    1 -
include/hw/pci-host/apb.h      |   53 +-----
include/hw/sparc/sun4m.h       |   35 ----
include/hw/sparc/sun4m_iommu.h |   51 +++++
include/hw/sparc/sun4u_iommu.h |   50 +++++
20 files changed, 889 insertions(+), 756 deletions(-)
delete mode 100644 hw/dma/sun4m_iommu.c
create mode 100644 hw/sparc/sun4m_iommu.c
create mode 100644 hw/sparc64/sun4u_iommu.c
delete mode 100644 include/hw/sparc/sun4m.h
create mode 100644 include/hw/sparc/sun4m_iommu.h
create mode 100644 include/hw/sparc/sun4u_iommu.h
[Qemu-devel] [PATCH 0/8] sparc: IOMMU tidy-up and reorganisation
Posted by Mark Cave-Ayland 6 years, 4 months ago
Following on from the previous sun4u patchset, here is the next step of
IOMMU-related updates for 2.12.

This patchset does 2 main things: firstly it moves the sun4m IOMMU
device out of hw/dma and into hw/sparc to match existing architectures.
With this (and the previous sun4m DMA rework) the old sun4m.h header can
now be completely removed.

Secondly in a similar manner, we split the sun4u IOMMU functionality out
from the APB device into a new sun4u-iommu device in hw/sparc64, adding in
a conversion from DPRINTF macros to trace-events for good measure while
we are here.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Based-on: 1511699686-12605-1-git-send-email-mark.cave-ayland@ilande.co.uk ([PATCHv2 00/15] sun4u: tidy-up CPU, APB and ebus)


Mark Cave-Ayland (8):
  sun4m: move sun4m_iommu.c from hw/dma to hw/sparc
  sun4m: move IOMMU declarations from sun4m.h to sun4m_iommu.h
  sun4m: remove include/hw/sparc/sun4m.h and all references to it
  apb: QOMify IOMMU
  sun4u: split IOMMU device out from apb.c to sun4u_iommu.c
  sun4u_iommu: update to reflect IOMMU is no longer part of the APB
    device
  sun4u_iommu: convert from IOMMU_DPRINTF to trace-events
  sun4u_iommu: add trace event for IOMMU translations

 hw/dma/Makefile.objs           |    1 -
 hw/dma/sparc32_dma.c           |    2 +-
 hw/dma/sun4m_iommu.c           |  406 ---------------------------------------
 hw/dma/trace-events            |   10 -
 hw/intc/slavio_intctl.c        |    1 -
 hw/net/lance.c                 |    2 +-
 hw/pci-host/apb.c              |  256 +------------------------
 hw/sparc/Makefile.objs         |    2 +-
 hw/sparc/sun4m.c               |    2 +-
 hw/sparc/sun4m_iommu.c         |  407 ++++++++++++++++++++++++++++++++++++++++
 hw/sparc/trace-events          |   10 +
 hw/sparc64/Makefile.objs       |    1 +
 hw/sparc64/sun4u.c             |    8 +-
 hw/sparc64/sun4u_iommu.c       |  342 +++++++++++++++++++++++++++++++++
 hw/sparc64/trace-events        |    5 +
 hw/timer/slavio_timer.c        |    1 -
 include/hw/pci-host/apb.h      |   53 +-----
 include/hw/sparc/sun4m.h       |   35 ----
 include/hw/sparc/sun4m_iommu.h |   51 +++++
 include/hw/sparc/sun4u_iommu.h |   50 +++++
 20 files changed, 889 insertions(+), 756 deletions(-)
 delete mode 100644 hw/dma/sun4m_iommu.c
 create mode 100644 hw/sparc/sun4m_iommu.c
 create mode 100644 hw/sparc64/sun4u_iommu.c
 delete mode 100644 include/hw/sparc/sun4m.h
 create mode 100644 include/hw/sparc/sun4m_iommu.h
 create mode 100644 include/hw/sparc/sun4u_iommu.h

-- 
1.7.10.4


Re: [Qemu-devel] [PATCH 0/8] sparc: IOMMU tidy-up and reorganisation
Posted by Artyom Tarasenko 6 years, 3 months ago
On Sun, Nov 26, 2017 at 2:35 PM, Mark Cave-Ayland
<mark.cave-ayland@ilande.co.uk> wrote:
> Following on from the previous sun4u patchset, here is the next step of
> IOMMU-related updates for 2.12.
>
> This patchset does 2 main things: firstly it moves the sun4m IOMMU
> device out of hw/dma and into hw/sparc to match existing architectures.
> With this (and the previous sun4m DMA rework) the old sun4m.h header can
> now be completely removed.
>
> Secondly in a similar manner, we split the sun4u IOMMU functionality out
> from the APB device into a new sun4u-iommu device in hw/sparc64, adding in
> a conversion from DPRINTF macros to trace-events for good measure while
> we are here.
>
> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>

Acked-by: Artyom Tarasenko <atar4qemu@gmail.com>

> Based-on: 1511699686-12605-1-git-send-email-mark.cave-ayland@ilande.co.uk ([PATCHv2 00/15] sun4u: tidy-up CPU, APB and ebus)
>
>
> Mark Cave-Ayland (8):
>   sun4m: move sun4m_iommu.c from hw/dma to hw/sparc
>   sun4m: move IOMMU declarations from sun4m.h to sun4m_iommu.h
>   sun4m: remove include/hw/sparc/sun4m.h and all references to it
>   apb: QOMify IOMMU
>   sun4u: split IOMMU device out from apb.c to sun4u_iommu.c
>   sun4u_iommu: update to reflect IOMMU is no longer part of the APB
>     device
>   sun4u_iommu: convert from IOMMU_DPRINTF to trace-events
>   sun4u_iommu: add trace event for IOMMU translations
>
>  hw/dma/Makefile.objs           |    1 -
>  hw/dma/sparc32_dma.c           |    2 +-
>  hw/dma/sun4m_iommu.c           |  406 ---------------------------------------
>  hw/dma/trace-events            |   10 -
>  hw/intc/slavio_intctl.c        |    1 -
>  hw/net/lance.c                 |    2 +-
>  hw/pci-host/apb.c              |  256 +------------------------
>  hw/sparc/Makefile.objs         |    2 +-
>  hw/sparc/sun4m.c               |    2 +-
>  hw/sparc/sun4m_iommu.c         |  407 ++++++++++++++++++++++++++++++++++++++++
>  hw/sparc/trace-events          |   10 +
>  hw/sparc64/Makefile.objs       |    1 +
>  hw/sparc64/sun4u.c             |    8 +-
>  hw/sparc64/sun4u_iommu.c       |  342 +++++++++++++++++++++++++++++++++
>  hw/sparc64/trace-events        |    5 +
>  hw/timer/slavio_timer.c        |    1 -
>  include/hw/pci-host/apb.h      |   53 +-----
>  include/hw/sparc/sun4m.h       |   35 ----
>  include/hw/sparc/sun4m_iommu.h |   51 +++++
>  include/hw/sparc/sun4u_iommu.h |   50 +++++
>  20 files changed, 889 insertions(+), 756 deletions(-)
>  delete mode 100644 hw/dma/sun4m_iommu.c
>  create mode 100644 hw/sparc/sun4m_iommu.c
>  create mode 100644 hw/sparc64/sun4u_iommu.c
>  delete mode 100644 include/hw/sparc/sun4m.h
>  create mode 100644 include/hw/sparc/sun4m_iommu.h
>  create mode 100644 include/hw/sparc/sun4u_iommu.h
>
> --
> 1.7.10.4
>



-- 
Regards,
Artyom Tarasenko

SPARC and PPC PReP under qemu blog: http://tyom.blogspot.com/search/label/qemu