From nobody Sat Feb 4 16:20:22 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P8Hn30rDXz3nYys; Sat, 4 Feb 2023 16:20:23 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P8Hn25FFbz440S; Sat, 4 Feb 2023 16:20:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675527622; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XmaUvX0lVCJnNPd1KKxDBz/dJG16ZcYHtOpmH2jKdpU=; b=Sh1pCeyE8nqMIWYT5UxlHoGCWxPLjF3Upp1i4vf/8XaoAbyzxJylaSnOS/bkXBEIdNU6R/ AD5r8I/paGlTdnsRWoD8Nwejt9dW8jCNjisXkw9MrcfRIYd9sfzyudo56Mbxw7yVTnEJj5 Vywkj8VLqAQTqgEPra4YsIdNmwpDvb9SgB4WDT3Fld3stlD7JqP54j/sFvzsob61bUUVUI ypFuPOOpzXzld2XShN+Y9yYx58tTpllNd2/CLCAiSjEIfeez4ArKhG9VUu+OnxwdxiQ+5C 8k8R5qsq3mDzMM4P0EgqwnUdK7OqAdRKq4p8BnOHtHlkEGNSnX71WmIjeKinmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675527622; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XmaUvX0lVCJnNPd1KKxDBz/dJG16ZcYHtOpmH2jKdpU=; b=yzdU6JMAbLfQOe0nHDEPFtsdzQIndclv3kXwRIN6OwPTzVs3Lj7NhKMDyG/rjlm3AwcREy JdYkXRkgMLdHTzZU0G25ltvKFKI6rFOq68iKHWle+muaKvaSbEWPdvhAaikADLeM5/M86g zhGfJtYkRLpWFSxXZ2Gk52NiAJ+NXqfPXj82JmSBOZpGxdWoN2rEDvnFVvVj9qUpDxHirN hv5HouWQfR0VY5RYR/9L4ct+cO7Oz/7RuVsYPFkhNTYoKC9Pc7FBZ5nRQNNawS8MmT1AOq G27RISFCStMzM1aX9OVfon9Fem63ryXNY0/EPHC2RVxuywrjm7KcARanbHMG8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675527622; a=rsa-sha256; cv=none; b=D803vTqP5b5PAGs+UtFNszFkLwSdK8TfMkeJGjnLSdYMRETDUzAnJRh3vrMOAPuncW67mE aiy9zRMKnAiItYdyBlcBWG38fVLzKCbWUog9BI6qv0fv0S3MzUCSvUxqgLsfOY31RV9cYe reuxyhR4feiOhw/rfQd6bb2YtsW7Oo3SvPWkwusTk9dNRmi8Y5GX0sp1h8Kj/9DiyGz3Zq aaqmsRgZEY7dS+ve5TSOPSt5AKz2m9K6uDlXXpMW6GR5YuFRqrBinO7ryV9CSHv7wb8/S9 Rq4va9527o+I59dX5sbfyiM5vakWJlffWRQZL0yIReCjd7fJJFvCoIt/+euW/A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P8Hn24Hl1zLBV; Sat, 4 Feb 2023 16:20:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 314GKMpZ013517; Sat, 4 Feb 2023 16:20:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 314GKMIP013516; Sat, 4 Feb 2023 16:20:22 GMT (envelope-from git) Date: Sat, 4 Feb 2023 16:20:22 GMT Message-Id: <202302041620.314GKMIP013516@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 407912909a71 - main - ixl: purge EOL release compatibility List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 407912909a71b22d5e381ae9178bcacbcbc0ce45 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=407912909a71b22d5e381ae9178bcacbcbc0ce45 commit 407912909a71b22d5e381ae9178bcacbcbc0ce45 Author: Elliott Mitchell AuthorDate: 2022-06-23 00:53:47 +0000 Commit: Warner Losh CommitDate: 2023-02-04 16:13:08 +0000 ixl: purge EOL release compatibility Drop code that differentiated between FreeBSD 10 and 11. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/603 Differential Revision: https://reviews.freebsd.org/D35560 --- sys/dev/ixl/if_ixl.c | 4 ---- sys/dev/ixl/ixl.h | 15 --------------- sys/dev/ixl/ixl_pf_main.c | 9 --------- 3 files changed, 28 deletions(-) diff --git a/sys/dev/ixl/if_ixl.c b/sys/dev/ixl/if_ixl.c index 9df1d9792e51..8b7d132db7b7 100644 --- a/sys/dev/ixl/if_ixl.c +++ b/sys/dev/ixl/if_ixl.c @@ -314,11 +314,7 @@ TUNABLE_INT("hw.ixl.enable_iwarp", &ixl_enable_iwarp); SYSCTL_INT(_hw_ixl, OID_AUTO, enable_iwarp, CTLFLAG_RDTUN, &ixl_enable_iwarp, 0, "iWARP enabled"); -#if __FreeBSD_version < 1100000 -int ixl_limit_iwarp_msix = 1; -#else int ixl_limit_iwarp_msix = IXL_IW_MAX_MSIX; -#endif TUNABLE_INT("hw.ixl.limit_iwarp_msix", &ixl_limit_iwarp_msix); SYSCTL_INT(_hw_ixl, OID_AUTO, limit_iwarp_msix, CTLFLAG_RDTUN, &ixl_limit_iwarp_msix, 0, "Limit MSI-X vectors assigned to iWARP"); diff --git a/sys/dev/ixl/ixl.h b/sys/dev/ixl/ixl.h index 641ce6b10fcc..6b94732fd44e 100644 --- a/sys/dev/ixl/ixl.h +++ b/sys/dev/ixl/ixl.h @@ -273,7 +273,6 @@ (CSUM_IP|CSUM_IP_TSO) /* Pre-11 counter(9) compatibility */ -#if __FreeBSD_version >= 1100036 #define IXL_SET_IPACKETS(vsi, count) (vsi)->ipackets = (count) #define IXL_SET_IERRORS(vsi, count) (vsi)->ierrors = (count) #define IXL_SET_OPACKETS(vsi, count) (vsi)->opackets = (count) @@ -286,20 +285,6 @@ #define IXL_SET_IQDROPS(vsi, count) (vsi)->iqdrops = (count) #define IXL_SET_OQDROPS(vsi, count) (vsi)->oqdrops = (count) #define IXL_SET_NOPROTO(vsi, count) (vsi)->noproto = (count) -#else -#define IXL_SET_IPACKETS(vsi, count) (vsi)->ifp->if_ipackets = (count) -#define IXL_SET_IERRORS(vsi, count) (vsi)->ifp->if_ierrors = (count) -#define IXL_SET_OPACKETS(vsi, count) (vsi)->ifp->if_opackets = (count) -#define IXL_SET_OERRORS(vsi, count) (vsi)->ifp->if_oerrors = (count) -#define IXL_SET_COLLISIONS(vsi, count) (vsi)->ifp->if_collisions = (count) -#define IXL_SET_IBYTES(vsi, count) (vsi)->ifp->if_ibytes = (count) -#define IXL_SET_OBYTES(vsi, count) (vsi)->ifp->if_obytes = (count) -#define IXL_SET_IMCASTS(vsi, count) (vsi)->ifp->if_imcasts = (count) -#define IXL_SET_OMCASTS(vsi, count) (vsi)->ifp->if_omcasts = (count) -#define IXL_SET_IQDROPS(vsi, count) (vsi)->ifp->if_iqdrops = (count) -#define IXL_SET_OQDROPS(vsi, odrops) (vsi)->ifp->if_snd.ifq_drops = (odrops) -#define IXL_SET_NOPROTO(vsi, count) (vsi)->noproto = (count) -#endif /* For stats sysctl naming */ #define IXL_QUEUE_NAME_LEN 32 diff --git a/sys/dev/ixl/ixl_pf_main.c b/sys/dev/ixl/ixl_pf_main.c index 7b1bf78dac09..7e9ad20b157b 100644 --- a/sys/dev/ixl/ixl_pf_main.c +++ b/sys/dev/ixl/ixl_pf_main.c @@ -2275,16 +2275,7 @@ ixl_stat_update48(struct i40e_hw *hw, u32 hireg, u32 loreg, { u64 new_data; -#if defined(__FreeBSD__) && (__FreeBSD_version >= 1000000) && defined(__amd64__) new_data = rd64(hw, loreg); -#else - /* - * Use two rd32's instead of one rd64; FreeBSD versions before - * 10 don't support 64-bit bus reads/writes. - */ - new_data = rd32(hw, loreg); - new_data |= ((u64)(rd32(hw, hireg) & 0xFFFF)) << 32; -#endif if (!offset_loaded) *offset = new_data;