From patchwork Thu Feb 9 18:32:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Reed X-Patchwork-Id: 1740090 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=gioj5mS9; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PCQTP1f2rz23yC for ; Fri, 10 Feb 2023 05:32:40 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1pQBih-0000zp-Qa; Thu, 09 Feb 2023 18:32:31 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1pQBif-0000zI-O8 for kernel-team@lists.ubuntu.com; Thu, 09 Feb 2023 18:32:29 +0000 Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 413E53F126 for ; Thu, 9 Feb 2023 18:32:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1675967549; bh=+7dd/rep4/cJJBsGNHlTpUg0LQ5baHrSb5kxkrjxLAQ=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=gioj5mS9IA6ue89OffN/QNwoB+0HrlVwKGyUWNUiH6XDGi0G20bNOxptQcGNcIFdZ Rv50rVXizWIZ71ItwJUUC5JnrEPa+00TLMvc7OlnyFohkwkGaIdsyfacnxB7IgBU19 0dL3zkHHt7akS3DY6X7WJ6PjPAz5o9NcPbqqexjaNjbTFQRbrmHmwbwCOtCKmo5v+B g9eaG3Q+cVm52ywrDfc5CtSDNqi+OKvFXg5/w6huMiahrSatIq9/VOY1WeJyVg1jU5 HXT0+pedGOF37YRUw/G5GP69FHNuMlpRh+vOKIUXxcJODx2lnaZSKXO2AQBfEWate1 awCGTxw6QIxtw== Received: by mail-qt1-f199.google.com with SMTP id l3-20020a05622a174300b003b9b6101f65so1606583qtk.11 for ; Thu, 09 Feb 2023 10:32:29 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+7dd/rep4/cJJBsGNHlTpUg0LQ5baHrSb5kxkrjxLAQ=; b=bXQ3vYNvzHGxU3gNTiiAMJDmsR3x5RKnRe0nOnjaaRREGfowIPFEwPtztnamJ48uXF FU/B0BxAgn2SsyKAFOIh3gDGLe+F7K+C5cDdHFIZ10h9jwEpKtn2wQlYb1zQhQS2+dM5 wUdCU4Y+wZ9YR8eq1DMsOXnwzblFE+Y+9iHo6hZdOA3THFaDASMsxlRkHPtHvZIqEIpI YppoAwAZqj53gEe+OIkDkWd9AWyLfjkNKEis/fmpjmRXgKwD8uaIZSHLBoNdix4RjBF2 RHNi0Ovb2Cmw9iuyvat3Qi6gv1c6n+zQkVSAD8IFgftMb4EFDtPEy8ivUVBW8+th3tnE ME+Q== X-Gm-Message-State: AO0yUKWnnDe31barZQoH/OgYzSIj4dRZvciEe5YGcv8JuBIVVWcUxhRH mkS7CJuQ8KcnGx9rG7Ms7/FqxuEhiiNayOJCY+opHYQ/SFIRUEQwpYCiyXt12MEdZR2Gngj1OEj KUTlQwr0/5JwkLW3novpQ50Hcps22YdHRymNkfSjRnsqf02Q= X-Received: by 2002:ac8:5f85:0:b0:3b7:fb35:9163 with SMTP id j5-20020ac85f85000000b003b7fb359163mr20882994qta.30.1675967548107; Thu, 09 Feb 2023 10:32:28 -0800 (PST) X-Google-Smtp-Source: AK7set9fMeMEvhjkn9z8jedQ3aObqO/XpVXLXYwcHfUz1/B76RmIWunDlNSz/DiF71ZK4VqLi3SKdA== X-Received: by 2002:ac8:5f85:0:b0:3b7:fb35:9163 with SMTP id j5-20020ac85f85000000b003b7fb359163mr20882961qta.30.1675967547727; Thu, 09 Feb 2023 10:32:27 -0800 (PST) Received: from localhost ([2600:1700:1d0:5e50:ea6:bc06:4249:cd46]) by smtp.gmail.com with ESMTPSA id u1-20020ac83d41000000b003b643951117sm1733063qtf.38.2023.02.09.10.32.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Feb 2023 10:32:27 -0800 (PST) From: Michael Reed To: kernel-team@lists.ubuntu.com Subject: [PATCH V2 1/2] ice: Add device ids for E822 devices Date: Thu, 9 Feb 2023 12:32:23 -0600 Message-Id: <20230209183224.30722-2-michael.reed@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230209183224.30722-1-michael.reed@canonical.com> References: <20230209183224.30722-1-michael.reed@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Jacob Keller Add support for E822 devices Signed-off-by: Jacob Keller Signed-off-by: Bruce Allan Signed-off-by: Tony Nguyen Tested-by: Andrew Bowers Signed-off-by: Jeff Kirsher (backported from commit 5d9e618cbb54f5cbaef7f6f44ceb919978f0e5bc) [Michael - context adjustments, no code changes.] Signed-off-by: Michael Reed BugLink: https://launchpad.net/bugs/1986717 --- drivers/net/ethernet/intel/ice/ice_devids.h | 19 ++++++++++++++++++- drivers/net/ethernet/intel/ice/ice_main.c | 9 +++++++++ drivers/net/ethernet/intel/ice/ice_nvm.c | 12 ++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/ice/ice_devids.h b/drivers/net/ethernet/intel/ice/ice_devids.h index 862a5caa760f..4429b85120a6 100644 --- a/drivers/net/ethernet/intel/ice/ice_devids.h +++ b/drivers/net/ethernet/intel/ice/ice_devids.h @@ -13,5 +13,22 @@ #define ICE_DEV_ID_E810C_SFP 0x1593 /* Intel(R) Ethernet Controller E810-XXV for SFP */ #define ICE_DEV_ID_E810_XXV_SFP 0x159B - +/* Intel(R) Ethernet Connection E822-C for backplane */ +#define ICE_DEV_ID_E822C_BACKPLANE 0x1890 +/* Intel(R) Ethernet Connection E822-C for QSFP */ +#define ICE_DEV_ID_E822C_QSFP 0x1891 +/* Intel(R) Ethernet Connection E822-C for SFP */ +#define ICE_DEV_ID_E822C_SFP 0x1892 +/* Intel(R) Ethernet Connection E822-C/X557-AT 10GBASE-T */ +#define ICE_DEV_ID_E822C_10G_BASE_T 0x1893 +/* Intel(R) Ethernet Connection E822-C 1GbE */ +#define ICE_DEV_ID_E822C_SGMII 0x1894 +/* Intel(R) Ethernet Connection E822-X for backplane */ +#define ICE_DEV_ID_E822X_BACKPLANE 0x1897 +/* Intel(R) Ethernet Connection E822-L for SFP */ +#define ICE_DEV_ID_E822L_SFP 0x1898 +/* Intel(R) Ethernet Connection E822-L/X557-AT 10GBASE-T */ +#define ICE_DEV_ID_E822L_10G_BASE_T 0x1899 +/* Intel(R) Ethernet Connection E822-L 1GbE */ +#define ICE_DEV_ID_E822L_SGMII 0x189A #endif /* _ICE_DEVIDS_H_ */ diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c index 4d109f4360a5..54e041d0d066 100644 --- a/drivers/net/ethernet/intel/ice/ice_main.c +++ b/drivers/net/ethernet/intel/ice/ice_main.c @@ -3177,6 +3177,15 @@ static const struct pci_device_id ice_pci_tbl[] = { { PCI_VDEVICE(INTEL, ICE_DEV_ID_E810C_QSFP), 0 }, { PCI_VDEVICE(INTEL, ICE_DEV_ID_E810C_SFP), 0 }, { PCI_VDEVICE(INTEL, ICE_DEV_ID_E810_XXV_SFP), 0 }, + { PCI_VDEVICE(INTEL, ICE_DEV_ID_E822C_BACKPLANE), 0 }, + { PCI_VDEVICE(INTEL, ICE_DEV_ID_E822C_QSFP), 0 }, + { PCI_VDEVICE(INTEL, ICE_DEV_ID_E822C_SFP), 0 }, + { PCI_VDEVICE(INTEL, ICE_DEV_ID_E822C_10G_BASE_T), 0 }, + { PCI_VDEVICE(INTEL, ICE_DEV_ID_E822C_SGMII), 0 }, + { PCI_VDEVICE(INTEL, ICE_DEV_ID_E822X_BACKPLANE), 0 }, + { PCI_VDEVICE(INTEL, ICE_DEV_ID_E822L_SFP), 0 }, + { PCI_VDEVICE(INTEL, ICE_DEV_ID_E822L_10G_BASE_T), 0 }, + { PCI_VDEVICE(INTEL, ICE_DEV_ID_E822L_SGMII), 0 }, /* required last entry */ { 0, } }; diff --git a/drivers/net/ethernet/intel/ice/ice_nvm.c b/drivers/net/ethernet/intel/ice/ice_nvm.c index bcb431f1bd92..180f4a41c11d 100644 --- a/drivers/net/ethernet/intel/ice/ice_nvm.c +++ b/drivers/net/ethernet/intel/ice/ice_nvm.c @@ -289,6 +289,18 @@ enum ice_status ice_init_nvm(struct ice_hw *hw) hw->nvm.eetrack = (eetrack_hi << 16) | eetrack_lo; + /* the following devices do not have boot_cfg_tlv yet */ + if (hw->device_id == ICE_DEV_ID_E822C_BACKPLANE || + hw->device_id == ICE_DEV_ID_E822C_QSFP || + hw->device_id == ICE_DEV_ID_E822C_10G_BASE_T || + hw->device_id == ICE_DEV_ID_E822C_SGMII || + hw->device_id == ICE_DEV_ID_E822C_SFP || + hw->device_id == ICE_DEV_ID_E822X_BACKPLANE || + hw->device_id == ICE_DEV_ID_E822L_SFP || + hw->device_id == ICE_DEV_ID_E822L_10G_BASE_T || + hw->device_id == ICE_DEV_ID_E822L_SGMII) + return status; + return status; } From patchwork Thu Feb 9 18:32:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Reed X-Patchwork-Id: 1740092 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=ftUAuGia; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PCQTQ0qVgz23yF for ; Fri, 10 Feb 2023 05:32:42 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1pQBik-00010i-0o; Thu, 09 Feb 2023 18:32:34 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1pQBig-0000zd-Sz for kernel-team@lists.ubuntu.com; Thu, 09 Feb 2023 18:32:30 +0000 Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 77CF23F0B5 for ; Thu, 9 Feb 2023 18:32:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1675967550; bh=GEYVnHbaKy0+okAUXr6O35K6g2972KkrWcg/xeM2Hos=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ftUAuGiaTqG5ZfxCryzXuR11Q3Bj28CGD/ZoUC32NlBNFaJSx+pPvtvdzQmBPZWkI INpmp8KsbIJijCFCYj4M376qV0P+mvgCsJGwd3myiNYL5MnXAcc2aKHmwGUOf56JW6 jEc6mEK0sk3pUgq4LCxtoX46cb7tz8Q9bqlnE2miQX02YFvXY7a68Zbj2AqM3nN/Lv Lkc8M4CJxnlM0md0TnRsRc7TI1Sg/H6QKhzh3v1gVQYaqu/p5AoacG9vKLxJygWeVa s84YuMuyC0qE56aHOi91Af1XSfIC9PX1k+nimPMlf6rdF86nUVWihZYpqnfg3Esk+u MYn4W9B5FS1kw== Received: by mail-qt1-f197.google.com with SMTP id he22-20020a05622a601600b003ba3c280fabso1597647qtb.2 for ; Thu, 09 Feb 2023 10:32:30 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GEYVnHbaKy0+okAUXr6O35K6g2972KkrWcg/xeM2Hos=; b=s1qtzA697pY+A1GHT7p3CQGcA7wFZMPP7QQbVmIf4lKjNilRuly0rPmNsvdsp1PcaM eeobBek6KV/ICWW9S1E94JpcuoMRGPMO7jHAZs5qkAOny/h9TVV+MrvwzdE8urcHQ2Z/ siSZn/RsTRtOzwtUUOGvwKQf7mqah2P3s7H5rwZlnOMyKZMBD3Aquvznl4mw9DxBDL7k F84/wHpjdMH7m9QHZyOoaU+hoMpPaKUYdT57b0/W7NwZn/ed9N9JHAy+q4QfOn2Bkkt7 k3cNNydRnBGjc2xUbvKuNVnMjYL7KttBnu/LMYOJGSW1+TdL3BeQJQefiqtgtKvOtp60 Oy6g== X-Gm-Message-State: AO0yUKV1T82CdGDA/oglHYYy5JGGOVcdcj/1KvU4RiHFrI0rZw0vytze bQJr2Jgz24DLcegC24zaMFiZMMHdkxSyyzjFhWdr76Y7EOU1lKN1El7xpLm6QcF4TE3BwxE/MRr ym5xTooGD+uS0x1r9QR0zGfXYvEkKNApqUU63FwFwBhKJZpE= X-Received: by 2002:a05:622a:18a8:b0:3b8:6a41:c329 with SMTP id v40-20020a05622a18a800b003b86a41c329mr21618759qtc.21.1675967549263; Thu, 09 Feb 2023 10:32:29 -0800 (PST) X-Google-Smtp-Source: AK7set/vSTbpXDK+QqyaPP8hqOir1d7ST1o4ayHylIq04DZcIpwSSSiOfZ9EKaxLYHOMppoCTskAAQ== X-Received: by 2002:a05:622a:18a8:b0:3b8:6a41:c329 with SMTP id v40-20020a05622a18a800b003b86a41c329mr21618704qtc.21.1675967548783; Thu, 09 Feb 2023 10:32:28 -0800 (PST) Received: from localhost ([2600:1700:1d0:5e50:ea6:bc06:4249:cd46]) by smtp.gmail.com with ESMTPSA id 74-20020a37044d000000b007343fceee5fsm1915090qke.8.2023.02.09.10.32.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Feb 2023 10:32:28 -0800 (PST) From: Michael Reed To: kernel-team@lists.ubuntu.com Subject: [PATCH V2 2/2] ice: add support for E823 devices Date: Thu, 9 Feb 2023 12:32:24 -0600 Message-Id: <20230209183224.30722-3-michael.reed@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230209183224.30722-1-michael.reed@canonical.com> References: <20230209183224.30722-1-michael.reed@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Bruce Allan Add E823 device ids and convert conditional expressions to a more appropriate switch statement. Signed-off-by: Bruce Allan Signed-off-by: Tony Nguyen Tested-by: Andrew Bowers Signed-off-by: Jeff Kirsher (cherry picked from commit e36aeec0f4e551a7fe01758e652d135638b4865b) Signed-off-by: Michael Reed BugLink: https://launchpad.net/bugs/1986717 --- drivers/net/ethernet/intel/ice/ice_devids.h | 20 +++++++++++++ drivers/net/ethernet/intel/ice/ice_main.c | 10 +++++++ drivers/net/ethernet/intel/ice/ice_nvm.c | 32 +++++++++++++++------ 3 files changed, 53 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/intel/ice/ice_devids.h b/drivers/net/ethernet/intel/ice/ice_devids.h index 4429b85120a6..a2b0263790b0 100644 --- a/drivers/net/ethernet/intel/ice/ice_devids.h +++ b/drivers/net/ethernet/intel/ice/ice_devids.h @@ -5,6 +5,16 @@ #define _ICE_DEVIDS_H_ /* Device IDs */ +/* Intel(R) Ethernet Connection E823-L for backplane */ +#define ICE_DEV_ID_E823L_BACKPLANE 0x124C +/* Intel(R) Ethernet Connection E823-L for SFP */ +#define ICE_DEV_ID_E823L_SFP 0x124D +/* Intel(R) Ethernet Connection E823-L/X557-AT 10GBASE-T */ +#define ICE_DEV_ID_E823L_10G_BASE_T 0x124E +/* Intel(R) Ethernet Connection E823-L 1GbE */ +#define ICE_DEV_ID_E823L_1GBE 0x124F +/* Intel(R) Ethernet Connection E823-L for QSFP */ +#define ICE_DEV_ID_E823L_QSFP 0x151D /* Intel(R) Ethernet Controller E810-C for backplane */ #define ICE_DEV_ID_E810C_BACKPLANE 0x1591 /* Intel(R) Ethernet Controller E810-C for QSFP */ @@ -13,6 +23,16 @@ #define ICE_DEV_ID_E810C_SFP 0x1593 /* Intel(R) Ethernet Controller E810-XXV for SFP */ #define ICE_DEV_ID_E810_XXV_SFP 0x159B +/* Intel(R) Ethernet Connection E823-C for backplane */ +#define ICE_DEV_ID_E823C_BACKPLANE 0x188A +/* Intel(R) Ethernet Connection E823-C for QSFP */ +#define ICE_DEV_ID_E823C_QSFP 0x188B +/* Intel(R) Ethernet Connection E823-C for SFP */ +#define ICE_DEV_ID_E823C_SFP 0x188C +/* Intel(R) Ethernet Connection E823-C/X557-AT 10GBASE-T */ +#define ICE_DEV_ID_E823C_10G_BASE_T 0x188D +/* Intel(R) Ethernet Connection E823-C 1GbE */ +#define ICE_DEV_ID_E823C_SGMII 0x188E /* Intel(R) Ethernet Connection E822-C for backplane */ #define ICE_DEV_ID_E822C_BACKPLANE 0x1890 /* Intel(R) Ethernet Connection E822-C for QSFP */ diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c index 54e041d0d066..18c03359a824 100644 --- a/drivers/net/ethernet/intel/ice/ice_main.c +++ b/drivers/net/ethernet/intel/ice/ice_main.c @@ -3177,6 +3177,11 @@ static const struct pci_device_id ice_pci_tbl[] = { { PCI_VDEVICE(INTEL, ICE_DEV_ID_E810C_QSFP), 0 }, { PCI_VDEVICE(INTEL, ICE_DEV_ID_E810C_SFP), 0 }, { PCI_VDEVICE(INTEL, ICE_DEV_ID_E810_XXV_SFP), 0 }, + { PCI_VDEVICE(INTEL, ICE_DEV_ID_E823C_BACKPLANE), 0 }, + { PCI_VDEVICE(INTEL, ICE_DEV_ID_E823C_QSFP), 0 }, + { PCI_VDEVICE(INTEL, ICE_DEV_ID_E823C_SFP), 0 }, + { PCI_VDEVICE(INTEL, ICE_DEV_ID_E823C_10G_BASE_T), 0 }, + { PCI_VDEVICE(INTEL, ICE_DEV_ID_E823C_SGMII), 0 }, { PCI_VDEVICE(INTEL, ICE_DEV_ID_E822C_BACKPLANE), 0 }, { PCI_VDEVICE(INTEL, ICE_DEV_ID_E822C_QSFP), 0 }, { PCI_VDEVICE(INTEL, ICE_DEV_ID_E822C_SFP), 0 }, @@ -3186,6 +3191,11 @@ static const struct pci_device_id ice_pci_tbl[] = { { PCI_VDEVICE(INTEL, ICE_DEV_ID_E822L_SFP), 0 }, { PCI_VDEVICE(INTEL, ICE_DEV_ID_E822L_10G_BASE_T), 0 }, { PCI_VDEVICE(INTEL, ICE_DEV_ID_E822L_SGMII), 0 }, + { PCI_VDEVICE(INTEL, ICE_DEV_ID_E823L_BACKPLANE), 0 }, + { PCI_VDEVICE(INTEL, ICE_DEV_ID_E823L_SFP), 0 }, + { PCI_VDEVICE(INTEL, ICE_DEV_ID_E823L_10G_BASE_T), 0 }, + { PCI_VDEVICE(INTEL, ICE_DEV_ID_E823L_1GBE), 0 }, + { PCI_VDEVICE(INTEL, ICE_DEV_ID_E823L_QSFP), 0 }, /* required last entry */ { 0, } }; diff --git a/drivers/net/ethernet/intel/ice/ice_nvm.c b/drivers/net/ethernet/intel/ice/ice_nvm.c index 180f4a41c11d..3d38f0691b11 100644 --- a/drivers/net/ethernet/intel/ice/ice_nvm.c +++ b/drivers/net/ethernet/intel/ice/ice_nvm.c @@ -289,17 +289,31 @@ enum ice_status ice_init_nvm(struct ice_hw *hw) hw->nvm.eetrack = (eetrack_hi << 16) | eetrack_lo; + switch (hw->device_id) { /* the following devices do not have boot_cfg_tlv yet */ - if (hw->device_id == ICE_DEV_ID_E822C_BACKPLANE || - hw->device_id == ICE_DEV_ID_E822C_QSFP || - hw->device_id == ICE_DEV_ID_E822C_10G_BASE_T || - hw->device_id == ICE_DEV_ID_E822C_SGMII || - hw->device_id == ICE_DEV_ID_E822C_SFP || - hw->device_id == ICE_DEV_ID_E822X_BACKPLANE || - hw->device_id == ICE_DEV_ID_E822L_SFP || - hw->device_id == ICE_DEV_ID_E822L_10G_BASE_T || - hw->device_id == ICE_DEV_ID_E822L_SGMII) + case ICE_DEV_ID_E823C_BACKPLANE: + case ICE_DEV_ID_E823C_QSFP: + case ICE_DEV_ID_E823C_SFP: + case ICE_DEV_ID_E823C_10G_BASE_T: + case ICE_DEV_ID_E823C_SGMII: + case ICE_DEV_ID_E822C_BACKPLANE: + case ICE_DEV_ID_E822C_QSFP: + case ICE_DEV_ID_E822C_10G_BASE_T: + case ICE_DEV_ID_E822C_SGMII: + case ICE_DEV_ID_E822C_SFP: + case ICE_DEV_ID_E822X_BACKPLANE: + case ICE_DEV_ID_E822L_SFP: + case ICE_DEV_ID_E822L_10G_BASE_T: + case ICE_DEV_ID_E822L_SGMII: + case ICE_DEV_ID_E823L_BACKPLANE: + case ICE_DEV_ID_E823L_SFP: + case ICE_DEV_ID_E823L_10G_BASE_T: + case ICE_DEV_ID_E823L_1GBE: + case ICE_DEV_ID_E823L_QSFP: return status; + default: + break; + } return status; }