[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 1/3] hw/ppc/prep: Remove ifdeffed-out stub of XC
From: |
Philippe Mathieu-Daudé |
Subject: |
Re: [Qemu-devel] [PATCH 1/3] hw/ppc/prep: Remove ifdeffed-out stub of XCSR code |
Date: |
Thu, 2 Aug 2018 12:45:25 -0300 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 |
On 08/02/2018 11:44 AM, Peter Maydell wrote:
> The prep machine has some code which is stubs of accessors
> for XCSR registers. This has been disabled via #if 0
> since commit b6b8bd1819ff in 2004, and doesn't have any
> actual interesting content. It also uses the deprecated
> old_mmio accessor functions. Remove it entirely.
>
> Signed-off-by: Peter Maydell <address@hidden>
> ---
> hw/ppc/prep.c | 97 +++------------------------------------------------
> 1 file changed, 4 insertions(+), 93 deletions(-)
>
> diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
> index 3401570d981..b26138e5c47 100644
> --- a/hw/ppc/prep.c
> +++ b/hw/ppc/prep.c
> @@ -78,94 +78,6 @@ static int ne2000_irq[NE2000_NB_MAX] = { 9, 10, 11, 3, 4,
> 5 };
> /* ISA IO ports bridge */
> #define PPC_IO_BASE 0x80000000
>
> -/* PowerPC control and status registers */
> -#if 0 // Not used
> -static struct {
> - /* IDs */
> - uint32_t veni_devi;
> - uint32_t revi;
> - /* Control and status */
> - uint32_t gcsr;
> - uint32_t xcfr;
> - uint32_t ct32;
> - uint32_t mcsr;
> - /* General purpose registers */
> - uint32_t gprg[6];
> - /* Exceptions */
> - uint32_t feen;
> - uint32_t fest;
> - uint32_t fema;
> - uint32_t fecl;
> - uint32_t eeen;
> - uint32_t eest;
> - uint32_t eecl;
> - uint32_t eeint;
> - uint32_t eemck0;
> - uint32_t eemck1;
> - /* Error diagnostic */
> -} XCSR;
> -
> -static void PPC_XCSR_writeb (void *opaque,
> - hwaddr addr, uint32_t value)
> -{
> - printf("%s: 0x" TARGET_FMT_plx " => 0x%08" PRIx32 "\n", __func__, addr,
> - value);
> -}
> -
> -static void PPC_XCSR_writew (void *opaque,
> - hwaddr addr, uint32_t value)
> -{
> - printf("%s: 0x" TARGET_FMT_plx " => 0x%08" PRIx32 "\n", __func__, addr,
> - value);
> -}
> -
> -static void PPC_XCSR_writel (void *opaque,
> - hwaddr addr, uint32_t value)
> -{
> - printf("%s: 0x" TARGET_FMT_plx " => 0x%08" PRIx32 "\n", __func__, addr,
> - value);
> -}
> -
> -static uint32_t PPC_XCSR_readb (void *opaque, hwaddr addr)
> -{
> - uint32_t retval = 0;
> -
> - printf("%s: 0x" TARGET_FMT_plx " <= %08" PRIx32 "\n", __func__, addr,
> - retval);
> -
> - return retval;
> -}
> -
> -static uint32_t PPC_XCSR_readw (void *opaque, hwaddr addr)
> -{
> - uint32_t retval = 0;
> -
> - printf("%s: 0x" TARGET_FMT_plx " <= %08" PRIx32 "\n", __func__, addr,
> - retval);
> -
> - return retval;
> -}
> -
> -static uint32_t PPC_XCSR_readl (void *opaque, hwaddr addr)
> -{
> - uint32_t retval = 0;
> -
> - printf("%s: 0x" TARGET_FMT_plx " <= %08" PRIx32 "\n", __func__, addr,
> - retval);
> -
> - return retval;
> -}
> -
> -static const MemoryRegionOps PPC_XCSR_ops = {
> - .old_mmio = {
> - .read = { PPC_XCSR_readb, PPC_XCSR_readw, PPC_XCSR_readl, },
> - .write = { PPC_XCSR_writeb, PPC_XCSR_writew, PPC_XCSR_writel, },
> - },
> - .endianness = DEVICE_LITTLE_ENDIAN,
> -};
> -
> -#endif
> -
> /* Fake super-io ports for PREP platform (Intel 82378ZB) */
> typedef struct sysctrl_t {
> qemu_irq reset_irq;
> @@ -648,11 +560,10 @@ static void ppc_prep_init(MachineState *machine)
> portio_list_init(&prep_port_list, NULL, prep_portio_list, sysctrl,
> "prep");
> portio_list_add(&prep_port_list, isa_address_space_io(isa), 0x0);
>
> - /* PowerPC control and status register group */
> -#if 0
> - memory_region_init_io(xcsr, NULL, &PPC_XCSR_ops, NULL, "ppc-xcsr",
> 0x1000);
> - memory_region_add_subregion(sysmem, 0xFEFF0000, xcsr);
> -#endif
> + /*
> + * PowerPC control and status register group: unimplemented,
> + * would be at address 0xFEFF0000.
> + */
While not directly use the harmless UnimplementedDevice?
create_unimplemented_device("ppc-xcsr", 0xfeff0000, 0x1000);
Anyway,
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
>
> if (machine_usb(machine)) {
> pci_create_simple(pci_bus, -1, "pci-ohci");
>
Re: [Qemu-devel] [PATCH 0/3] hw/ppc: Convert various devices away from old_mmio, David Gibson, 2018/08/03