[Qemu-devel] [PATCH 0/3] ppc: trivial Mac fixes

[Qemu-devel] [PATCH 0/3] ppc: trivial Mac fixes

[Mark Cave-Ayland]

Here are some trivial Mac fixes taken from various working branches in my
local git repository. Since they should need minimal review it seems
worthwhile to send them separately.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>


Mark Cave-Ayland (3):
  ppc: remove obsolete pci_pmac_init() definitions from mac.h
  ppc: remove obsolete macio_init() definition from mac.h
  ppc: add missing FW_CFG_PPC_NVRAM_FLAT definition

 hw/ppc/mac.h         | 9 ---------
 include/hw/ppc/ppc.h | 1 +
 2 files changed, 1 insertion(+), 9 deletions(-)

-- 
2.11.0

[Qemu-devel] [PATCH 1/3] ppc: remove obsolete pci_pmac_init() definitions from mac.h

[Mark Cave-Ayland]

Commits 7b19318bee and 8ce3f743c7 removed the pci_pmac_init() and
pci_pmac_u3_init() functions but missed the header prototypes in mac.h. Remove
them since they are no longer needed.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
 hw/ppc/mac.h | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/hw/ppc/mac.h b/hw/ppc/mac.h
index 22a7efbed6..dac96317af 100644
--- a/hw/ppc/mac.h
+++ b/hw/ppc/mac.h
@@ -97,12 +97,6 @@ void macio_init(PCIDevice *dev,
 /* Grackle PCI */
 #define TYPE_GRACKLE_PCI_HOST_BRIDGE "grackle-pcihost"
 
-/* UniNorth PCI */
-UNINHostState *pci_pmac_init(qemu_irq *pic,
-                             MemoryRegion *address_space_mem);
-UNINHostState *pci_pmac_u3_init(qemu_irq *pic,
-                                MemoryRegion *address_space_mem);
-
 /* Mac NVRAM */
 #define TYPE_MACIO_NVRAM "macio-nvram"
 #define MACIO_NVRAM(obj) \
-- 
2.11.0

[Qemu-devel] [PATCH 2/3] ppc: remove obsolete macio_init() definition from mac.h

[Mark Cave-Ayland]

Commits b6712ea391 removed the macio_init() function but missed the header
prototype in mac.h. Remove it since it is no longer needed.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
 hw/ppc/mac.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/hw/ppc/mac.h b/hw/ppc/mac.h
index dac96317af..89fa8bbed7 100644
--- a/hw/ppc/mac.h
+++ b/hw/ppc/mac.h
@@ -91,9 +91,6 @@ typedef struct MACIOIDEState {
 void macio_ide_init_drives(MACIOIDEState *ide, DriveInfo **hd_table);
 void macio_ide_register_dma(MACIOIDEState *ide);
 
-void macio_init(PCIDevice *dev,
-                MemoryRegion *pic_mem);
-
 /* Grackle PCI */
 #define TYPE_GRACKLE_PCI_HOST_BRIDGE "grackle-pcihost"
 
-- 
2.11.0

[Qemu-devel] [PATCH 3/3] ppc: add missing FW_CFG_PPC_NVRAM_FLAT definition

[Mark Cave-Ayland]

This is used in OpenBIOS to define the memory layout of the NVRAM device. Whilst
currently left at its default value, add the missing definition to ensure it is
reserved.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
 include/hw/ppc/ppc.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/hw/ppc/ppc.h b/include/hw/ppc/ppc.h
index ff0ac306be..b18ef3eefb 100644
--- a/include/hw/ppc/ppc.h
+++ b/include/hw/ppc/ppc.h
@@ -100,6 +100,7 @@ enum {
 #define FW_CFG_PPC_KVM_PID      (FW_CFG_ARCH_LOCAL + 0x07)
 #define FW_CFG_PPC_NVRAM_ADDR   (FW_CFG_ARCH_LOCAL + 0x08)
 #define FW_CFG_PPC_BUSFREQ      (FW_CFG_ARCH_LOCAL + 0x09)
+#define FW_CFG_PPC_NVRAM_FLAT   (FW_CFG_ARCH_LOCAL + 0x0a)
 
 #define PPC_SERIAL_MM_BAUDBASE 399193
 
-- 
2.11.0

Re: [Qemu-devel] [PATCH 1/3] ppc: remove obsolete pci_pmac_init() definitions from mac.h

[Philippe Mathieu-Daudé]

On 06/07/2018 01:59 PM, Mark Cave-Ayland wrote:
> Commits 7b19318bee and 8ce3f743c7 removed the pci_pmac_init() and
> pci_pmac_u3_init() functions but missed the header prototypes in mac.h. Remove
> them since they are no longer needed.
> 
> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>

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

> ---
>  hw/ppc/mac.h | 6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/hw/ppc/mac.h b/hw/ppc/mac.h
> index 22a7efbed6..dac96317af 100644
> --- a/hw/ppc/mac.h
> +++ b/hw/ppc/mac.h
> @@ -97,12 +97,6 @@ void macio_init(PCIDevice *dev,
>  /* Grackle PCI */
>  #define TYPE_GRACKLE_PCI_HOST_BRIDGE "grackle-pcihost"
>  
> -/* UniNorth PCI */
> -UNINHostState *pci_pmac_init(qemu_irq *pic,
> -                             MemoryRegion *address_space_mem);
> -UNINHostState *pci_pmac_u3_init(qemu_irq *pic,
> -                                MemoryRegion *address_space_mem);
> -
>  /* Mac NVRAM */
>  #define TYPE_MACIO_NVRAM "macio-nvram"
>  #define MACIO_NVRAM(obj) \
> 

Re: [Qemu-devel] [PATCH 2/3] ppc: remove obsolete macio_init() definition from mac.h

[Philippe Mathieu-Daudé]

On 06/07/2018 01:59 PM, Mark Cave-Ayland wrote:
> Commits b6712ea391 removed the macio_init() function but missed the header
> prototype in mac.h. Remove it since it is no longer needed.
> 
> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>

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

> ---
>  hw/ppc/mac.h | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/hw/ppc/mac.h b/hw/ppc/mac.h
> index dac96317af..89fa8bbed7 100644
> --- a/hw/ppc/mac.h
> +++ b/hw/ppc/mac.h
> @@ -91,9 +91,6 @@ typedef struct MACIOIDEState {
>  void macio_ide_init_drives(MACIOIDEState *ide, DriveInfo **hd_table);
>  void macio_ide_register_dma(MACIOIDEState *ide);
>  
> -void macio_init(PCIDevice *dev,
> -                MemoryRegion *pic_mem);
> -
>  /* Grackle PCI */
>  #define TYPE_GRACKLE_PCI_HOST_BRIDGE "grackle-pcihost"
>  
> 

Re: [Qemu-devel] [PATCH 0/3] ppc: trivial Mac fixes

[David Gibson]

[-- Attachment #1: Type: text/plain, Size: 903 bytes --]

On Thu, Jun 07, 2018 at 05:59:52PM +0100, Mark Cave-Ayland wrote:
> Here are some trivial Mac fixes taken from various working branches in my
> local git repository. Since they should need minimal review it seems
> worthwhile to send them separately.
> 
> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>

Applied to ppc-for-3.0, thanks.

> 
> 
> Mark Cave-Ayland (3):
>   ppc: remove obsolete pci_pmac_init() definitions from mac.h
>   ppc: remove obsolete macio_init() definition from mac.h
>   ppc: add missing FW_CFG_PPC_NVRAM_FLAT definition
> 
>  hw/ppc/mac.h         | 9 ---------
>  include/hw/ppc/ppc.h | 1 +
>  2 files changed, 1 insertion(+), 9 deletions(-)
> 

-- 
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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]