Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp189380pxk; Sat, 29 Aug 2020 22:49:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzVDYZLAEz0/lkI10MUUs8FN8MOtAGHc0u1cnoUyJfpJYlc/Aeot6rED/5Q/UK1D6g/yEG7 X-Received: by 2002:a50:e109:: with SMTP id h9mr6165197edl.47.1598766584816; Sat, 29 Aug 2020 22:49:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598766584; cv=none; d=google.com; s=arc-20160816; b=C2EmEkwlyTF43T6Z9+XvtxV7vMXx16TvVTSU5Z0qS3CXzTmLaL43eMjnl7gemoOZ4w ZlCTci9wy9lVaewKP7EEWljUsgA08D4TzzYt7wzAuWRo3f/jwRPCY6E2606H1wyCG01M hbb8P+aP7f/XNRMcA1HF4PnNpBF3/0hvGpos370W1w0fXdl+WAxUQdOb7lYedmaBdjNb SJbL7KoUiApU6G2S/ClffnetQF8UJWnpujQITnYcIIoU4sqNFKbdRAjpTvaW2MtTt6As D+yd/Br9A6Y43xxveeyqY7Zeg14BbR71MY3GudXVqMXNNKhCEx2zrMMrMT7PNexCSU30 J2eA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=ZTIyDWwB1xP2mlWOHAKgKgz8364nJ/gpT2y8y73sUK8=; b=wUgaAINw57f7MPJuizvUUoTYotWIXUzxHzC2Sk3vPSRcdqNa99nYka7mv/rjN0Q6c6 0tNgkixbupFXhRxKWPZtN5D6xhEZz7KzmOKELXASZ1OIyL5RmyADKNQdAN59HBu/JJV3 s1psG9CV7E8kGTaZn9ff4N5Uk4hw+p1qVH5GAa7eUw+WY+pnIONRL+7bAa4UJgfqitU+ QM3OLBogK+MQiUVwb6eC/tQ4Fj5m3AzYfdpIetBlak+K6bfOL8jq/yuiqR9gtqJ8A1fz ypaVISK89nLwUARkOgy/pmplOhIk7nrBLKG64gdTAU5FHqrkBjMLxdwrZLm0taIZn6uU sftA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=EAHkbTWu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z1si2977716eji.189.2020.08.29.22.48.54; Sat, 29 Aug 2020 22:49:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=EAHkbTWu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726078AbgH3Fpp (ORCPT + 99 others); Sun, 30 Aug 2020 01:45:45 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:27716 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725845AbgH3Fpn (ORCPT ); Sun, 30 Aug 2020 01:45:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598766342; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=ZTIyDWwB1xP2mlWOHAKgKgz8364nJ/gpT2y8y73sUK8=; b=EAHkbTWuEFMIfrl0E+5BVUCa9oKKwHpNvU5bBew11ROKIS92zjEJU6yqmOckHlaTrIbnjA gWuIREfZNIsbMb3ou3ubFgEuo6apOc6EN3nvf112ibmjIDxhUAJloT6HU5XkhP02bf0nFJ lxBisOQhtrGlMjzKBK8kMgTlSUlVfCw= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-122-Lxj-a1CiO726VBx_g6LU9w-1; Sun, 30 Aug 2020 01:45:38 -0400 X-MC-Unique: Lxj-a1CiO726VBx_g6LU9w-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 28625189E61D; Sun, 30 Aug 2020 05:45:37 +0000 (UTC) Received: from wolverine.usersys.redhat.com (unknown [10.35.206.47]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2952A80DF2; Sun, 30 Aug 2020 05:45:33 +0000 (UTC) From: Gal Hammer To: linux-kernel@vger.kernel.org Cc: Jeff Kirsher , "David S . Miller" , Jakub Kicinski , intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, Marcel Apfelbaum , Gal Hammer Subject: [PATCH] igb: read PBA number from flash Date: Sun, 30 Aug 2020 08:45:29 +0300 Message-Id: <20200830054529.3980-1-ghammer@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fixed flash presence check for 82576 controllers so the part number string is read and displayed correctly. Signed-off-by: Gal Hammer --- drivers/net/ethernet/intel/igb/igb_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index d9c3a6b169f9..245e62b0a97e 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -3388,7 +3388,9 @@ static int igb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) "Width x1" : "unknown"), netdev->dev_addr); } - if ((hw->mac.type >= e1000_i210 || + if ((hw->mac.type == e1000_82576 && + rd32(E1000_EECD) & E1000_EECD_PRES) || + (hw->mac.type >= e1000_i210 || igb_get_flash_presence_i210(hw))) { ret_val = igb_read_part_string(hw, part_str, E1000_PBANUM_LENGTH); -- 2.26.2