From owner-svn-src-all@freebsd.org Mon Mar 27 17:09:12 2017 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 DF406D20E6A; Mon, 27 Mar 2017 17:09:12 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id ABD82A4D; Mon, 27 Mar 2017 17:09:12 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2RH9BIC084489; Mon, 27 Mar 2017 17:09:11 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2RH9Bb9084488; Mon, 27 Mar 2017 17:09:11 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201703271709.v2RH9Bb9084488@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Mon, 27 Mar 2017 17:09:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r316034 - head/sys/compat/linuxkpi/common/src X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 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: Mon, 27 Mar 2017 17:09:13 -0000 Author: hselasky Date: Mon Mar 27 17:09:11 2017 New Revision: 316034 URL: https://svnweb.freebsd.org/changeset/base/316034 Log: Add more platforms supporting the direct map feature in the LinuxKPI. MFC after: 1 week Sponsored by: Mellanox Technologies Modified: head/sys/compat/linuxkpi/common/src/linux_page.c Modified: head/sys/compat/linuxkpi/common/src/linux_page.c ============================================================================== --- head/sys/compat/linuxkpi/common/src/linux_page.c Mon Mar 27 17:04:11 2017 (r316033) +++ head/sys/compat/linuxkpi/common/src/linux_page.c Mon Mar 27 17:09:11 2017 (r316034) @@ -63,10 +63,16 @@ __FBSDID("$FreeBSD$"); #include #include +#if defined(__amd64__) || defined(__aarch64__) || defined(__riscv__) +#define LINUXKPI_HAVE_DMAP +#else +#undef LINUXKPI_HAVE_DMAP +#endif + void * linux_page_address(struct page *page) { -#ifdef __amd64__ +#ifdef LINUXKPI_HAVE_DMAP return ((void *)PHYS_TO_DMAP(VM_PAGE_TO_PHYS(page))); #else if (page->object != kmem_object && page->object != kernel_object) @@ -79,7 +85,7 @@ linux_page_address(struct page *page) vm_page_t linux_alloc_pages(gfp_t flags, unsigned int order) { -#ifdef __amd64__ +#ifdef LINUXKPI_HAVE_DMAP unsigned long npages = 1UL << order; int req = (flags & M_ZERO) ? (VM_ALLOC_ZERO | VM_ALLOC_NOOBJ | VM_ALLOC_NORMAL) : (VM_ALLOC_NOOBJ | VM_ALLOC_NORMAL); @@ -137,7 +143,7 @@ retry: void linux_free_pages(vm_page_t page, unsigned int order) { -#ifdef __amd64__ +#ifdef LINUXKPI_HAVE_DMAP unsigned long npages = 1UL << order; unsigned long x;