On Fri, Sep 23, 2016 at 01:43:04PM +0200, Mark Kettenis wrote:
> Most of these are warnings about static symbols that aren't used. The
> pmap_get_pde_pte() bit fixes:
>
> ../../../../arch/arm/arm/pmap7.c:2220:10: warning: comparison of array
> 'pm->pm_l2' equal to a null pointer is always false
> [-Wtautological-pointer-compare]
> if (pm->pm_l2 == NULL)
>
> ok?
>
>
> Index: arch/arm/arm/cpu.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/arm/arm/cpu.c,v
> retrieving revision 1.32
> diff -u -p -r1.32 cpu.c
> --- arch/arm/arm/cpu.c 14 Aug 2016 11:30:54 -0000 1.32
> +++ arch/arm/arm/cpu.c 23 Sep 2016 11:32:51 -0000
> @@ -103,16 +103,6 @@ static const char * const pxa2x0_steppin
> "rev 12", "rev 13", "rev 14", "rev 15"
> };
>
> -/* Steppings for PXA255/26x.
> - * rev 5: PXA26x B0, rev 6: PXA255 A0
> - */
> -static const char * const pxa255_steppings[16] = {
> - "rev 0", "rev 1", "rev 2", "step A-0",
> - "rev 4", "step B-0", "step A-0", "rev 7",
> - "rev 8", "rev 9", "rev 10", "rev 11",
> - "rev 12", "rev 13", "rev 14", "rev 15"
> -};
Why not just remove all the pxa/xscale bits from cpu/cpufunc?
Anyway removing this and the making the other changes is ok jsg@
> -
> /* Steppings for PXA270 */
> static const char * const pxa27x_steppings[16] = {
> "step A-0", "step A-1", "step B-0", "step B-1",
> Index: arch/arm/arm/pmap7.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/arm/arm/pmap7.c,v
> retrieving revision 1.52
> diff -u -p -r1.52 pmap7.c
> --- arch/arm/arm/pmap7.c 15 Sep 2016 02:00:17 -0000 1.52
> +++ arch/arm/arm/pmap7.c 23 Sep 2016 11:32:51 -0000
> @@ -446,26 +446,12 @@ pmap_tlb_flushID_SE(pmap_t pm, vaddr_t v
> }
>
> static __inline void
> -pmap_tlb_flushD_SE(pmap_t pm, vaddr_t va)
> -{
> - if (pmap_is_current(pm))
> - cpu_tlb_flushD_SE(va);
> -}
> -
> -static __inline void
> pmap_tlb_flushID(pmap_t pm)
> {
> if (pmap_is_current(pm))
> cpu_tlb_flushID();
> }
>
> -static __inline void
> -pmap_tlb_flushD(pmap_t pm)
> -{
> - if (pmap_is_current(pm))
> - cpu_tlb_flushD();
> -}
> -
> /*
> * Returns a pointer to the L2 bucket associated with the specified pmap
> * and VA, or NULL if no L2 bucket exists for the address.
> @@ -2217,11 +2203,7 @@ pmap_get_pde_pte(pmap_t pm, vaddr_t va,
> return (TRUE);
> }
>
> - if (pm->pm_l2 == NULL)
> - return (FALSE);
> -
> l2 = pm->pm_l2[L2_IDX(l1idx)];
> -
> if (l2 == NULL ||
> (ptep = l2->l2_bucket[L2_BUCKET(l1idx)].l2b_kva) == NULL) {
> return (FALSE);
> Index: arch/arm/cortex/agtimer.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/arm/cortex/agtimer.c,v
> retrieving revision 1.7
> diff -u -p -r1.7 agtimer.c
> --- arch/arm/cortex/agtimer.c 10 Aug 2016 06:51:57 -0000 1.7
> +++ arch/arm/cortex/agtimer.c 23 Sep 2016 11:32:51 -0000
> @@ -126,16 +126,6 @@ agtimer_set_ctrl(uint32_t val)
> }
>
> static inline int
> -agtimer_get_tval(void)
> -{
> - uint32_t val;
> -
> - __asm volatile("mrc p15, 0, %0, c14, c2, 0" : "=r" (val));
> -
> - return (val);
> -}
> -
> -static inline int
> agtimer_set_tval(uint32_t val)
> {
> __asm volatile("mcr p15, 0, %[val], c14, c2, 0" : :
>