From patchwork Fri Nov 2 15:18:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 47749 X-Patchwork-Delegate: qi.z.zhang@intel.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 07A9B7CDA; Fri, 2 Nov 2018 16:18:56 +0100 (CET) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id ED78B6CD8; Fri, 2 Nov 2018 16:18:53 +0100 (CET) Received: by mail-wr1-f66.google.com with SMTP id y15-v6so2352108wru.9; Fri, 02 Nov 2018 08:18:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+jZgh+nrcqLd/ZpcIxsZCq59YG0lxR3orkc4+cKQzZ8=; b=EoFMkGgurZUQvwISuLZqN3QrB7JiQaNgqEGv24gkKw4bpEmZkQhvDHH4n5CUOCIpCb tq6BLF4IEzFetLBoy5+g6KumhrJ20AmTasMYdzq4c3uBVwsbTjMAnHZwd5sMWsHQVYVC pEOxbj0eLMghLjGLO5yF1PPBfV36weijoIa90MkiJ73SMGvVr0KyJ3qsQ7WqFAlT4BeN 8IWLPYVWD7EE3cV5aFFMuko3G76Vvqpr6C1U5WahzA5gO/gq4u7hQUD3Wq1b9VhTvNrz Ajmm+cK8z87RkES5bTp8yh+EtM3B3RrC2SUoAqxb9U5Zbnx/T5Ws/L7eaLnrgI0neOj4 RgAQ== X-Gm-Message-State: AGRZ1gIfqctVm2q+4fJ1Y3WNdErcBakgebwYBNEhhhGBwlv87n/bVhsu Ko5d1uOm0rd3FGsTgpYugAJaj5stD+I= X-Google-Smtp-Source: AJdET5cyxGNaoqn9qVXMdDiKmgPF3QCgaOAZftiGBVdSqM7fRgJh4lwSnADqC+r7PvyZ/aGMR/V6LQ== X-Received: by 2002:adf:fc0c:: with SMTP id i12-v6mr10630432wrr.145.1541171933181; Fri, 02 Nov 2018 08:18:53 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id j13sm21896257wrx.5.2018.11.02.08.18.51 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 02 Nov 2018 08:18:51 -0700 (PDT) From: Luca Boccassi To: dev@dpdk.org Cc: wenzhuo.lu@intel.com, konstantin.ananyev@intel.com, qi.z.zhang@intel.com, 3chas3@gmail.com, Luca Boccassi , stable@dpdk.org Date: Fri, 2 Nov 2018 15:18:47 +0000 Message-Id: <20181102151848.18024-1-bluca@debian.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20180815170932.23536-1-bluca@debian.org> References: <20180815170932.23536-1-bluca@debian.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v3 1/2] net/ixgbe: fix x550 code to handle unidentified PHY X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" ixgbe_identify_sfp_module_X550em() was missing the code to handle unidentified PHY that has been there in 82599 so it was not able to complete initialization of ixgbe sequence if no sfp plugged in. Port it over to return an appropriate type and complete init sequence properly. Fixes: d2e72774e58c ("ixgbe/base: support X550") Cc: stable@dpdk.org Signed-off-by: Luca Boccassi --- v2: refresh to remove merge conflict with master v3: coalesce fix into ixgbe_identify_sfp_module_X550em to avoid code duplication, improve comment drivers/net/ixgbe/base/ixgbe_x550.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/ixgbe/base/ixgbe_x550.c b/drivers/net/ixgbe/base/ixgbe_x550.c index f7b98af52..a88d5c86a 100644 --- a/drivers/net/ixgbe/base/ixgbe_x550.c +++ b/drivers/net/ixgbe/base/ixgbe_x550.c @@ -1561,6 +1561,12 @@ s32 ixgbe_identify_sfp_module_X550em(struct ixgbe_hw *hw) status = ixgbe_identify_module_generic(hw); + /* Set PHY type none if no PHY detected to allow init without SFP */ + if (hw->phy.type == ixgbe_phy_unknown) { + hw->phy.type = ixgbe_phy_none; + return IXGBE_SUCCESS; + } + if (status != IXGBE_SUCCESS) return status;