From nobody Thu Sep 26 03:33:39 2024 X-Original-To: dev-commits-src-all@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 4XDfMR6kgPz5Y6Pc; Thu, 26 Sep 2024 03:33:39 +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 4XDfMR4Ss9z4XnT; Thu, 26 Sep 2024 03:33:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727321619; 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=o3I9Ym/HxY5BSeCGkWgZZ+qiskCV9urTE6psXI6s8oQ=; b=F4Covo4SibsrhezLHPZlca476gzXJoNEGI8Vt1CNBwCFFLCD1YHJDvaNR+9B6Kt/MyIKCN tCxJDOLoeXLb7YZBlzJBQnrkDhYST4J7Ux5nVldCPYlFhQBLEUEEYo4g2xJZ3bVl7n9T31 ydEpC3ivBdpSJ+3qG+NrJLJnzdlvS/4t/BokGGrw/6uYdF0FMNWSZ8LgJ6ZJS1LAdcEoBP mU63aLBtGjPwmI6M057OGbpKyVRmwG0dlVyIPbA47aqYDXeObWZAeALJ+6eid6JZeZFG3g VLEwGGTLNgyWANXcxOlXS/NHezSighkwM0PWBFowVT9pzNielF5xbYopU58JSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727321619; 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=o3I9Ym/HxY5BSeCGkWgZZ+qiskCV9urTE6psXI6s8oQ=; b=KQ5Nmnf3AYtOsBm6lij2H2ijr81VlCKV7eykf6TkJuvdZ+iy8MwO1uf7ObGlpcGFIAlfjr d21uGtv60vhN+FwTA7dFbX2M24qK87gPd96Iqm4GZHBLHlPRCzW5jqnUF99AGwcXrvtW78 oEkRzXk+fJ7ZxpminSx6fDTO9gXx1F6bTPo529Uugquh5Krn+2PY7P/4TGbVtqdrQUfQQ6 +zUcmQLz9qITlq6J8A2GS6EDgFa2JWzQ9S3moDM2TSC86+yU2vVoYwK2zbIldAIEfm3+Ny MS5REMX9aLbU8lHS9cGCkt5O068sDkGndRSJELXCcn9mvmjJ1I+HlsmmYcZnJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727321619; a=rsa-sha256; cv=none; b=ABReks4ahrELqYUzTRWOJGecT6HOgOYen8hpCoEyjQ7fsID5yES5KHKB9LIDX9u3BjCti/ gTzdu1xRKXpaPoDa0hy1zAzdho6Vc5DlmHrTEwm58b3VrlxvQOkt+cTOhgAdnQ4jL68TQZ 58O/X5d5IkoT4MfOVqsuUgktPFWErYjSzOBTdlzZAf9Tes8pcfMk1fTQUqpSoMyhuxMG7d ILvCzGuyZKjbfxIsxhH1l6S/I6XYklmMNElBbocyvucP00cdzMXzM7Gs9QgzglLsvwyCHS MBFnL9W4/gAiAmefZBAgt3JK8WPY7z7Y7CCe7k7yB+rYjQORATb+GN1TCDBKPA== 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 4XDfMR44M9zgq1; Thu, 26 Sep 2024 03:33:39 +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 48Q3Xdm1099178; Thu, 26 Sep 2024 03:33:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48Q3Xd8B099175; Thu, 26 Sep 2024 03:33:39 GMT (envelope-from git) Date: Thu, 26 Sep 2024 03:33:39 GMT Message-Id: <202409260333.48Q3Xd8B099175@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 0097d7ec6bc4 - stable/13 - ixgbe: fix PHY ID for X550 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 0097d7ec6bc46a441fb13b703c1ea0388d6033c8 Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=0097d7ec6bc46a441fb13b703c1ea0388d6033c8 commit 0097d7ec6bc46a441fb13b703c1ea0388d6033c8 Author: Radoslaw Tyl AuthorDate: 2024-09-19 20:42:14 +0000 Commit: Kevin Bowling CommitDate: 2024-09-26 03:32:48 +0000 ixgbe: fix PHY ID for X550 DPDK commit message net/ixgbe/base: fix PHY ID for X550 Function ixgbe_get_phy_type_from_id() for X550_PHY_ID2 and X550_PHY_ID3 always return ixgbe_phy_unknown instead of ixgbe_phy_aq because phy ID's last 4 bits are always masked, and should not be taken into account when selecting phy type. This patch adds default PHY ID for X550 devices with mask on last 4 bits (0xFFFFFFF0), and fixes the switch statement to use it. Fixes: 58ddc80 ("ixgbe/base: add new X550 PHY ids") Cc: stable@dpdk.org Signed-off-by: Radoslaw Tyl Reviewed-by: Piotr Skajewski Reviewed-by: Alice Michael Obtained from: DPDK (a9f5a3b) (cherry picked from commit 9b56dfd27c64fcaf2dfbaa1eb3e2bd2b163fa56c) --- sys/dev/ixgbe/ixgbe_phy.c | 3 +-- sys/dev/ixgbe/ixgbe_type.h | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/ixgbe/ixgbe_phy.c b/sys/dev/ixgbe/ixgbe_phy.c index f4bee6c34f53..00f396283879 100644 --- a/sys/dev/ixgbe/ixgbe_phy.c +++ b/sys/dev/ixgbe/ixgbe_phy.c @@ -462,8 +462,7 @@ enum ixgbe_phy_type ixgbe_get_phy_type_from_id(u32 phy_id) case TN1010_PHY_ID: phy_type = ixgbe_phy_tn; break; - case X550_PHY_ID2: - case X550_PHY_ID3: + case X550_PHY_ID: case X540_PHY_ID: phy_type = ixgbe_phy_aq; break; diff --git a/sys/dev/ixgbe/ixgbe_type.h b/sys/dev/ixgbe/ixgbe_type.h index deb68fa03312..1b447f42f17a 100644 --- a/sys/dev/ixgbe/ixgbe_type.h +++ b/sys/dev/ixgbe/ixgbe_type.h @@ -1696,6 +1696,7 @@ struct ixgbe_dmac_config { #define TN1010_PHY_ID 0x00A19410 #define TNX_FW_REV 0xB #define X540_PHY_ID 0x01540200 +#define X550_PHY_ID 0x01540220 #define X550_PHY_ID2 0x01540223 #define X550_PHY_ID3 0x01540221 #define X557_PHY_ID 0x01540240