a36848ff7c
Eliminate redundant and incorrect booke206_page_size_to_tlb function from ppce500_spin.c in preference to previously existing but newly exported definition from e500.c Defect analysis: The booke206_page_size_to_tlb function in e500.c was updated in commit2bd9543"ppc: booke206: use MAV=2.0 TSIZE definition, fix 4G pages" to reflect a change in the definition of MAS1_TSIZE_SHIFT from 8 (corresponding to a min TLB page size of 4kb) to a value of 7 (TLB page size 2k). The booke206_page_size_to_tlb() function defined in ppce500_spin.c was never updated to reflect the change in MAS1_TSIZE_SHIFT. In http://lists.nongnu.org/archive/html/qemu-ppc/2016-06/msg00533.html, Scott Wood suggested this "root cause" explanation: SW> The patch that changed MAS1_TSIZE_SHIFT from 8 to 7 was around the SW> same time as the patch that added this code, which is probably why SW> adjusting it got missed. Commit2bd9543cd3did update the SW> equivalent code in ppce500_mpc8544ds.c, which now resides in SW> hw/ppc/e500.c and has been changed to not assume a power-of-2 SW> size. The ppce500_spin version should be eliminated. Signed-off-by: Aaron Larson <alarson@ddci.com> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
32 lines
742 B
C
32 lines
742 B
C
#ifndef PPCE500_H
|
|
#define PPCE500_H
|
|
|
|
#include "hw/boards.h"
|
|
|
|
typedef struct PPCE500Params {
|
|
int pci_first_slot;
|
|
int pci_nr_slots;
|
|
|
|
/* required -- must at least add toplevel board compatible */
|
|
void (*fixup_devtree)(struct PPCE500Params *params, void *fdt);
|
|
|
|
int mpic_version;
|
|
bool has_mpc8xxx_gpio;
|
|
bool has_platform_bus;
|
|
hwaddr platform_bus_base;
|
|
hwaddr platform_bus_size;
|
|
int platform_bus_first_irq;
|
|
int platform_bus_num_irqs;
|
|
hwaddr ccsrbar_base;
|
|
hwaddr pci_pio_base;
|
|
hwaddr pci_mmio_base;
|
|
hwaddr pci_mmio_bus_base;
|
|
hwaddr spin_base;
|
|
} PPCE500Params;
|
|
|
|
void ppce500_init(MachineState *machine, PPCE500Params *params);
|
|
|
|
hwaddr booke206_page_size_to_tlb(uint64_t size);
|
|
|
|
#endif
|