Received: by 2002:ac0:950c:0:0:0:0:0 with SMTP id f12csp3243310imc; Wed, 13 Mar 2019 12:32:31 -0700 (PDT) X-Google-Smtp-Source: APXvYqwQQR176JIt3xfpiZCXd1Tt98L5c2aHdRu/kttlXcFZsQEv7V7mCyzfRztA5AhF9LCBCLDO X-Received: by 2002:a17:902:f302:: with SMTP id gb2mr48085805plb.51.1552505551784; Wed, 13 Mar 2019 12:32:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552505551; cv=none; d=google.com; s=arc-20160816; b=hrBRIsrY6XP8T8ZezBPyYzCttJ5gnkPRpeM9S+M1udS+AuamRrxwfg9LrcUOhfbvPm nlcZs6FZoWJjavcPjTT/nEWxmJmvTdYNJGEQZ06kdfZjpTSQhhr8cK/nMSxuYldh2UtP zyeUME6TzmAI4tlCaGrChWGZSoIBqnfFo6C2SGOGWbxSz5ns9R8tPALpSW5r/RqMprDy dh+WaQuA5aQUS7ZEUF5uqNumqaQ8bs/zjGgq+X2t60jZjoVY2AfZGvM7gyRbY3cm0/9Q e3ZYd73DUoVDYidbIwL78iWHViSGVpDi8EFc8JsUDUoSkBdFssYb/oYCaHdPHABKHii8 2mJQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=z8JqVj4HCKDi0dA6oueY9smlRFOw447FWJ2hX+SSoX8=; b=WXrOCelZyjxTwXHh+Rk/zhAn+QAJYN4obfqWpO3ulcZ0LFOPs9+0gONxo1BrrVRBuw Kz6KqeXntdMBf4zAGwE2efo/pOgmsxamv7AeKI7kwG04cd41Ab4nRbnaH5fT3V3LAvP/ 3zst8O5wB4M9/qsKo/tWeYbQbD6uV2lGqo6myXwoKvCba0y+PIy4UYsJnBOaI16dblxv faGrfZZUUwL2eqIpbFMQjaRa6n1wu7O4uMRPtW0mAcal/XvoxzIiFYm/NQtoWQviZX3k kkTlV1nUnNx6gPh8l99XKzP8GC2iJh0wsElV3aI3Kg++J18h54upBYr2Txgb6ozWjMH8 jhtQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="TDmh5Yw/"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z11si10479888pgj.140.2019.03.13.12.32.16; Wed, 13 Mar 2019 12:32:31 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="TDmh5Yw/"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727601AbfCMTLz (ORCPT + 99 others); Wed, 13 Mar 2019 15:11:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:42550 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727584AbfCMTLw (ORCPT ); Wed, 13 Mar 2019 15:11:52 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 582462173C; Wed, 13 Mar 2019 19:11:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552504311; bh=fLF7LLWhM6I6FDC6TJ5BUmFJNI9qeGU5OyBTcWlj/8k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TDmh5Yw/HPCEWW+kKqwxklarO+qfO9PY20xArrKETOCYRVhqg6hzytyU6DTDooytt FACWhG2Rk8T2d+zas5ETxBnLr4pv6oynKB6cvggk9A+tLNxbfrzofSNahstWqWvxr/ Jr/4oV7dxwODj/q38Iu8QqUgnzjJxq7DhtPKVwpw= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jeff Kirsher , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.20 40/60] ixgbe: fix older devices that do not support IXGBE_MRQC_L3L4TXSWEN Date: Wed, 13 Mar 2019 15:10:01 -0400 Message-Id: <20190313191021.158171-40-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190313191021.158171-1-sashal@kernel.org> References: <20190313191021.158171-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jeff Kirsher [ Upstream commit 156a67a9065e3339be85f811d1b13b920e50d73b ] The enabling L3/L4 filtering for transmit switched packets for all devices caused unforeseen issue on older devices when trying to send UDP traffic in an ordered sequence. This bit was originally intended for X550 devices, which supported this feature, so limit the scope of this bit to only X550 devices. Signed-off-by: Jeff Kirsher Tested-by: Andrew Bowers Signed-off-by: Sasha Levin --- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 113b38e0defb..aed1890514d6 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -3952,8 +3952,11 @@ static void ixgbe_setup_mrqc(struct ixgbe_adapter *adapter) else mrqc = IXGBE_MRQC_VMDQRSS64EN; - /* Enable L3/L4 for Tx Switched packets */ - mrqc |= IXGBE_MRQC_L3L4TXSWEN; + /* Enable L3/L4 for Tx Switched packets only for X550, + * older devices do not support this feature + */ + if (hw->mac.type >= ixgbe_mac_X550) + mrqc |= IXGBE_MRQC_L3L4TXSWEN; } else { if (tcs > 4) mrqc = IXGBE_MRQC_RTRSS8TCEN; -- 2.19.1