From owner-svn-src-head@freebsd.org Thu Feb 23 19:02:41 2017 Return-Path: Delivered-To: svn-src-head@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 C978ACE9964; Thu, 23 Feb 2017 19:02:41 +0000 (UTC) (envelope-from np@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 7CC581E73; Thu, 23 Feb 2017 19:02:41 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1NJ2eI8016223; Thu, 23 Feb 2017 19:02:40 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1NJ2eAC016221; Thu, 23 Feb 2017 19:02:40 GMT (envelope-from np@FreeBSD.org) Message-Id: <201702231902.v1NJ2eAC016221@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Thu, 23 Feb 2017 19:02:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314167 - head/sys/dev/cxgbe/iw_cxgbe 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.23 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, 23 Feb 2017 19:02:41 -0000 Author: np Date: Thu Feb 23 19:02:40 2017 New Revision: 314167 URL: https://svnweb.freebsd.org/changeset/base/314167 Log: cxgbe/iw_cxgbe: Minor changes for T6. Submitted by: Krishnamraju Eraparaju at Chelsio Sponsored by: Chelsio Communications Modified: head/sys/dev/cxgbe/iw_cxgbe/device.c head/sys/dev/cxgbe/iw_cxgbe/mem.c head/sys/dev/cxgbe/iw_cxgbe/provider.c Modified: head/sys/dev/cxgbe/iw_cxgbe/device.c ============================================================================== --- head/sys/dev/cxgbe/iw_cxgbe/device.c Thu Feb 23 19:02:31 2017 (r314166) +++ head/sys/dev/cxgbe/iw_cxgbe/device.c Thu Feb 23 19:02:40 2017 (r314167) @@ -330,7 +330,7 @@ c4iw_modevent(module_t mod, int cmd, voi case MOD_LOAD: rc = c4iw_mod_load(); if (rc == 0) - printf("iw_cxgbe: Chelsio T4/T5 RDMA driver loaded.\n"); + printf("iw_cxgbe: Chelsio T4/T5/T6 RDMA driver loaded.\n"); break; case MOD_UNLOAD: Modified: head/sys/dev/cxgbe/iw_cxgbe/mem.c ============================================================================== --- head/sys/dev/cxgbe/iw_cxgbe/mem.c Thu Feb 23 19:02:31 2017 (r314166) +++ head/sys/dev/cxgbe/iw_cxgbe/mem.c Thu Feb 23 19:02:40 2017 (r314167) @@ -46,11 +46,11 @@ __FBSDID("$FreeBSD$"); #define T4_ULPTX_MIN_IO 32 #define C4IW_MAX_INLINE_SIZE 96 -static int mr_exceeds_hw_limits(struct c4iw_dev *dev, u64 length) +static int +mr_exceeds_hw_limits(struct c4iw_dev *dev __unused, u64 length) { - return (is_t4(dev->rdev.adap) || - is_t5(dev->rdev.adap)) && - length >= 8*1024*1024*1024ULL; + + return (length >= 8*1024*1024*1024ULL); } static int write_adapter_mem(struct c4iw_rdev *rdev, u32 addr, u32 len, void *data) Modified: head/sys/dev/cxgbe/iw_cxgbe/provider.c ============================================================================== --- head/sys/dev/cxgbe/iw_cxgbe/provider.c Thu Feb 23 19:02:31 2017 (r314166) +++ head/sys/dev/cxgbe/iw_cxgbe/provider.c Thu Feb 23 19:02:40 2017 (r314167) @@ -190,7 +190,7 @@ static int c4iw_mmap(struct ib_ucontext "%s:6 USER DB-GTS addr %p region %p, reglen %u", __func__, addr, va_udbs_res, len_udbs_res); #ifdef DOT5 - if (is_t5(rdev->lldi.adapter_type) && map_udb_as_wc) + if (!is_t4(rdev->lldi.adapter_type) && map_udb_as_wc) vma->vm_page_prot = t4_pgprot_wc(vma->vm_page_prot); else #endif