On Fri, Jun 24, 2016 at 12:11:00PM -0700, Aaron Larson wrote: > > 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 > > Signed-off-by: Aaron Larson <alar...@ddci.com>
Uh.. sorry.. can you provide a reference explaining why the removed
version is wrong? Doesn't this depend on which MMU Architecture
Version we're emulating?
> ---
> hw/ppc/e500.c | 2 +-
> hw/ppc/e500.h | 2 ++
> hw/ppc/ppce500_spin.c | 7 +------
> 3 files changed, 4 insertions(+), 7 deletions(-)
>
> diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
> index ee1c60b..0cd534d 100644
> --- a/hw/ppc/e500.c
> +++ b/hw/ppc/e500.c
> @@ -601,7 +601,7 @@ static int ppce500_prep_device_tree(MachineState *machine,
> }
>
> /* Create -kernel TLB entries for BookE. */
> -static inline hwaddr booke206_page_size_to_tlb(uint64_t size)
> +hwaddr booke206_page_size_to_tlb(uint64_t size)
> {
> return 63 - clz64(size >> 10);
> }
> diff --git a/hw/ppc/e500.h b/hw/ppc/e500.h
> index ef224ea..70ba1d8 100644
> --- a/hw/ppc/e500.h
> +++ b/hw/ppc/e500.h
> @@ -26,4 +26,6 @@ typedef struct PPCE500Params {
>
> void ppce500_init(MachineState *machine, PPCE500Params *params);
>
> +hwaddr booke206_page_size_to_tlb(uint64_t size);
> +
> #endif
> diff --git a/hw/ppc/ppce500_spin.c b/hw/ppc/ppce500_spin.c
> index 225177b..22c584e 100644
> --- a/hw/ppc/ppce500_spin.c
> +++ b/hw/ppc/ppce500_spin.c
> @@ -32,6 +32,7 @@
> #include "sysemu/sysemu.h"
> #include "hw/sysbus.h"
> #include "sysemu/kvm.h"
> +#include "e500.h"
>
> #define MAX_CPUS 32
>
> @@ -72,12 +73,6 @@ static void spin_reset(void *opaque)
> }
> }
>
> -/* Create -kernel TLB entries for BookE, linearly spanning 256MB. */
> -static inline hwaddr booke206_page_size_to_tlb(uint64_t size)
> -{
> - return ctz32(size >> 10) >> 1;
> -}
> -
> static void mmubooke_create_initial_mapping(CPUPPCState *env,
> target_ulong va,
> hwaddr pa,
--
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
signature.asc
Description: PGP signature
