Received: by 2002:a05:6a10:413:0:0:0:0 with SMTP id 19csp1798012pxp; Mon, 7 Mar 2022 02:35:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJzdDU4Rz+rN/QFQVWbY/YmDDE6773io/3My25fPLM2TqJ+aXsiNBs10BPAy3fZTfZD+qVbt X-Received: by 2002:a17:90a:ab93:b0:1b8:831d:2ee4 with SMTP id n19-20020a17090aab9300b001b8831d2ee4mr12164641pjq.123.1646649307712; Mon, 07 Mar 2022 02:35:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646649307; cv=none; d=google.com; s=arc-20160816; b=qZorgJMFLTJOj5Lckr1zQM5/Mzpm4wc/8ylmbeOGnfWuDcZxcg0hlpyFoNhaVqtVD8 8lwSUdzE9Yr/jgSMh8mVbE3JWJRkMQ8PD0sl65XZWJHLcRar/fHj9nBYEUA2lgh/VF7w 0Xh9L4jsLlz0zaYUJ4UQzus/1D4swea7cAkVPhlXtqthS7h7aTqf9bsd7JqbPWDSKNof y1mTU3AFTuzGfTdffUXYxYXORnEewavRnNtdMU6MRy+T36K0HSuuLH9x1iKTXTpFtXPZ 4eHvvvFl5egCrXAslsql4j7+e6flQwxSdqq4d+v+6Ukpnj6AdI0eexLwKlEjC64oovw7 FZzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=DVnPf7H9ltyySWVcrh7Hk1XSZU9Y12dPcC2jcQ51xMc=; b=F6YTkeSPJzLIa6ipVfmzGYUmeVW8IRv8EkxoSiA1lkbLG/pSe9GCulwc82868bK5DY ny7VcCrhWYluL0PoDRhf2d/M0Wokbv/iVGXrvnz8Bz4aRQJq45vF/UT5bWwUTa6N/Bdx 9L7gi5EyVu518Mep7cijgS3aimHsnWJEm68A7Aqcm7kldY8vki4MFxh6rwiipppMlKfV B/DhXgyt0UhDOs28WzqjyjlZL+CU73ADZ/tHrJU7zQaw3x5R9lMVdw7bpfcI4FZrd005 ZZFknuf10fl2ULXsty3DIUwDe5j0igGdeFJNQ94w+7VJPIP9+tUmajp8IW92sodK2QDJ bXPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=QZyX91A9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y1-20020a1709029b8100b0015182f9482esi11028323plp.63.2022.03.07.02.34.52; Mon, 07 Mar 2022 02:35:07 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=QZyX91A9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239975AbiCGKH4 (ORCPT + 99 others); Mon, 7 Mar 2022 05:07:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53872 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239337AbiCGJtg (ORCPT ); Mon, 7 Mar 2022 04:49:36 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1A8D16E54C; Mon, 7 Mar 2022 01:43:11 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id DD578B8102B; Mon, 7 Mar 2022 09:43:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 36EC4C340E9; Mon, 7 Mar 2022 09:43:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1646646180; bh=kRj+XBMOcfrG227XydWXXvppgPuI8HRuN5RwQWY38uM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QZyX91A9BtzkTdZUy+oZGTwz7SJQYOUGUX0SBYz2mC1qr9TuS6SivOcq/m5YSIdwQ XKgZH9k8vFa9l5bBzoyadpK1+or9Eao8DRRdsWmThMzyrshqzizGdd+A2I35N+s95K a7kW9dG0F1WdddNNcZlsn6inAr9VjIfOuefU7gGw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Thomas Bogendoerfer , Sasha Neftin , Naama Meir , Tony Nguyen Subject: [PATCH 5.15 158/262] e1000e: Correct NVM checksum verification flow Date: Mon, 7 Mar 2022 10:18:22 +0100 Message-Id: <20220307091706.893870394@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220307091702.378509770@linuxfoundation.org> References: <20220307091702.378509770@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sasha Neftin commit ffd24fa2fcc76ecb2e61e7a4ef8588177bcb42a6 upstream. Update MAC type check e1000_pch_tgp because for e1000_pch_cnp, NVM checksum update is still possible. Emit a more detailed warning message. Bugzilla: https://bugzilla.opensuse.org/show_bug.cgi?id=1191663 Fixes: 4051f68318ca ("e1000e: Do not take care about recovery NVM checksum") Reported-by: Thomas Bogendoerfer Signed-off-by: Sasha Neftin Tested-by: Naama Meir Signed-off-by: Tony Nguyen Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/intel/e1000e/ich8lan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/net/ethernet/intel/e1000e/ich8lan.c +++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c @@ -4136,9 +4136,9 @@ static s32 e1000_validate_nvm_checksum_i return ret_val; if (!(data & valid_csum_mask)) { - e_dbg("NVM Checksum Invalid\n"); + e_dbg("NVM Checksum valid bit not set\n"); - if (hw->mac.type < e1000_pch_cnp) { + if (hw->mac.type < e1000_pch_tgp) { data |= valid_csum_mask; ret_val = e1000_write_nvm(hw, word, 1, &data); if (ret_val)