From owner-svn-src-all@freebsd.org Wed Feb 3 10:01:54 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7AE9DA9A1B7; Wed, 3 Feb 2016 10:01:54 +0000 (UTC) (envelope-from onwahe@gmail.com) Received: from mail-ig0-x22f.google.com (mail-ig0-x22f.google.com [IPv6:2607:f8b0:4001:c05::22f]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47F38DE5; Wed, 3 Feb 2016 10:01:54 +0000 (UTC) (envelope-from onwahe@gmail.com) Received: by mail-ig0-x22f.google.com with SMTP id mw1so31773062igb.1; Wed, 03 Feb 2016 02:01:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=5WZM+vtj4l8jHwADKq206S/Cblo/IUavmx/wj7ubcVQ=; b=kGUekSwnSjoNO/ol7PnqXD/t+FmrLdC1SHdz+BGzOrvncpEVs//nGlwwIdNoga7ws9 iAncAyb9rgAxrOXxsI8iF3iZYm3I3cfBxGrOnibPzKdbrVSBragxTcBNcFT8xemlBzrh Be/7q5n7EMe/a4zoUFzN5ZfJ8/M9+Le6NP5WyHvIH8qSwG5APHpglVbESkrq+4QWVoO2 Kl3SNtXx0BJS6SGdRfy7DA2Iai+sfS+MU2scaACTaHpVBnkt7awD1T9CRes2qCsT5egI hMZOW7srFRkoPTlWSoBFWUKvVkKjnelAKoQGRJpCiaW9X7+IB5f9+csc1yMXi2smhTjS Y3lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=5WZM+vtj4l8jHwADKq206S/Cblo/IUavmx/wj7ubcVQ=; b=comZ7rhVbflBQxOf8la4T5rTHbhEMQRM+xbB3LkAHaGF3qT38LG4EiDhYgOxI7PpmR HGN5KVqx3HZTrIuqIh/mQfuOnTN6RC/JeQwbupa/IQTBjRkCQvitPXTKyb3O+yMCw4EO IeLJdtFcbyWAE9gb8LdbBEDUYn9IoKMky0+YNR3z56hX+KweoI+PlFkvPq4q0YKUtjMk qN2gQGT0nMDQ6x5rYCt9LrF9TewH7fTmZCo2ARyUnSePpEr42dPIe6Pp2FuAs4W9+jc3 +z5J3RpKEIPe7tEfEnZd/saaB35dOQq/aOEZoPgLJEYOj6VLF2ksEdpfFUbA68odWFrM xXOA== X-Gm-Message-State: AG10YOTuwI4qumkVKn9FFvWlE5owTBLvjdPn3tBgUbqB2CVnZ8GFwqaGpQz05Xe1qjG0vU79wyqGoJL2beHy/A== MIME-Version: 1.0 X-Received: by 10.50.108.13 with SMTP id hg13mr21507464igb.19.1454493713735; Wed, 03 Feb 2016 02:01:53 -0800 (PST) Received: by 10.64.55.97 with HTTP; Wed, 3 Feb 2016 02:01:53 -0800 (PST) In-Reply-To: References: <201602022117.u12LHP7M056632@repo.freebsd.org> Date: Wed, 3 Feb 2016 11:01:53 +0100 Message-ID: Subject: Re: svn commit: r295168 - in head/sys/arm: arm include From: Svatopluk Kraus To: Wojciech Macek Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Feb 2016 10:01:54 -0000 Well, I was told that acle-compat.h is needed when __ARM_ARCH is used as some older or newer, not sure now, gcc does not defines it for us. I think that it came to me from andrew@. BTW, the aarch64 kernel build was fixed in r295198 by mmel@. Thanks. Svata On Wed, Feb 3, 2016 at 9:01 AM, Wojciech Macek wrote: > Is it necessary to add acle-compat.h to the includes? If so, I suggest > putting it under ifndef __aarch64__ , to fix the ARM64 build. > > Regards, > Wojtek > > 2016-02-02 22:17 GMT+01:00 Svatopluk Kraus : >> >> Author: skra >> Date: Tue Feb 2 21:17:25 2016 >> New Revision: 295168 >> URL: https://svnweb.freebsd.org/changeset/base/295168 >> >> Log: >> Use pmap_preboot_map_attr() directly in arm_devmap_bootstrap() >> instead of hiding behind pmap_map_chunk(). It's not longer needed >> after old pmap-v6 code was removed. >> >> For compatibility with __ARM_ARCH < 6, define PTE_DEVICE in devmap.c >> file. Certainly, it would be nice if VM_MEMATTR_DEVICE could be used >> even for __ARM_ARCH < 6. >> >> Modified: >> head/sys/arm/arm/devmap.c >> head/sys/arm/include/pmap-v6.h >> >> Modified: head/sys/arm/arm/devmap.c >> >> ============================================================================== >> --- head/sys/arm/arm/devmap.c Tue Feb 2 21:11:23 2016 (r295167) >> +++ head/sys/arm/arm/devmap.c Tue Feb 2 21:17:25 2016 (r295168) >> @@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$"); >> #include >> #include >> #include >> +#include >> #include >> #include >> #include >> @@ -52,6 +53,9 @@ static boolean_t devmap_bootstrap_done = >> #define PTE_DEVICE VM_MEMATTR_DEVICE >> #elif defined(__arm__) >> #define MAX_VADDR ARM_VECTORS_HIGH >> +#if __ARM_ARCH >= 6 >> +#define PTE_DEVICE VM_MEMATTR_DEVICE >> +#endif >> #endif >> >> /* >> @@ -204,8 +208,13 @@ arm_devmap_bootstrap(vm_offset_t l1pt, c >> >> for (pd = devmap_table; pd->pd_size != 0; ++pd) { >> #if defined(__arm__) >> +#if __ARM_ARCH >= 6 >> + pmap_preboot_map_attr(pd->pd_pa, pd->pd_va, pd->pd_size, >> + pd->pd_prot, pd->pd_cache); >> +#else >> pmap_map_chunk(l1pt, pd->pd_va, pd->pd_pa, pd->pd_size, >> - pd->pd_prot,pd->pd_cache); >> + pd->pd_prot, pd->pd_cache); >> +#endif >> #elif defined(__aarch64__) >> pmap_kenter_device(pd->pd_va, pd->pd_size, pd->pd_pa); >> #endif >> >> Modified: head/sys/arm/include/pmap-v6.h >> >> ============================================================================== >> --- head/sys/arm/include/pmap-v6.h Tue Feb 2 21:11:23 2016 >> (r295167) >> +++ head/sys/arm/include/pmap-v6.h Tue Feb 2 21:17:25 2016 >> (r295168) >> @@ -218,12 +218,6 @@ vm_offset_t pmap_preboot_reserve_pages(u >> vm_offset_t pmap_preboot_get_vpages(u_int ); >> void pmap_preboot_map_attr(vm_paddr_t, vm_offset_t, vm_size_t, vm_prot_t, >> vm_memattr_t); >> -static __inline void >> -pmap_map_chunk(vm_offset_t l1pt, vm_offset_t va, vm_offset_t pa, >> - vm_size_t size, int prot, int cache) >> -{ >> - pmap_preboot_map_attr(pa, va, size, prot, cache); >> -} >> >> #endif /* _KERNEL */ >> >> @@ -256,29 +250,6 @@ pmap_map_chunk(vm_offset_t l1pt, vm_offs >> */ >> void vector_page_setprot(int); >> >> -/* >> - * sys/arm/arm/bus_space_generic.c (just comment) >> - * sys/arm/arm/devmap.c >> - * sys/arm/arm/pmap.c (just comment) >> - * sys/arm/at91/at91_machdep.c >> - * sys/arm/cavium/cns11xx/econa_machdep.c >> - * sys/arm/freescale/imx/imx6_machdep.c (just comment) >> - * sys/arm/mv/orion/db88f5xxx.c >> - * sys/arm/mv/mv_localbus.c >> - * sys/arm/mv/mv_machdep.c >> - * sys/arm/mv/mv_pci.c >> - * sys/arm/s3c2xx0/s3c24x0_machdep.c >> - * sys/arm/versatile/versatile_machdep.c >> - * sys/arm/xscale/ixp425/avila_machdep.c >> - * sys/arm/xscale/i8134x/crb_machdep.c >> - * sys/arm/xscale/i80321/ep80219_machdep.c >> - * sys/arm/xscale/i80321/iq31244_machdep.c >> - * sys/arm/xscale/pxa/pxa_machdep.c >> - */ >> -#define PTE_DEVICE PTE2_ATTR_DEVICE >> - >> - >> - >> #endif /* _KERNEL */ >> // >> ----------------------------------------------------------------------------- >> >> >