From nobody Fri Sep 20 03:15:59 2024 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 4X8yFq4L8Pz5WcNW; Fri, 20 Sep 2024 03:15:59 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X8yFq3Xdhz4Jsr; Fri, 20 Sep 2024 03:15:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726802159; 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=XPr/SDd+8IHnxi5FYYQcz+DOxUyMQgTMbS0eB6DVjm0=; b=uzTeg3dCnX38SDVoWYwZuHslMv0HawafmUIjvD4g3tcBmKuQJnTn0eo3B7Knb4GGOHfpz6 FswkJb52kCGmuzgdznI1OiilpwiOb1XsVXsIL2zlIAj8JOL2cLwxExUmXZSsArdjxYBeLC nYOHNEMEVCmRR12dxSSem/bSuM1EGluWcdyhqdBGGkpkiWAKxn2QB61R66+qjJO8BMsmGb kj7QhXsl7RNYxvyGXOUKzLqDKVXOSBUBs40TSwTzahz7fj97ApJwVhnjHnimT8iOizdwQ6 VKH8R8Z4SQmoR6Uxo+i7oJivzWA62WEuO/FqUFB3F2uVJ58dW7ii0+NkAt0+lA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726802159; a=rsa-sha256; cv=none; b=garbpRzcJ4zsYJNC7GP0ClrTiU3rDGyaA9jStT2fKPUdJNPUd8+L24ngPxm9sniUAKZvF5 pUBvf9adhaSUh6tb1WoCt49O7Hwj8NNQZ7O/AsK4FQvP5TSV8IUjVQG5SYrRtsWGYI4Ja8 6gJId+Qcrl9bq29CdgxH5s2Uc+X6OcaGLFa0BCntGj5PvMnIjld9+3t38YrDoz1bvqrk1L t0345CAAkfp/AsFQqqX6I+bxniuCX+Tz/dSBxuI5wYrfwi2wFdwy8Po6VsbECrZH/0rX8u eCtz1QGEWO8wyx9QVr1ifWJ5xBsBeojVuNKIZUo76szhJ8s51w1Flicyrl57Qg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726802159; 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=XPr/SDd+8IHnxi5FYYQcz+DOxUyMQgTMbS0eB6DVjm0=; b=Bwpk4WFulO8oilg7n8TAqdFgfiAs9xr450eLScIzyS+8QXXMP2p+PwJrvV5UpaotgfgVJd ZOCw6eHCwxg4XwNfgFeqtpmIgroBtXThohuWhIgFUnkq1rLIpHqGSNJOI4s4u//wr4jvy/ VPPIzfpRsC+v5O74vlf1SIpcpUIohM2665gHrSuzBdxNM0R00g5Sk9NtyhZLhvBO8SkzIs 1Q/a35Xb0rab45k37yaEUqY7GQTG+59YMza18IklEc7uHH+l6RgS0AeJ+SlcbXMSkqIGND yFN9CH4J2Erj/JO0OpHEmrPZccHFr2JkrJdo4n3x9WaXZMDYdck4qsikraXCgA== 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 4X8yFq38dTzYfQ; Fri, 20 Sep 2024 03:15:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48K3FxUA052245; Fri, 20 Sep 2024 03:15:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48K3FxNF052242; Fri, 20 Sep 2024 03:15:59 GMT (envelope-from git) Date: Fri, 20 Sep 2024 03:15:59 GMT Message-Id: <202409200315.48K3FxNF052242@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 50455f73c281 - main - ixgbe: replace implicit fall-through comments 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 50455f73c28114c665551cba267ec964491ccf21 Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=50455f73c28114c665551cba267ec964491ccf21 commit 50455f73c28114c665551cba267ec964491ccf21 Author: Piotr Skajewski AuthorDate: 2024-09-20 03:12:41 +0000 Commit: Kevin Bowling CommitDate: 2024-09-20 03:15:05 +0000 ixgbe: replace implicit fall-through comments DPDK commit message Convert all "fall-through" comments to actual code. This aligns the code with the kernel which no longer allows implicit fallthrough. Signed-off-by: Piotr Skajewski Reviewed-by: Alice Michael Obtained from: DPDK (ae8211f) MFC after: 1 week --- sys/dev/ixgbe/ixgbe_82599.c | 8 ++++++-- sys/dev/ixgbe/ixgbe_common.c | 10 ++++++---- sys/dev/ixgbe/ixgbe_x550.c | 11 +++++++---- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/sys/dev/ixgbe/ixgbe_82599.c b/sys/dev/ixgbe/ixgbe_82599.c index a1d8b299bf80..1ecab83a4e92 100644 --- a/sys/dev/ixgbe/ixgbe_82599.c +++ b/sys/dev/ixgbe/ixgbe_82599.c @@ -1759,7 +1759,9 @@ s32 ixgbe_fdir_set_input_mask_82599(struct ixgbe_hw *hw, case 0x0000: /* mask VLAN ID */ fdirm |= IXGBE_FDIRM_VLANID; - /* FALLTHROUGH */ + /* mask VLAN priority */ + fdirm |= IXGBE_FDIRM_VLANP; + break; case 0x0FFF: /* mask VLAN priority */ fdirm |= IXGBE_FDIRM_VLANP; @@ -2049,7 +2051,9 @@ s32 ixgbe_fdir_add_perfect_filter_82599(struct ixgbe_hw *hw, DEBUGOUT(" Error on src/dst port\n"); return IXGBE_ERR_CONFIG; } - /* FALLTHROUGH */ + input_mask->formatted.flow_type = IXGBE_ATR_L4TYPE_IPV6_MASK | + IXGBE_ATR_L4TYPE_MASK; + break; case IXGBE_ATR_FLOW_TYPE_TCPV4: case IXGBE_ATR_FLOW_TYPE_TUNNELED_TCPV4: case IXGBE_ATR_FLOW_TYPE_UDPV4: diff --git a/sys/dev/ixgbe/ixgbe_common.c b/sys/dev/ixgbe/ixgbe_common.c index a7adf079f248..ff422a01c741 100644 --- a/sys/dev/ixgbe/ixgbe_common.c +++ b/sys/dev/ixgbe/ixgbe_common.c @@ -268,8 +268,8 @@ s32 ixgbe_setup_fc_generic(struct ixgbe_hw *hw) if (ret_val != IXGBE_SUCCESS) goto out; - /* only backplane uses autoc */ - /* FALLTHROUGH */ + reg = IXGBE_READ_REG(hw, IXGBE_PCS1GANA); + break; case ixgbe_media_type_fiber_fixed: case ixgbe_media_type_fiber_qsfp: case ixgbe_media_type_fiber: @@ -4779,8 +4779,10 @@ void ixgbe_set_rxpba_generic(struct ixgbe_hw *hw, int num_pb, u32 headroom, rxpktsize <<= IXGBE_RXPBSIZE_SHIFT; for (; i < (num_pb / 2); i++) IXGBE_WRITE_REG(hw, IXGBE_RXPBSIZE(i), rxpktsize); - /* configure remaining packet buffers */ - /* FALLTHROUGH */ + rxpktsize = (pbsize / (num_pb - i)) << IXGBE_RXPBSIZE_SHIFT; + for (; i < num_pb; i++) + IXGBE_WRITE_REG(hw, IXGBE_RXPBSIZE(i), rxpktsize); + break; case PBA_STRATEGY_EQUAL: rxpktsize = (pbsize / (num_pb - i)) << IXGBE_RXPBSIZE_SHIFT; for (; i < num_pb; i++) diff --git a/sys/dev/ixgbe/ixgbe_x550.c b/sys/dev/ixgbe/ixgbe_x550.c index 8fe8d037cf31..961d5c285e51 100644 --- a/sys/dev/ixgbe/ixgbe_x550.c +++ b/sys/dev/ixgbe/ixgbe_x550.c @@ -355,8 +355,7 @@ static s32 ixgbe_identify_phy_x550em(struct ixgbe_hw *hw) /* set up for CS4227 usage */ ixgbe_setup_mux_ctl(hw); ixgbe_check_cs4227(hw); - /* Fallthrough */ - + return ixgbe_identify_sfp_module_X550em(hw); case IXGBE_DEV_ID_X550EM_A_SFP_N: return ixgbe_identify_sfp_module_X550em(hw); break; @@ -1869,7 +1868,9 @@ s32 ixgbe_get_link_capabilities_X550em(struct ixgbe_hw *hw, break; } } - /* fall through */ + *speed = IXGBE_LINK_SPEED_10GB_FULL | + IXGBE_LINK_SPEED_1GB_FULL; + break; default: *speed = IXGBE_LINK_SPEED_10GB_FULL | IXGBE_LINK_SPEED_1GB_FULL; @@ -3589,7 +3590,9 @@ u64 ixgbe_get_supported_physical_layer_X550em(struct ixgbe_hw *hw) break; } } - /* fall through */ + physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_KR | + IXGBE_PHYSICAL_LAYER_1000BASE_KX; + break; case ixgbe_phy_x550em_xfi: physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_KR | IXGBE_PHYSICAL_LAYER_1000BASE_KX;