Received: by 2002:a05:6a10:413:0:0:0:0 with SMTP id 19csp3479956pxp; Tue, 8 Mar 2022 15:31:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJz2xJtkImoOifU5IlITVbSoxo5fPkYAWR8hipaHP19LVs1W/BUP4ZQ+ZgClO3AE8r1MRfpP X-Received: by 2002:a17:90a:aa8c:b0:1bf:5273:ba28 with SMTP id l12-20020a17090aaa8c00b001bf5273ba28mr7302635pjq.226.1646782315255; Tue, 08 Mar 2022 15:31:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646782315; cv=none; d=google.com; s=arc-20160816; b=t6Hy7L683zN8BZD0mxNWs8ssBmwFviq559VsnCN9F+XAjhq2qBa0APtuOYEyBL88xv /GRlxjm50dNFdIR1Ox9oh+LiYFwyOUXKUN6vX0U6fUDrhb1iZvzAmUXlB74ZgeafKaKs 2Kil0LhtTFF7I5iczKlyaI6ahCEiw8s5xsfda7ZoX93MjUmec016cNB1jj32t/s5NxzJ Zn2sf4sVLzJaDHsxeLvAos3gmyoV4okqzPnDe9Z9nARSqzfKglmcQ+kAjVxmxLkRSp9K zfGCroRquR0NOluOrxbjOGshUc+8y/j16m2V/OpIonUIlMTysSm9GLQqiKxyPOBUxth3 fodA== 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=EfabP7VP4HkazLde6ZyairEwmzuTJmejmvJYeJOlWPGBzEwMyWEmc++mjekeEZJ5wZ Gj+KYt/wqt4CnOt2o/iicks9rkxEohv0FNuoBSX8ZZDhv2aguC3+5KHzB5CivLYefIrC sq5okBF0XHlCYru6cJGhb4RkqL7Eskw2zLn5Y6boGM49+WVVW40pbKkeQ/7P2DhW8wLC 9vw1zc67Hjg5ScCAIeFTd4hNzsmkbjZK3oNSUsQfZNmQKQFgqx26+oemwtAJkE9rKBu2 YDin+S6DdOUN1m4hofbPZIdXRDLF+qL7V/2o+hjxeCZvS7AfwLP+ix81LCMjM6ShGH0i b8iA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=bKdYKOtt; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 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 lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id c2-20020a170902aa4200b0014efce8c5e3si278963plr.542.2022.03.08.15.31.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Mar 2022 15:31:55 -0800 (PST) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=bKdYKOtt; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id C4157A8EC3; Tue, 8 Mar 2022 15:20:27 -0800 (PST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240691AbiCGKhj (ORCPT + 99 others); Mon, 7 Mar 2022 05:37:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50452 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241991AbiCGKLK (ORCPT ); Mon, 7 Mar 2022 05:11:10 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8AD4983033; Mon, 7 Mar 2022 01:54: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 AD6B0B810AA; Mon, 7 Mar 2022 09:54:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 19D92C340F3; Mon, 7 Mar 2022 09:54:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1646646842; bh=kRj+XBMOcfrG227XydWXXvppgPuI8HRuN5RwQWY38uM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bKdYKOttD9e8Z0V0fbUqc77kF/U5F/Vk6rphFamxz+jfLz7h3Xd6NRmiocyOkJa0I +vrDlth+LeaUYo1yjih5GYA2MdoocwCki6Fbo3w/dVc5vt1/zs4PZ7eulSCDFJSTd0 mHENqsnGImT0vTOYP54USGp/4gQ0EDg+QVdCi2Pk= 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.16 071/186] e1000e: Correct NVM checksum verification flow Date: Mon, 7 Mar 2022 10:18:29 +0100 Message-Id: <20220307091656.075983069@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220307091654.092878898@linuxfoundation.org> References: <20220307091654.092878898@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=-2.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable 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)