Commit a36848ff authored by Aaron Larson's avatar Aaron Larson Committed by David Gibson
Browse files

target-ppc: Eliminate redundant and incorrect function booke206_page_size_to_tlb 

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 commit
2bd9543c "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.  Commit 2bd9543c did 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: default avatarAaron Larson <alarson@ddci.com>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent ff461b8d

hw/ppc/e500.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}

hw/ppc/e500.h

+2 −0
Original line number Diff line number Diff line
@@ -26,4 +26,6 @@ typedef struct PPCE500Params { 


void ppce500_init(MachineState *machine, PPCE500Params *params);



hwaddr booke206_page_size_to_tlb(uint64_t size);



#endif

hw/ppc/ppce500_spin.c

+1 −6
Original line number Diff line number Diff line
@@ -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,