Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/104953/?format=api
{ "id": 104953, "url": "http://patchwork.dpdk.org/api/patches/104953/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20211206221922.644187-3-stephend@silicom-usa.com/", "project": { "id": 1, "url": "http://patchwork.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20211206221922.644187-3-stephend@silicom-usa.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20211206221922.644187-3-stephend@silicom-usa.com", "date": "2021-12-06T22:19:16", "name": "[v2,2/7] net/ixgbe: Add ixgbe_check_sfp_cage() for testing state of PRSNT# signal", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "1376471e1d9b9b0b7380dcdd57c75acacc86a27f", "submitter": { "id": 2437, "url": "http://patchwork.dpdk.org/api/people/2437/?format=api", "name": "Stephen Douthit", "email": "stephend@silicom-usa.com" }, "delegate": { "id": 1540, "url": "http://patchwork.dpdk.org/api/users/1540/?format=api", "username": "qzhan15", "first_name": "Qi", "last_name": "Zhang", "email": "qi.z.zhang@intel.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20211206221922.644187-3-stephend@silicom-usa.com/mbox/", "series": [ { "id": 20881, "url": "http://patchwork.dpdk.org/api/series/20881/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=20881", "date": "2021-12-06T22:19:14", "name": "ixgbe SFP handling fixes", "version": 2, "mbox": "http://patchwork.dpdk.org/series/20881/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/104953/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/104953/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id CBA57A034F;\n\tMon, 6 Dec 2021 23:20:01 +0100 (CET)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 1C9184120A;\n\tMon, 6 Dec 2021 23:19:53 +0100 (CET)", "from EUR01-HE1-obe.outbound.protection.outlook.com\n (mail-eopbgr130125.outbound.protection.outlook.com [40.107.13.125])\n by mails.dpdk.org (Postfix) with ESMTP id 8053141169;\n Mon, 6 Dec 2021 23:19:50 +0100 (CET)", "from AM0PR04MB4083.eurprd04.prod.outlook.com (2603:10a6:208:64::29)\n by AM0PR04MB6724.eurprd04.prod.outlook.com (2603:10a6:208:17a::22)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.11; Mon, 6 Dec\n 2021 22:19:49 +0000", "from AM0PR04MB4083.eurprd04.prod.outlook.com\n ([fe80::f4db:d40d:a746:7bfc]) by AM0PR04MB4083.eurprd04.prod.outlook.com\n ([fe80::f4db:d40d:a746:7bfc%7]) with mapi id 15.20.4755.022; Mon, 6 Dec 2021\n 22:19:49 +0000", "from lappy.adi.eng (173.14.114.227) by\n MN2PR20CA0031.namprd20.prod.outlook.com (2603:10b6:208:e8::44) with Microsoft\n SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n 15.20.4755.19 via Frontend Transport; Mon, 6 Dec 2021 22:19:48 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=kxz07tJ/RENyGrw4imK46q/dmtr5ikGCUhA3KNxudLbxPgY6mhya76eqqJu/aZ9L1QPc72B3P8iLUW7srP/pxzQh31oZoR8gee9nvSf7wOyAii0JH0qPM26IipFhLXkoyvoTdcpgmXa0kblXXan0A6/7QY8r17e98e0q/OzUZukc8jIIsHXFl2+fRHWamaAzYg0gutpySIkTGkxU4Lwz4vFSju6K10+i6wK3Wl8UqwVT9VfoXGCRJEho4K+SM+ZRi9y+a9M7pGPPvfHNwiU2mOyXoNoGXoNbVLGDyZJilYZm6+fM9Tf/cTWRb9xrUO6ebJXauriPnbxeEP5LqCbwhQ==", "ARC-Message-Signature": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;\n s=arcselector9901;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1;\n bh=U1ToY7tooyrlQKzotnHseoh8V/mRmx0gxOiB9eHyvhc=;\n b=jqKdxOWyNaSQiiRiUiQ9bMSbjTDPF9pOoYEnph+iFUfmEqU9Lgc6v+SSvr3ypOq+sp8fKyqF8xg2UQISWy7W40TVTkfZuG4e3GSb3NzVl4dbYPA/DkCPpIANNNh5sqmDoxQSLN62l97poLc6QOFR8qUFsLX5iRauaKC7hAkVumyLOsNBnrpiS6ej0FAYVo/0T3freDanRJ97PW3e33Glr+toYLUjdwCKNX/fI6K9bhGwTVbH8JnaoaOO4FENG2kdanPDa0d7w4nFXYxwCm4gnmDAFYSzGb+LfLvOMeWJ608eDlj+daV54WVu7Kac7MF9Dy0+5OpE9Hge/ajnxyqqqQ==", "ARC-Authentication-Results": "i=1; mx.microsoft.com 1; spf=pass\n smtp.mailfrom=silicom-usa.com; dmarc=pass action=none\n header.from=silicom-usa.com; dkim=pass header.d=silicom-usa.com; arc=none", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=SILICOMLTD.onmicrosoft.com; s=selector2-SILICOMLTD-onmicrosoft-com;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=U1ToY7tooyrlQKzotnHseoh8V/mRmx0gxOiB9eHyvhc=;\n b=KqtKhaI1Dvyl6hLu2Euz2CfpbWB7b3q93wXcn09ai9Wcqo/zxC8GWC9tjYgVdxW63NekKDeSVZuPF/TCedZnicYoeRWUtsVdNOgMvFI6RyxIeyPST8JUnuV/PLUaWvF3Be8KqoJYM733tHSLw28Xy/OXak/vtJwbFUyKFrsvAGk=", "Authentication-Results": "dkim=none (message not signed)\n header.d=none;dmarc=none action=none header.from=silicom-usa.com;", "From": "Stephen Douthit <stephend@silicom-usa.com>", "To": "Haiyue Wang <haiyue.wang@intel.com>, Xiao Wang <xiao.w.wang@intel.com>,\n Wenzhuo Lu <wenzhuo.lu@intel.com>", "Cc": "dev@dpdk.org, wenw@silicom-usa.com,\n Stephen Douthit <stephend@silicom-usa.com>, stable@dpdk.org", "Subject": "[PATCH v2 2/7] net/ixgbe: Add ixgbe_check_sfp_cage() for testing\n state of PRSNT# signal", "Date": "Mon, 6 Dec 2021 17:19:16 -0500", "Message-Id": "<20211206221922.644187-3-stephend@silicom-usa.com>", "X-Mailer": "git-send-email 2.31.1", "In-Reply-To": "<20211206221922.644187-1-stephend@silicom-usa.com>", "References": "<20211206221922.644187-1-stephend@silicom-usa.com>", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-ClientProxiedBy": "MN2PR20CA0031.namprd20.prod.outlook.com\n (2603:10b6:208:e8::44) To AM0PR04MB4083.eurprd04.prod.outlook.com\n (2603:10a6:208:64::29)", "MIME-Version": "1.0", "X-MS-PublicTrafficType": "Email", "X-MS-Office365-Filtering-Correlation-Id": "6bbebfd3-278f-4f15-f3f3-08d9b9068475", "X-MS-TrafficTypeDiagnostic": "AM0PR04MB6724:EE_", "X-Microsoft-Antispam-PRVS": "\n <AM0PR04MB6724589EA296CB8E8212D687946D9@AM0PR04MB6724.eurprd04.prod.outlook.com>", "X-MS-Oob-TLC-OOBClassifiers": "OLM:8273;", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n fQG0hPMTI0CQmAOFp52lQw+8sD37dFZjOEznASy3H3kbWBVzdIctTUfzv9wj0pRlTQrwZnEPYItXlkJVvpGnInBEiafM2YyYv24C2B7rbU4K76JQ0ZTat7eGX9kXzadPB6qIWgJMBKEHxsjonNFSmNcNOUoPPc5RVCFgtTqVzyEa8k2i5ndMeARb28d56Zj/7wHVImCd80g/Z0RW8I6av1XsltU6n10+s0HpnPsBnJyvAocViOb5aeD1FDoF8QujMitCpZXD+S2EB2PD317Dksv70UhSxuOT6PODF8zqBIsoQlKj1WBk/Xffhm3EsKtpkf38YaTYO8w61t/e00nOTqPAmrifEDKvBpvrrdSZMmHhZAfKhJG2ZjuWTDekJc+1nLnSUmH0lc9CMnu4dDGxj8N/lorPXnT1MIicRrL+zkbM1QGVUoaw0Wg9qUx5q/kGGzAXfeJZJNQJAiKOVfiEYIem4wy7nXugs/wR0iGQkxkUKX5tArwXwKbPxUsFKmFc2Eu9EEenPoYNx+J+O/U6ls7+DS/p2f0WH7gU2LxTPRXSm/wAbVUnxyqbnBzLPsBFbJBvGLkQRXGrtR27NkpFdKM0W5Mw2kKZ1MfekuNy7Zi4nGc76azZJ3nNM14NrcWTjPeMsgvKoeJtUbhQPzBS5F3W9q0JmSdETForQVLkoPZyFpOq3WvPLBkhrqpJw1yuHwDHsXev5xb/Ks1PGby14Q==", "X-Forefront-Antispam-Report": "CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;\n IPV:NLI; SFV:NSPM; H:AM0PR04MB4083.eurprd04.prod.outlook.com; PTR:; CAT:NONE;\n SFS:(4636009)(366004)(4326008)(5660300002)(2906002)(83380400001)(508600001)(38100700002)(38350700002)(956004)(6512007)(6486002)(316002)(36756003)(110136005)(8936002)(26005)(1076003)(52116002)(2616005)(186003)(66476007)(6666004)(6506007)(66556008)(66946007)(8676002)(86362001);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "\n Oe7Ecy0B+28pUIFdiITC9+WrSx40+YDaV6KzLXRCPBfRsSJ0v3DrfhTU7lvYJnordX5ttojrrGV/xEfwvTdh7TAZ0hP3tOqV6d9UEdgSs1zVCSesa1ycpCI3QLhnQAioCQvgtTcnuBQ+esV0ykyPDBqcPLKeiOSfdVelbTltMbZeDs7jVVyC7NCC1Pe7Ez1LVMdr9C12SdEwdN9fRBLHqMAnmELPM84WKsksXywo75+yRhfU9ndl/CNkc9l7H56wvM1PPLLUMi6J3cbd8AuPvtr0urRI1E24sh3P0eUqAorhPvqijjGvYdLXn9bIU96Ad9vlv+GutMk2gggBepTmVkwov3ZPNJokfWejjc9cvztM0KdNKEl3W5vQ+skZzWs0WX0klYp0Y9eXVhh3N1BkL9CqmYKCfUCZhM7onelwOlXscajg5+r733ucnx979YplGJoR+bL+g5m0XCLp6FbOAfWi0GJVhCISz2BxSo2Z+A/68XARQEmqgMQK8kLkjh2NWapCkm3t3mpTglj+hiI8+7GY5c3wBq+QN5vpRpTYe8KLxfjYwJP5hRNbs13X5X2tJNYyjUT12Zzn5kQcu9DWcBZleGSDC4cGE0iVzgOWDr6GI+6kUAzSwSASNzPx3pyfOd9kanRuB4OPGzHiMjnVBsilBOHTuvHJ7kEXGFMihJP/wYKvEQjRryOfoHyX/Z3F/v/m2xIx92yxE6jJfZDZP6YHDcKGEFeByT48ojLox1V7jXo6iqwBnW6hGJ/ogYT7kIXww9t8/vx5mHJ8QQXcei2yxVYEtvbgAZNkzxLKA2FJR3dxoFsJJHUpCy/3s8N6t1HnY5xe2WDZjtQSWbXHqSbL3RviWvjaQd1byg5X0QplVVH9hSypum0x0/L70ArAt6lUUaii4weE4Yi8kM9mPj2Drh0EGurBrjTLq/W3r/IdUp+P/Xnieb0e3IAsAjeZ8PB92FVql0jKI7X+8sE9c2wq8YpHMM19uuz2o1vPijZFpHXW0i82VjqJppwRNJfXCRt10b+Qis0JLuqAqLMyTkP+HaTZAysAbWSexUvnD88b/yHo2bQz1UD2pukuKIrmFEGcArNb1+OXaJzdIVK9D9j1E+7lU2XRhFwIzGJA6D1TS3nQraaHQnRE/Myb2uP20YuYLxuqlDKidjq9wD+kz/exugm4q4gPLr/rGX8WMBrMMsvyWDYJZFU1C+PIKrsBofQynoAWIApgznh3+ORa985CR5sjDsfmFN4eNBd1wCZ9cgnqCDHHjDoXG+VmW6aGrAbvF9Mfku6T0rtPeAwT0jKA9QdWy5fwNMLLKJ7pVlhrLI3+IDXy0ktoOxz/NJC80tBQt+J2sXNu7V3rTvjz92nPX+EJUcOinJbGrUWVv/EV/DNNFrbdbWNiiJXfenL66057leewMbR8E3gINlEOnUunWOOGxyDjsyXmvL1Q3S6E3kKluEqp2OiVTnXT3f7ZlDosqm6JdHhw8irlqztNLw1ayuc5DMqr/Rad+6S4RDGKSQ6n4/03QxXBCXlFZVrFOWzI4Rk4E8uWWp2mUbWL0wSVKt7VV3phqt8cBD8D4RJHFUQ1FUVGsmyZprAEPklEM9EnvSbKV+UATz2Zt+i/Rp0lB2JDTk1iDrtse0F7OzEqqmXtCQkIP62oxkR07zgoqxuT1+rTtOLkhFkzOH+aEg==", "X-OriginatorOrg": "silicom-usa.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 6bbebfd3-278f-4f15-f3f3-08d9b9068475", "X-MS-Exchange-CrossTenant-AuthSource": "AM0PR04MB4083.eurprd04.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Internal", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "06 Dec 2021 22:19:49.4609 (UTC)", "X-MS-Exchange-CrossTenant-FromEntityHeader": "Hosted", "X-MS-Exchange-CrossTenant-Id": "c9e326d8-ce47-4930-8612-cc99d3c87ad1", "X-MS-Exchange-CrossTenant-MailboxType": "HOSTED", "X-MS-Exchange-CrossTenant-UserPrincipalName": "\n Yd64HONSVoqcuXkQ7FEXqiNAiDUYGk66eS1uuAGjyfe7sTkll3OR4y7HG4nm/OpHazKlYt85R9fUIrjcsCDd2KVL4xNVBjIlR5/OGaijnA0=", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "AM0PR04MB6724", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "Refactor the SFP check code from ixgbe_check_mac_link_generic into its own\nfunction.\n\nNote that the SFP present status was inverted for the X550EM family of\ndevices, where SDP0 represents the active low PRSNT# signal from the cage.\n\nCall the new function in ixgbe_identify_module_generic() to short circuit\nthe I2C polling and greatly speed things up for devices we know are\nabsent.\n\nFixes: dd3a93cf5a2 (\"net/ixgbe/base: bypass checking link for crosstalk\")\nCc: stable@dpdk.org\n\nSigned-off-by: Stephen Douthit <stephend@silicom-usa.com>\n---\n drivers/net/ixgbe/base/ixgbe_common.c | 60 +++++++++++++++++++--------\n drivers/net/ixgbe/base/ixgbe_common.h | 8 ++++\n drivers/net/ixgbe/base/ixgbe_phy.c | 8 ++++\n 3 files changed, 58 insertions(+), 18 deletions(-)", "diff": "diff --git a/drivers/net/ixgbe/base/ixgbe_common.c b/drivers/net/ixgbe/base/ixgbe_common.c\nindex aa843bd5c4..2764cf7cf1 100644\n--- a/drivers/net/ixgbe/base/ixgbe_common.c\n+++ b/drivers/net/ixgbe/base/ixgbe_common.c\n@@ -4124,6 +4124,45 @@ static bool ixgbe_need_crosstalk_fix(struct ixgbe_hw *hw)\n \treturn true;\n }\n \n+/**\n+ * ixgbe_check_sfp_cage - Find present status of SFP module\n+ * @hw: pointer to hardware structure\n+ *\n+ * Find if a SFP module is present and if this device supports SFPs\n+ **/\n+enum ixgbe_sfp_cage_status ixgbe_check_sfp_cage(struct ixgbe_hw *hw)\n+{\n+\tenum ixgbe_sfp_cage_status status;\n+\n+\t/* If we're not a fiber/fiber_qsfp, no cage to check */\n+\tswitch (hw->mac.ops.get_media_type(hw)) {\n+\tcase ixgbe_media_type_fiber:\n+\tcase ixgbe_media_type_fiber_qsfp:\n+\t\tbreak;\n+\tdefault:\n+\t\treturn IXGBE_SFP_CAGE_NOCAGE;\n+\t}\n+\n+\tswitch (hw->mac.type) {\n+\tcase ixgbe_mac_82599EB:\n+\t\tstatus = !!(IXGBE_READ_REG(hw, IXGBE_ESDP) &\n+\t\t\t IXGBE_ESDP_SDP2);\n+\t\tbreak;\n+\tcase ixgbe_mac_X550EM_x:\n+\tcase ixgbe_mac_X550EM_a:\n+\t\t/* SDP0 is the active low signal PRSNT#, so invert this */\n+\t\tstatus = !(IXGBE_READ_REG(hw, IXGBE_ESDP) &\n+\t\t\t\t IXGBE_ESDP_SDP0);\n+\t\tbreak;\n+\tdefault:\n+\t\t/* Don't know how to check this device type yet */\n+\t\tstatus = IXGBE_SFP_CAGE_UNKNOWN;\n+\t\tbreak;\n+\t}\n+\n+\treturn status;\n+}\n+\n /**\n * ixgbe_check_mac_link_generic - Determine link and speed status\n * @hw: pointer to hardware structure\n@@ -4145,25 +4184,10 @@ s32 ixgbe_check_mac_link_generic(struct ixgbe_hw *hw, ixgbe_link_speed *speed,\n \t * the SFP+ cage is full.\n \t */\n \tif (ixgbe_need_crosstalk_fix(hw)) {\n-\t\tu32 sfp_cage_full;\n-\n-\t\tswitch (hw->mac.type) {\n-\t\tcase ixgbe_mac_82599EB:\n-\t\t\tsfp_cage_full = IXGBE_READ_REG(hw, IXGBE_ESDP) &\n-\t\t\t\t\tIXGBE_ESDP_SDP2;\n-\t\t\tbreak;\n-\t\tcase ixgbe_mac_X550EM_x:\n-\t\tcase ixgbe_mac_X550EM_a:\n-\t\t\tsfp_cage_full = IXGBE_READ_REG(hw, IXGBE_ESDP) &\n-\t\t\t\t\tIXGBE_ESDP_SDP0;\n-\t\t\tbreak;\n-\t\tdefault:\n-\t\t\t/* sanity check - No SFP+ devices here */\n-\t\t\tsfp_cage_full = false;\n-\t\t\tbreak;\n-\t\t}\n+\t\tenum ixgbe_sfp_cage_status sfp_cage_status;\n \n-\t\tif (!sfp_cage_full) {\n+\t\tsfp_cage_status = ixgbe_check_sfp_cage(hw);\n+\t\tif (sfp_cage_status != IXGBE_SFP_CAGE_FULL) {\n \t\t\t*link_up = false;\n \t\t\t*speed = IXGBE_LINK_SPEED_UNKNOWN;\n \t\t\treturn IXGBE_SUCCESS;\ndiff --git a/drivers/net/ixgbe/base/ixgbe_common.h b/drivers/net/ixgbe/base/ixgbe_common.h\nindex 5bdb484407..30db9a08c4 100644\n--- a/drivers/net/ixgbe/base/ixgbe_common.h\n+++ b/drivers/net/ixgbe/base/ixgbe_common.h\n@@ -112,6 +112,14 @@ s32 ixgbe_set_vlvf_generic(struct ixgbe_hw *hw, u32 vlan, u32 vind,\n s32 ixgbe_clear_vfta_generic(struct ixgbe_hw *hw);\n s32 ixgbe_find_vlvf_slot(struct ixgbe_hw *hw, u32 vlan, bool vlvf_bypass);\n \n+enum ixgbe_sfp_cage_status {\n+\tIXGBE_SFP_CAGE_EMPTY = 0,\n+\tIXGBE_SFP_CAGE_FULL,\n+\tIXGBE_SFP_CAGE_UNKNOWN = -1,\n+\tIXGBE_SFP_CAGE_NOCAGE = -2,\n+};\n+enum ixgbe_sfp_cage_status ixgbe_check_sfp_cage(struct ixgbe_hw *hw);\n+\n s32 ixgbe_check_mac_link_generic(struct ixgbe_hw *hw,\n \t\t\t ixgbe_link_speed *speed,\n \t\t\t bool *link_up, bool link_up_wait_to_complete);\ndiff --git a/drivers/net/ixgbe/base/ixgbe_phy.c b/drivers/net/ixgbe/base/ixgbe_phy.c\nindex 8d4d9bbfef..d8d51d2c3f 100644\n--- a/drivers/net/ixgbe/base/ixgbe_phy.c\n+++ b/drivers/net/ixgbe/base/ixgbe_phy.c\n@@ -1228,9 +1228,17 @@ s32 ixgbe_reset_phy_nl(struct ixgbe_hw *hw)\n s32 ixgbe_identify_module_generic(struct ixgbe_hw *hw)\n {\n \ts32 status = IXGBE_ERR_SFP_NOT_PRESENT;\n+\tenum ixgbe_sfp_cage_status sfp_cage_status;\n \n \tDEBUGFUNC(\"ixgbe_identify_module_generic\");\n \n+\tsfp_cage_status = ixgbe_check_sfp_cage(hw);\n+\tif (sfp_cage_status == IXGBE_SFP_CAGE_EMPTY ||\n+\t sfp_cage_status == IXGBE_SFP_CAGE_NOCAGE) {\n+\t\thw->phy.sfp_type = ixgbe_sfp_type_not_present;\n+\t\treturn status;\n+\t}\n+\n \tswitch (hw->mac.ops.get_media_type(hw)) {\n \tcase ixgbe_media_type_fiber:\n \t\tstatus = ixgbe_identify_sfp_module_generic(hw);\n", "prefixes": [ "v2", "2/7" ] }