From owner-svn-src-head@FreeBSD.ORG Thu Jun 26 17:20:47 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 50114D4E; Thu, 26 Jun 2014 17:20:47 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 2281F23A2; Thu, 26 Jun 2014 17:20:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5QHKkoW006500; Thu, 26 Jun 2014 17:20:46 GMT (envelope-from bz@svn.freebsd.org) Received: (from bz@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5QHKkkG006496; Thu, 26 Jun 2014 17:20:46 GMT (envelope-from bz@svn.freebsd.org) Message-Id: <201406261720.s5QHKkkG006496@svn.freebsd.org> From: "Bjoern A. Zeeb" Date: Thu, 26 Jun 2014 17:20:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r267922 - in head/sys: conf dev/netfpga10g/nf10bmac mips/conf modules/netfpga10g/nf10bmac X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Jun 2014 17:20:47 -0000 Author: bz Date: Thu Jun 26 17:20:45 2014 New Revision: 267922 URL: http://svnweb.freebsd.org/changeset/base/267922 Log: Introduce opt_netfpga.h and allow setting NF10BMAC_64BIT from mips kernel configs. Switch the BERI_NETFPGA_MDROOT to 64bit by default. Give we have working interrupts also cleanup the extra polling CFLAGS from the module Makefile. MFC after: 2 weeks Modified: head/sys/conf/options.mips head/sys/dev/netfpga10g/nf10bmac/if_nf10bmac.c head/sys/mips/conf/BERI_NETFPGA_MDROOT head/sys/modules/netfpga10g/nf10bmac/Makefile Modified: head/sys/conf/options.mips ============================================================================== --- head/sys/conf/options.mips Thu Jun 26 17:15:41 2014 (r267921) +++ head/sys/conf/options.mips Thu Jun 26 17:20:45 2014 (r267922) @@ -91,6 +91,11 @@ OCTEON_BOARD_CAPK_0100ND opt_cvmx.h BERI_LARGE_TLB opt_global.h # +# Options that control the NetFPGA-10G Embedded CPU Ethernet Core. +# +NF10BMAC_64BIT opt_netfpga.h + +# # Options that control the Atheros SoC peripherals # ARGE_DEBUG opt_arge.h Modified: head/sys/dev/netfpga10g/nf10bmac/if_nf10bmac.c ============================================================================== --- head/sys/dev/netfpga10g/nf10bmac/if_nf10bmac.c Thu Jun 26 17:15:41 2014 (r267921) +++ head/sys/dev/netfpga10g/nf10bmac/if_nf10bmac.c Thu Jun 26 17:20:45 2014 (r267922) @@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$"); #include "opt_device_polling.h" +#include "opt_netfpga.h" #include #include Modified: head/sys/mips/conf/BERI_NETFPGA_MDROOT ============================================================================== --- head/sys/mips/conf/BERI_NETFPGA_MDROOT Thu Jun 26 17:15:41 2014 (r267921) +++ head/sys/mips/conf/BERI_NETFPGA_MDROOT Thu Jun 26 17:20:45 2014 (r267922) @@ -23,6 +23,7 @@ device bpf options DEVICE_POLLING device netfpga10g_nf10bmac +options NF10BMAC_64BIT # # This kernel configuration uses an embedded memory root file system. Modified: head/sys/modules/netfpga10g/nf10bmac/Makefile ============================================================================== --- head/sys/modules/netfpga10g/nf10bmac/Makefile Thu Jun 26 17:15:41 2014 (r267921) +++ head/sys/modules/netfpga10g/nf10bmac/Makefile Thu Jun 26 17:20:45 2014 (r267922) @@ -6,11 +6,10 @@ KMOD= if_nf10bmac SRCS= if_nf10bmac.c SRCS+= device_if.h bus_if.h pci_if.h SRCS+= opt_device_polling.h +SRCS+= opt_netfpga.h .if ${MACHINE_CPUARCH} == "mips" SRCS+= if_nf10bmac_fdt.c ofw_bus_if.h .endif -CFLAGS+= -DDEVICE_POLLING - .include