From nobody Thu Oct 2 13:07:18 2025 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 029A230E820; Tue, 16 Sep 2025 12:43:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.7 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758026604; cv=none; b=qxXk7md5lb+HDSldmtMAkpP6qjw9zdI46IxpVRB6niOY6glAGfnEmAaUteO1Jgu5lwc/yTmkI5w39JcsTdJ3zaJy/v/ADY8q6QMMcsM1ZE2tO7b7FTnD0Y/1tv6NlB1AcMOx0G7GCmJ19SjdI5Trd7/p/OsoM9n9rihqR2aZNGM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758026604; c=relaxed/simple; bh=aImNmXjsN2O2aGFxgJn2xM8g3wIE4iAJiPsnA1ZcdCs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=mH9ojj2KS+7V3byN3sFB0+iC3Kf5EdpEGzrG2LxAaeVHR509N8zAw97f9RmryQ/GpHrs0h1gmmOCxE4oDqn+sucKD0Uw/UZwCGIM13w2Q1megyxrbZxleZG9qL7uDBA+qHr5zs7mkFTES7HkSI1pZVObURQW4cMXO0bxMalRLug= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=FrnXy6MV; arc=none smtp.client-ip=192.198.163.7 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="FrnXy6MV" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1758026603; x=1789562603; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=aImNmXjsN2O2aGFxgJn2xM8g3wIE4iAJiPsnA1ZcdCs=; b=FrnXy6MVYrVPqAzu1bi8OTk4UFCXcYyOGhXbD3fNorX2wH/BlfOsKpAV NEgakyaf8Vjm6lQnuVhU8xZ9YlodweRdzvEqzXT3ZZUsoerAvxJ8v9JXR l+24/dqUquPySm8YPLRq986raBtFVMFcE3pLdKEs/iLe32GDXksb0312q rHwM7CHpcQGqDTVW9bPJi29Vx8NC3cYdH8e53+ycJYCpZhj8XKNTI5gv4 1U3OZR7oJo4F95m7rEOTKlOQinOBY/crEWu0gtfapByTOpJSLse8iZASw RuKt7AKPlG0YUbglOJuulYQZxiYqRn5YP8dS8WMEDSRzOWi28SyZSL0Jz A==; X-CSE-ConnectionGUID: 0HbWdJhbRtGbktWnr0+epQ== X-CSE-MsgGUID: tvRztKeLQIW8ltphVlNwBw== X-IronPort-AV: E=McAfee;i="6800,10657,11554"; a="85742004" X-IronPort-AV: E=Sophos;i="6.18,269,1751266800"; d="scan'208";a="85742004" Received: from orviesa006.jf.intel.com ([10.64.159.146]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Sep 2025 05:43:23 -0700 X-CSE-ConnectionGUID: FLW3iRpvRQOWzKNrB2aRig== X-CSE-MsgGUID: 4Yb2Ds/sQripu548mqWIhw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.18,269,1751266800"; d="scan'208";a="174043163" Received: from gklab-kleszczy-dev.igk.intel.com ([10.102.25.215]) by orviesa006.jf.intel.com with ESMTP; 16 Sep 2025 05:43:20 -0700 From: Konrad Leszczynski To: davem@davemloft.net, andrew+netdev@lunn.ch, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, cezary.rojewski@intel.com, sebastian.basierski@intel.com, Piotr Warpechowski , Karol Jurczenia , Konrad Leszczynski Subject: [PATCH net-next v3 1/3] net: stmmac: enhance VLAN protocol detection for GRO Date: Tue, 16 Sep 2025 14:48:06 +0200 Message-Id: <20250916124808.218514-2-konrad.leszczynski@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250916124808.218514-1-konrad.leszczynski@intel.com> References: <20250916124808.218514-1-konrad.leszczynski@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Piotr Warpechowski Enhance protocol extraction in stmmac_has_ip_ethertype() by introducing MAC offset parameter and changing: __vlan_get_protocol() -> __vlan_get_protocol_offset() Add correct header length for VLAN tags, which enable Generic Receive Offload (GRO) in VLAN. Co-developed-by: Karol Jurczenia Signed-off-by: Karol Jurczenia Reviewed-by: Konrad Leszczynski Reviewed-by: Sebastian Basierski Reviewed-by: Cezary Rojewski Signed-off-by: Piotr Warpechowski --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/ne= t/ethernet/stmicro/stmmac/stmmac_main.c index fa3d26c28502..4df967500cd3 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -4566,13 +4566,14 @@ static netdev_tx_t stmmac_tso_xmit(struct sk_buff *= skb, struct net_device *dev) */ static bool stmmac_has_ip_ethertype(struct sk_buff *skb) { - int depth =3D 0; + int depth =3D 0, hlen; __be16 proto; =20 - proto =3D __vlan_get_protocol(skb, eth_header_parse_protocol(skb), - &depth); + proto =3D __vlan_get_protocol_offset(skb, skb->protocol, + skb_mac_offset(skb), &depth); + hlen =3D eth_type_vlan(skb->protocol) ? VLAN_ETH_HLEN : ETH_HLEN; =20 - return (depth <=3D ETH_HLEN) && + return (depth <=3D hlen) && (proto =3D=3D htons(ETH_P_IP) || proto =3D=3D htons(ETH_P_IPV6)); } =20 --=20 2.34.1 From nobody Thu Oct 2 13:07:18 2025 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ECC91312803; Tue, 16 Sep 2025 12:43:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.7 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758026607; cv=none; b=P1dR3NMkpJ/kznK/AvVMfV+ikY+fOv6goyWSwR4a5Vw/aSbGZTNg7v325SycHc5kg5ZEpTYQz69S6N2V57vm4bFJ9IpIPb0RIx3F6kOnGyYfjke6pjE0JZ1/P1+aN0T0rJMF2O31/2RXIPZbIBAVgX1P2ngDMwt2DxT6KHycg2E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758026607; c=relaxed/simple; bh=UBeaTW5bPgKgCAO9klClr9Ovr3SEB93RRpqtB4yjVRA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=a99FkHoW/u5tNwPlfmnUrqKdyoJI0376qR5x6T5dVte1JB+I0UX1awgrVo3+VVxknunw4PE8eAg8vkj3oSjTHOEHNajPMXwTQPYsGczp9NvSc2TQEs8S1vj0KefDkITEDP0ium1IPp59nQNPQveeA8fE7zQYOzUbr11569ebLrk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=gockighc; arc=none smtp.client-ip=192.198.163.7 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="gockighc" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1758026606; x=1789562606; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=UBeaTW5bPgKgCAO9klClr9Ovr3SEB93RRpqtB4yjVRA=; b=gockighckGQa46zUxAHdMOPszgta1Avh0pLeG9Yahmt/o4KFWMrxW277 RgIaymePREtSLWe/BCUr76+X/xJo6bduS9GfIr3mWiKu7dD/miLEhF4OI LDR+Zn1KMfH7BYkMR9PKMtcXcg6+plG4anreTLH9yxEqkGh74ZOIJhziw VZY73MG/5DQR2EweULvZlXmjfhNSIiMw2CNH5DH/Q6A0lQLm+LDlcIrMl UEoW5930vcn23cOVXM93fTdVkoauZykqI07r0NhkWkrmUdXG7eP3Oeuwg LdwMtmuUqw1c9qTONTgjYEO6EnWvhLnS4fB5FqPfKkzcexezogEKcYliG g==; X-CSE-ConnectionGUID: IWtEQECOQN6MOlLXY6R66g== X-CSE-MsgGUID: whqci1nvRCKslJoY9ZWSeQ== X-IronPort-AV: E=McAfee;i="6800,10657,11554"; a="85742011" X-IronPort-AV: E=Sophos;i="6.18,269,1751266800"; d="scan'208";a="85742011" Received: from orviesa006.jf.intel.com ([10.64.159.146]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Sep 2025 05:43:26 -0700 X-CSE-ConnectionGUID: 1I3pkkqbR1KtjIWI0Xbl7w== X-CSE-MsgGUID: Bhr4bVh4QiOryoEics6rsw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.18,269,1751266800"; d="scan'208";a="174043173" Received: from gklab-kleszczy-dev.igk.intel.com ([10.102.25.215]) by orviesa006.jf.intel.com with ESMTP; 16 Sep 2025 05:43:23 -0700 From: Konrad Leszczynski To: davem@davemloft.net, andrew+netdev@lunn.ch, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, cezary.rojewski@intel.com, sebastian.basierski@intel.com, Karol Jurczenia , Konrad Leszczynski Subject: [PATCH net-next v3 2/3] net: stmmac: add TC flower filter support for IP EtherType Date: Tue, 16 Sep 2025 14:48:07 +0200 Message-Id: <20250916124808.218514-3-konrad.leszczynski@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250916124808.218514-1-konrad.leszczynski@intel.com> References: <20250916124808.218514-1-konrad.leszczynski@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Karol Jurczenia Add missing Traffic Control (TC) offload for flower filters matching the IP EtherType (ETH_P_IP). Reviewed-by: Konrad Leszczynski Reviewed-by: Sebastian Basierski Reviewed-by: Cezary Rojewski Signed-off-by: Karol Jurczenia --- drivers/net/ethernet/stmicro/stmmac/stmmac.h | 1 + .../net/ethernet/stmicro/stmmac/stmmac_tc.c | 19 ++++++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/eth= ernet/stmicro/stmmac/stmmac.h index 78d6b3737a26..77f900a328aa 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h @@ -206,6 +206,7 @@ enum stmmac_rfs_type { STMMAC_RFS_T_VLAN, STMMAC_RFS_T_LLDP, STMMAC_RFS_T_1588, + STMMAC_RFS_T_IP, STMMAC_RFS_T_MAX, }; =20 diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c b/drivers/net/= ethernet/stmicro/stmmac/stmmac_tc.c index 694d6ee14381..c5577652d6ed 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c @@ -239,6 +239,7 @@ static int tc_rfs_init(struct stmmac_priv *priv) priv->rfs_entries_max[STMMAC_RFS_T_VLAN] =3D 8; priv->rfs_entries_max[STMMAC_RFS_T_LLDP] =3D 1; priv->rfs_entries_max[STMMAC_RFS_T_1588] =3D 1; + priv->rfs_entries_max[STMMAC_RFS_T_IP] =3D 32; =20 for (i =3D 0; i < STMMAC_RFS_T_MAX; i++) priv->rfs_entries_total +=3D priv->rfs_entries_max[i]; @@ -777,6 +778,17 @@ static int tc_add_ethtype_flow(struct stmmac_priv *pri= v, stmmac_rx_queue_routing(priv, priv->hw, PACKET_PTPQ, tc); break; + case ETH_P_IP: + if (priv->rfs_entries_cnt[STMMAC_RFS_T_IP] >=3D + priv->rfs_entries_max[STMMAC_RFS_T_IP]) + return -ENOENT; + + entry->type =3D STMMAC_RFS_T_IP; + priv->rfs_entries_cnt[STMMAC_RFS_T_IP]++; + + stmmac_rx_queue_routing(priv, priv->hw, + PACKET_UPQ, tc); + break; default: netdev_err(priv->dev, "EthType(0x%x) is not supported", etype); return -EINVAL; @@ -800,7 +812,7 @@ static int tc_del_ethtype_flow(struct stmmac_priv *priv, =20 if (!entry || !entry->in_use || entry->type < STMMAC_RFS_T_LLDP || - entry->type > STMMAC_RFS_T_1588) + entry->type > STMMAC_RFS_T_IP) return -ENOENT; =20 switch (entry->etype) { @@ -814,6 +826,11 @@ static int tc_del_ethtype_flow(struct stmmac_priv *pri= v, PACKET_PTPQ, 0); priv->rfs_entries_cnt[STMMAC_RFS_T_1588]--; break; + case ETH_P_IP: + stmmac_rx_queue_routing(priv, priv->hw, + PACKET_UPQ, 0); + priv->rfs_entries_cnt[STMMAC_RFS_T_IP]--; + break; default: netdev_err(priv->dev, "EthType(0x%x) is not supported", entry->etype); --=20 2.34.1 From nobody Thu Oct 2 13:07:18 2025 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EA825313290; Tue, 16 Sep 2025 12:43:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.7 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758026610; cv=none; b=QjFCK04+3ER4N6mu9AbPUFX0yNnH7Z78OQIfMRu7sNYA/okEfBIuL+0+quEZo6RdGLEBATMVB4+SyLvAWRbK3UY8WMBCmOL+keOk+olaFR0W13NGg8e0wO43wDza35M0NAIGJLHUXFJtks2w3uHV3GT90oLy+HruC7mXYa8uGrc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758026610; c=relaxed/simple; bh=Wa+D4zEpH275liIM4B6G5Lb4l1qqCmqJOKkaA+4OV4M=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=PIhpcERBSSoTF5k/Hat5ekhTN05MLzfs+ceImW/Smr6Lj43kTU7YX/PpQc6+e1TB43QST2OHlk7nNkvS9m+Px4i85moyoY2at/PZApWezjoA+FNYxkGrRSTvoTKaZVXLBF/DHYG3tIXo/+NThlqYNNezgTrspNtw3d7R2QOxCvw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=Fphd4eqs; arc=none smtp.client-ip=192.198.163.7 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="Fphd4eqs" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1758026609; x=1789562609; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Wa+D4zEpH275liIM4B6G5Lb4l1qqCmqJOKkaA+4OV4M=; b=Fphd4eqshKO50e4ky5EZ4hegpYE8ejDCLLf3H/c56/+CE8OPzoy6Un+b V2L7IU+gC58NprEDfN5CskzjGBIhJursnS9IG8RqexZHZYiuLVBGbtFC4 9ti9cY6OwCKGoLsmok9wT39+QxKj4D1Q+OcYleiKxgboX+6v7hAwt2oqm 90W9YrcM6La3axaEfozJJkPHCb8I6/+SPAA/p0Rt8W0dVaDHvvdOPtbw5 SQn71XldzfD1J8Fzu8/SHOXj664rtgi48XgDxtNi1YSXQotqmwrVRDHxC ji9HC5fuiEJhO9n+dJczPh+neoNEl6/wSHh+VYXG0/FhzCffWny9rbX7G g==; X-CSE-ConnectionGUID: dmMGfeelRvG/cmOvrXBB5Q== X-CSE-MsgGUID: CYxV1/T5TP6tO9pwspDF6Q== X-IronPort-AV: E=McAfee;i="6800,10657,11554"; a="85742019" X-IronPort-AV: E=Sophos;i="6.18,269,1751266800"; d="scan'208";a="85742019" Received: from orviesa006.jf.intel.com ([10.64.159.146]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Sep 2025 05:43:29 -0700 X-CSE-ConnectionGUID: iH7Kw7R5TCOWhS44awOe2g== X-CSE-MsgGUID: eVLORkypQne/Xe23u3KA8Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.18,269,1751266800"; d="scan'208";a="174043191" Received: from gklab-kleszczy-dev.igk.intel.com ([10.102.25.215]) by orviesa006.jf.intel.com with ESMTP; 16 Sep 2025 05:43:26 -0700 From: Konrad Leszczynski To: davem@davemloft.net, andrew+netdev@lunn.ch, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, cezary.rojewski@intel.com, sebastian.basierski@intel.com, Piotr Warpechowski , Konrad Leszczynski Subject: [PATCH net-next v3 3/3] net: stmmac: correct Tx descriptors debugfs prints Date: Tue, 16 Sep 2025 14:48:08 +0200 Message-Id: <20250916124808.218514-4-konrad.leszczynski@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250916124808.218514-1-konrad.leszczynski@intel.com> References: <20250916124808.218514-1-konrad.leszczynski@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Piotr Warpechowski It was observed that extended descriptors are not printed out fully and enhanced descriptors are completely omitted in stmmac_rings_status_show(). Correct printing according to documentation and other existing prints in the driver. Reviewed-by: Konrad Leszczynski Reviewed-by: Sebastian Basierski Reviewed-by: Cezary Rojewski Signed-off-by: Piotr Warpechowski --- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 31 ++++++++++++++----- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/ne= t/ethernet/stmicro/stmmac/stmmac_main.c index 4df967500cd3..38f130cb0c9f 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -6355,14 +6355,25 @@ static void sysfs_display_ring(void *head, int size= , int extend_desc, desc_size =3D extend_desc ? sizeof(*ep) : sizeof(*p); for (i =3D 0; i < size; i++) { dma_addr =3D dma_phy_addr + i * desc_size; - seq_printf(seq, "%d [%pad]: 0x%x 0x%x 0x%x 0x%x\n", - i, &dma_addr, - le32_to_cpu(p->des0), le32_to_cpu(p->des1), - le32_to_cpu(p->des2), le32_to_cpu(p->des3)); - if (extend_desc) - p =3D &(++ep)->basic; - else + if (extend_desc) { + seq_printf(seq, "%d [%pad]: 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x\n", + i, &dma_addr, + le32_to_cpu(ep->basic.des0), + le32_to_cpu(ep->basic.des1), + le32_to_cpu(ep->basic.des2), + le32_to_cpu(ep->basic.des3), + le32_to_cpu(ep->des4), + le32_to_cpu(ep->des5), + le32_to_cpu(ep->des6), + le32_to_cpu(ep->des7)); + ep++; + } else { + seq_printf(seq, "%d [%pad]: 0x%x 0x%x 0x%x 0x%x\n", + i, &dma_addr, + le32_to_cpu(p->des0), le32_to_cpu(p->des1), + le32_to_cpu(p->des2), le32_to_cpu(p->des3)); p++; + } } } =20 @@ -6402,7 +6413,11 @@ static int stmmac_rings_status_show(struct seq_file = *seq, void *v) seq_printf(seq, "Extended descriptor ring:\n"); sysfs_display_ring((void *)tx_q->dma_etx, priv->dma_conf.dma_tx_size, 1, seq, tx_q->dma_tx_phy); - } else if (!(tx_q->tbs & STMMAC_TBS_AVAIL)) { + } else if (tx_q->tbs & STMMAC_TBS_AVAIL) { + seq_printf(seq, "Enhanced descriptor ring:\n"); + sysfs_display_ring((void *)tx_q->dma_entx, + priv->dma_conf.dma_tx_size, 1, seq, tx_q->dma_tx_phy); + } else { seq_printf(seq, "Descriptor ring:\n"); sysfs_display_ring((void *)tx_q->dma_tx, priv->dma_conf.dma_tx_size, 0, seq, tx_q->dma_tx_phy); --=20 2.34.1