All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Alice Michael <alice.michael@intel.com>,
	netdev@vger.kernel.org, nhorman@redhat.com, sassmann@redhat.com,
	jogreene@redhat.com, Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 04/15] i40e/i40evf: update WOL and I40E_AQC_ADDR_VALID_MASK flags
Date: Tue, 20 Jun 2017 18:17:51 -0700	[thread overview]
Message-ID: <20170621011802.81768-5-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <20170621011802.81768-1-jeffrey.t.kirsher@intel.com>

From: Alice Michael <alice.michael@intel.com>

Update a few flags related to FW interactions.

Copyright updated to 2017.

Signed-off-by: Alice Michael <alice.michael@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h   | 4 ++--
 drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h b/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h
index 5eb04114e13f..5d5f422cbae5 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Intel Ethernet Controller XL710 Family Linux Driver
- * Copyright(c) 2013 - 2016 Intel Corporation.
+ * Copyright(c) 2013 - 2017 Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -531,7 +531,7 @@ struct i40e_aqc_mac_address_read {
 #define I40E_AQC_PORT_ADDR_VALID	0x40
 #define I40E_AQC_WOL_ADDR_VALID		0x80
 #define I40E_AQC_MC_MAG_EN_VALID	0x100
-#define I40E_AQC_ADDR_VALID_MASK	0x1F0
+#define I40E_AQC_ADDR_VALID_MASK	0x3F0
 	u8	reserved[6];
 	__le32	addr_high;
 	__le32	addr_low;
diff --git a/drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h b/drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h
index 91d8786d386d..83e63e55c4b4 100644
--- a/drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h
+++ b/drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Intel Ethernet Controller XL710 Family Linux Virtual Function Driver
- * Copyright(c) 2013 - 2016 Intel Corporation.
+ * Copyright(c) 2013 - 2017 Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -528,7 +528,7 @@ struct i40e_aqc_mac_address_read {
 #define I40E_AQC_PORT_ADDR_VALID	0x40
 #define I40E_AQC_WOL_ADDR_VALID		0x80
 #define I40E_AQC_MC_MAG_EN_VALID	0x100
-#define I40E_AQC_ADDR_VALID_MASK	0x1F0
+#define I40E_AQC_ADDR_VALID_MASK	0x3F0
 	u8	reserved[6];
 	__le32	addr_high;
 	__le32	addr_low;
@@ -586,6 +586,7 @@ struct i40e_aqc_set_wol_filter {
 	__le16 cmd_flags;
 #define I40E_AQC_SET_WOL_FILTER				0x8000
 #define I40E_AQC_SET_WOL_FILTER_NO_TCO_WOL		0x4000
+#define I40E_AQC_SET_WOL_FILTER_WOL_PRESERVE_ON_PFR	0x2000
 #define I40E_AQC_SET_WOL_FILTER_ACTION_CLEAR		0
 #define I40E_AQC_SET_WOL_FILTER_ACTION_SET		1
 	__le16 valid_flags;
-- 
2.12.2

  parent reply	other threads:[~2017-06-21  1:18 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-21  1:17 [net-next 00/15][pull request] 40GbE Intel Wired LAN Driver Updates 2017-06-20 Jeff Kirsher
2017-06-21  1:17 ` [net-next 01/15] i40e: add XDP support for pass and drop actions Jeff Kirsher
2017-06-21  1:17 ` [net-next 02/15] i40e: add support for XDP_TX action Jeff Kirsher
2017-06-21  1:17 ` [net-next 03/15] i40evf: assign num_active_queues inside i40evf_alloc_queues Jeff Kirsher
2017-06-21  1:17 ` Jeff Kirsher [this message]
2017-06-21  1:17 ` [net-next 05/15] i40e: use dev_dbg instead of dev_info when warning about missing routine Jeff Kirsher
2017-06-21  1:17 ` [net-next 06/15] i40e: comment that udp_port must be in host byte order Jeff Kirsher
2017-06-21  1:17 ` [net-next 07/15] i40e: Fix potential out of bound array access Jeff Kirsher
2017-06-21  1:17 ` [net-next 08/15] i40e: Support firmware CEE DCB UP to TC map re-definition Jeff Kirsher
2017-06-21  1:17 ` [net-next 09/15] i40e: Add message for unsupported MFP mode Jeff Kirsher
2017-06-21  1:17 ` [net-next 10/15] i40e: genericize the partition bandwidth control Jeff Kirsher
2017-06-21  1:17 ` [net-next 11/15] i40e: Add support for OEM firmware version Jeff Kirsher
2017-06-21  1:17 ` [net-next 12/15] i40e: fix disabling overflow promiscuous mode Jeff Kirsher
2017-06-21  1:18 ` [net-next 13/15] i40e: clear only cause_ena bit Jeff Kirsher
2017-06-21  1:18 ` [net-next 14/15] i40e: Handle PE_CRITERR properly with IWARP enabled Jeff Kirsher
2017-06-21  1:18 ` [net-next 15/15] i40e: don't hold RTNL lock for the entire reset Jeff Kirsher
2017-06-21 15:32 ` [net-next 00/15][pull request] 40GbE Intel Wired LAN Driver Updates 2017-06-20 David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170621011802.81768-5-jeffrey.t.kirsher@intel.com \
    --to=jeffrey.t.kirsher@intel.com \
    --cc=alice.michael@intel.com \
    --cc=davem@davemloft.net \
    --cc=jogreene@redhat.com \
    --cc=netdev@vger.kernel.org \
    --cc=nhorman@redhat.com \
    --cc=sassmann@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.