* [net 0/2][pull request] Intel Wired LAN Driver Update
@ 2012-06-02 7:16 Jeff Kirsher
2012-06-02 7:16 ` [net 1/2] e1000: look into the page instead of skb->data for e1000_tbi_adjust_stats() Jeff Kirsher
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Jeff Kirsher @ 2012-06-02 7:16 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
This series contains fixes for e1000 and e1000e.
The following are changes since commit ad1be8d345416a794dea39761a374032aa471a76:
r8169: call netif_napi_del at errpaths and at driver unload
and are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net master
Bruce Allan (1):
e1000e: fix Rapid Start Technology support for i217
Sebastian Andrzej Siewior (1):
e1000: look into the page instead of skb->data for
e1000_tbi_adjust_stats()
drivers/net/ethernet/intel/e1000/e1000_main.c | 2 +-
drivers/net/ethernet/intel/e1000e/ich8lan.c | 18 +++++++++---------
2 files changed, 10 insertions(+), 10 deletions(-)
--
1.7.10.2
^ permalink raw reply [flat|nested] 4+ messages in thread
* [net 1/2] e1000: look into the page instead of skb->data for e1000_tbi_adjust_stats()
2012-06-02 7:16 [net 0/2][pull request] Intel Wired LAN Driver Update Jeff Kirsher
@ 2012-06-02 7:16 ` Jeff Kirsher
2012-06-02 7:16 ` [net 2/2] e1000e: fix Rapid Start Technology support for i217 Jeff Kirsher
2012-06-02 21:08 ` [net 0/2][pull request] Intel Wired LAN Driver Update David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Jeff Kirsher @ 2012-06-02 7:16 UTC (permalink / raw)
To: davem; +Cc: Sebastian Andrzej Siewior, netdev, gospo, sassmann, Jeff Kirsher
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
This is another fixup where the data is not transfered into buffer
addressed by skb->data but into a page.
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/e1000/e1000_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
index 95731c8..7483ca0 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_main.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
@@ -4080,7 +4080,7 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_adapter *adapter,
spin_lock_irqsave(&adapter->stats_lock,
irq_flags);
e1000_tbi_adjust_stats(hw, &adapter->stats,
- length, skb->data);
+ length, mapped);
spin_unlock_irqrestore(&adapter->stats_lock,
irq_flags);
length--;
--
1.7.10.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [net 2/2] e1000e: fix Rapid Start Technology support for i217
2012-06-02 7:16 [net 0/2][pull request] Intel Wired LAN Driver Update Jeff Kirsher
2012-06-02 7:16 ` [net 1/2] e1000: look into the page instead of skb->data for e1000_tbi_adjust_stats() Jeff Kirsher
@ 2012-06-02 7:16 ` Jeff Kirsher
2012-06-02 21:08 ` [net 0/2][pull request] Intel Wired LAN Driver Update David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Jeff Kirsher @ 2012-06-02 7:16 UTC (permalink / raw)
To: davem; +Cc: Bruce Allan, netdev, gospo, sassmann, Jeff Kirsher
From: Bruce Allan <bruce.w.allan@intel.com>
The definition of I217_PROXY_CTRL must use the BM_PHY_REG() macro instead
of the PHY_REG() macro for PHY page 800 register 70 since it is for a PHY
register greater than the maximum allowed by the latter macro, and fix a
typo setting the I217_MEMPWR register in e1000_suspend_workarounds_ich8lan.
Also for clarity, rename a few defines as bit definitions instead of masks.
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/e1000e/ich8lan.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c
index bbf70ba..238ab2f 100644
--- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
@@ -165,14 +165,14 @@
#define I217_EEE_100_SUPPORTED (1 << 1) /* 100BaseTx EEE supported */
/* Intel Rapid Start Technology Support */
-#define I217_PROXY_CTRL PHY_REG(BM_WUC_PAGE, 70)
+#define I217_PROXY_CTRL BM_PHY_REG(BM_WUC_PAGE, 70)
#define I217_PROXY_CTRL_AUTO_DISABLE 0x0080
#define I217_SxCTRL PHY_REG(BM_PORT_CTRL_PAGE, 28)
-#define I217_SxCTRL_MASK 0x1000
+#define I217_SxCTRL_ENABLE_LPI_RESET 0x1000
#define I217_CGFREG PHY_REG(772, 29)
-#define I217_CGFREG_MASK 0x0002
+#define I217_CGFREG_ENABLE_MTA_RESET 0x0002
#define I217_MEMPWR PHY_REG(772, 26)
-#define I217_MEMPWR_MASK 0x0010
+#define I217_MEMPWR_DISABLE_SMB_RELEASE 0x0010
/* Strapping Option Register - RO */
#define E1000_STRAP 0x0000C
@@ -4089,12 +4089,12 @@ void e1000_suspend_workarounds_ich8lan(struct e1000_hw *hw)
* power good.
*/
e1e_rphy_locked(hw, I217_SxCTRL, &phy_reg);
- phy_reg |= I217_SxCTRL_MASK;
+ phy_reg |= I217_SxCTRL_ENABLE_LPI_RESET;
e1e_wphy_locked(hw, I217_SxCTRL, phy_reg);
/* Disable the SMB release on LCD reset. */
e1e_rphy_locked(hw, I217_MEMPWR, &phy_reg);
- phy_reg &= ~I217_MEMPWR;
+ phy_reg &= ~I217_MEMPWR_DISABLE_SMB_RELEASE;
e1e_wphy_locked(hw, I217_MEMPWR, phy_reg);
}
@@ -4103,7 +4103,7 @@ void e1000_suspend_workarounds_ich8lan(struct e1000_hw *hw)
* Support
*/
e1e_rphy_locked(hw, I217_CGFREG, &phy_reg);
- phy_reg |= I217_CGFREG_MASK;
+ phy_reg |= I217_CGFREG_ENABLE_MTA_RESET;
e1e_wphy_locked(hw, I217_CGFREG, phy_reg);
release:
@@ -4176,7 +4176,7 @@ void e1000_resume_workarounds_pchlan(struct e1000_hw *hw)
ret_val = e1e_rphy_locked(hw, I217_MEMPWR, &phy_reg);
if (ret_val)
goto release;
- phy_reg |= I217_MEMPWR_MASK;
+ phy_reg |= I217_MEMPWR_DISABLE_SMB_RELEASE;
e1e_wphy_locked(hw, I217_MEMPWR, phy_reg);
/* Disable Proxy */
@@ -4186,7 +4186,7 @@ void e1000_resume_workarounds_pchlan(struct e1000_hw *hw)
ret_val = e1e_rphy_locked(hw, I217_CGFREG, &phy_reg);
if (ret_val)
goto release;
- phy_reg &= ~I217_CGFREG_MASK;
+ phy_reg &= ~I217_CGFREG_ENABLE_MTA_RESET;
e1e_wphy_locked(hw, I217_CGFREG, phy_reg);
release:
if (ret_val)
--
1.7.10.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [net 0/2][pull request] Intel Wired LAN Driver Update
2012-06-02 7:16 [net 0/2][pull request] Intel Wired LAN Driver Update Jeff Kirsher
2012-06-02 7:16 ` [net 1/2] e1000: look into the page instead of skb->data for e1000_tbi_adjust_stats() Jeff Kirsher
2012-06-02 7:16 ` [net 2/2] e1000e: fix Rapid Start Technology support for i217 Jeff Kirsher
@ 2012-06-02 21:08 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2012-06-02 21:08 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, sassmann
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Sat, 2 Jun 2012 00:16:54 -0700
> This series contains fixes for e1000 and e1000e.
>
> The following are changes since commit ad1be8d345416a794dea39761a374032aa471a76:
> r8169: call netif_napi_del at errpaths and at driver unload
> and are available in the git repository at:
> git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net master
>
> Bruce Allan (1):
> e1000e: fix Rapid Start Technology support for i217
>
> Sebastian Andrzej Siewior (1):
> e1000: look into the page instead of skb->data for
> e1000_tbi_adjust_stats()
Pulled, thanks Jeff.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-06-02 21:08 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-06-02 7:16 [net 0/2][pull request] Intel Wired LAN Driver Update Jeff Kirsher
2012-06-02 7:16 ` [net 1/2] e1000: look into the page instead of skb->data for e1000_tbi_adjust_stats() Jeff Kirsher
2012-06-02 7:16 ` [net 2/2] e1000e: fix Rapid Start Technology support for i217 Jeff Kirsher
2012-06-02 21:08 ` [net 0/2][pull request] Intel Wired LAN Driver Update David Miller
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.