From owner-svn-src-all@freebsd.org Sun Mar 1 18:17:59 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6AFBE247FBA; Sun, 1 Mar 2020 18:17:59 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48Vs2Z4ln9z4cPG; Sun, 1 Mar 2020 18:17:58 +0000 (UTC) (envelope-from imp@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8E7167946; Sun, 1 Mar 2020 18:17:57 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 021IHv1Z007899; Sun, 1 Mar 2020 18:17:57 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 021IHv7D007898; Sun, 1 Mar 2020 18:17:57 GMT (envelope-from imp@FreeBSD.org) Message-Id: <202003011817.021IHv7D007898@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Sun, 1 Mar 2020 18:17:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r358492 - head/sys/dev/cxgb X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/sys/dev/cxgb X-SVN-Commit-Revision: 358492 X-SVN-Commit-Repository: base 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.29 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: Sun, 01 Mar 2020 18:17:59 -0000 Author: imp Date: Sun Mar 1 18:17:56 2020 New Revision: 358492 URL: https://svnweb.freebsd.org/changeset/base/358492 Log: Remove conditional code for FreeBSD 8 and earlier frmo cxgb. Modified: head/sys/dev/cxgb/cxgb_osdep.h head/sys/dev/cxgb/cxgb_sge.c Modified: head/sys/dev/cxgb/cxgb_osdep.h ============================================================================== --- head/sys/dev/cxgb/cxgb_osdep.h Sun Mar 1 18:17:51 2020 (r358491) +++ head/sys/dev/cxgb/cxgb_osdep.h Sun Mar 1 18:17:56 2020 (r358492) @@ -70,36 +70,10 @@ struct t3_mbuf_hdr { } while (0) #endif -#if __FreeBSD_version < 800054 -#if defined (__GNUC__) - #if #cpu(i386) || defined __i386 || defined i386 || defined __i386__ || #cpu(x86_64) || defined __x86_64__ - #define mb() __asm__ __volatile__ ("mfence;": : :"memory") - #define wmb() __asm__ __volatile__ ("sfence;": : :"memory") - #define rmb() __asm__ __volatile__ ("lfence;": : :"memory") - #elif #cpu(sparc64) || defined sparc64 || defined __sparcv9 - #define mb() __asm__ __volatile__ ("membar #MemIssue": : :"memory") - #define wmb() mb() - #define rmb() mb() - #elif #cpu(sparc) || defined sparc || defined __sparc__ - #define mb() __asm__ __volatile__ ("stbar;": : :"memory") - #define wmb() mb() - #define rmb() mb() -#else - #define wmb() mb() - #define rmb() mb() - #define mb() /* XXX just to make this compile */ - #endif -#else - #error "unknown compiler" -#endif -#endif - /* * Workaround for weird Chelsio issue */ -#if __FreeBSD_version > 700029 #define PRIV_SUPPORTED -#endif #define CXGB_TX_CLEANUP_THRESHOLD 32 Modified: head/sys/dev/cxgb/cxgb_sge.c ============================================================================== --- head/sys/dev/cxgb/cxgb_sge.c Sun Mar 1 18:17:51 2020 (r358491) +++ head/sys/dev/cxgb/cxgb_sge.c Sun Mar 1 18:17:56 2020 (r358492) @@ -559,7 +559,6 @@ t3_sge_prep(adapter_t *adap, struct sge_params *p) use_16k = cxgb_use_16k_clusters != -1 ? cxgb_use_16k_clusters : is_offload(adap); -#if __FreeBSD_version >= 700111 if (use_16k) { jumbo_q_size = min(nmbjumbo16/(3*nqsets), JUMBO_Q_SIZE); jumbo_buf_size = MJUM16BYTES; @@ -567,10 +566,6 @@ t3_sge_prep(adapter_t *adap, struct sge_params *p) jumbo_q_size = min(nmbjumbo9/(3*nqsets), JUMBO_Q_SIZE); jumbo_buf_size = MJUM9BYTES; } -#else - jumbo_q_size = min(nmbjumbop/(3*nqsets), JUMBO_Q_SIZE); - jumbo_buf_size = MJUMPAGESIZE; -#endif while (!powerof2(jumbo_q_size)) jumbo_q_size--;