* [net-next 0/4][pull request] Intel Wired LAN Driver Updates
@ 2012-05-17 11:27 Jeff Kirsher
2012-05-17 11:27 ` [net-next 1/4] e1000e: fix typo in definition of E1000_CTRL_EXT_FORCE_SMBUS Jeff Kirsher
` (5 more replies)
0 siblings, 6 replies; 14+ messages in thread
From: Jeff Kirsher @ 2012-05-17 11:27 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
This series of patches contains updates for e1000, e1000e and igb.
The following are changes since commit dc6b9b78234fecdc6d2ca5e1629185718202bcf5:
net: include/net/sock.h cleanup
and are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Bruce Allan (1):
e1000e: fix typo in definition of E1000_CTRL_EXT_FORCE_SMBUS
Matthew Vick (1):
igb: Disable the BMC-to-OS Watchdog Enable bit for DMAC.
Sebastian Andrzej Siewior (2):
e1000: remove workaround for Errata 23 from jumbo alloc
e1000: look in the page and not in skb->data for the last byte
drivers/net/ethernet/intel/e1000/e1000_main.c | 30 ++++--------------------
drivers/net/ethernet/intel/e1000e/defines.h | 2 +-
drivers/net/ethernet/intel/igb/e1000_defines.h | 2 +
drivers/net/ethernet/intel/igb/igb_main.c | 3 ++
4 files changed, 11 insertions(+), 26 deletions(-)
--
1.7.7.6
^ permalink raw reply [flat|nested] 14+ messages in thread
* [net-next 1/4] e1000e: fix typo in definition of E1000_CTRL_EXT_FORCE_SMBUS
2012-05-17 11:27 [net-next 0/4][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
@ 2012-05-17 11:27 ` Jeff Kirsher
2012-05-17 11:27 ` [net-next 2/4] e1000: remove workaround for Errata 23 from jumbo alloc Jeff Kirsher
` (4 subsequent siblings)
5 siblings, 0 replies; 14+ messages in thread
From: Jeff Kirsher @ 2012-05-17 11:27 UTC (permalink / raw)
To: davem; +Cc: Bruce Allan, netdev, gospo, sassmann, Jeff Kirsher
From: Bruce Allan <bruce.w.allan@intel.com>
This define is needed by i217.
Reported-by: Bjorn Mork <bjorn@mork.no>
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/defines.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/ethernet/intel/e1000e/defines.h b/drivers/net/ethernet/intel/e1000e/defines.h
index 11c4666..351a409 100644
--- a/drivers/net/ethernet/intel/e1000e/defines.h
+++ b/drivers/net/ethernet/intel/e1000e/defines.h
@@ -76,7 +76,7 @@
/* Extended Device Control */
#define E1000_CTRL_EXT_LPCD 0x00000004 /* LCD Power Cycle Done */
#define E1000_CTRL_EXT_SDP3_DATA 0x00000080 /* Value of SW Definable Pin 3 */
-#define E1000_CTRL_EXT_FORCE_SMBUS 0x00000004 /* Force SMBus mode*/
+#define E1000_CTRL_EXT_FORCE_SMBUS 0x00000800 /* Force SMBus mode */
#define E1000_CTRL_EXT_EE_RST 0x00002000 /* Reinitialize from EEPROM */
#define E1000_CTRL_EXT_SPD_BYPS 0x00008000 /* Speed Select Bypass */
#define E1000_CTRL_EXT_RO_DIS 0x00020000 /* Relaxed Ordering disable */
--
1.7.7.6
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [net-next 2/4] e1000: remove workaround for Errata 23 from jumbo alloc
2012-05-17 11:27 [net-next 0/4][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2012-05-17 11:27 ` [net-next 1/4] e1000e: fix typo in definition of E1000_CTRL_EXT_FORCE_SMBUS Jeff Kirsher
@ 2012-05-17 11:27 ` Jeff Kirsher
2012-05-17 14:40 ` Ben Hutchings
2012-05-17 11:27 ` [net-next 3/4] e1000: look in the page and not in skb->data for the last byte Jeff Kirsher
` (3 subsequent siblings)
5 siblings, 1 reply; 14+ messages in thread
From: Jeff Kirsher @ 2012-05-17 11:27 UTC (permalink / raw)
To: davem; +Cc: Sebastian Andrzej Siewior, netdev, gospo, sassmann, Jeff Kirsher
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
According to the comment, errata 23 says that the memory we allocate
can't cross a 64KiB boundary. In case of jumbo frames we allocate
complete pages which can never cross the 64KiB boundary because
PAGE_SIZE should be a multiple of 64KiB so we stop either before the
boundary or start after it but never cross it. Furthermore the check
seems bogus because it looks at skb->data which is not seen by the HW
at all because we only pass the DMA address of the page we allocated. So
I *think* the workaround is not required here.
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 | 24 ------------------------
1 files changed, 0 insertions(+), 24 deletions(-)
diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
index f1aef68..fefbf4d 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_main.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
@@ -4391,30 +4391,6 @@ e1000_alloc_jumbo_rx_buffers(struct e1000_adapter *adapter,
break;
}
- /* Fix for errata 23, can't cross 64kB boundary */
- if (!e1000_check_64k_bound(adapter, skb->data, bufsz)) {
- struct sk_buff *oldskb = skb;
- e_err(rx_err, "skb align check failed: %u bytes at "
- "%p\n", bufsz, skb->data);
- /* Try again, without freeing the previous */
- skb = netdev_alloc_skb_ip_align(netdev, bufsz);
- /* Failed allocation, critical failure */
- if (!skb) {
- dev_kfree_skb(oldskb);
- adapter->alloc_rx_buff_failed++;
- break;
- }
-
- if (!e1000_check_64k_bound(adapter, skb->data, bufsz)) {
- /* give up */
- dev_kfree_skb(skb);
- dev_kfree_skb(oldskb);
- break; /* while (cleaned_count--) */
- }
-
- /* Use new allocation */
- dev_kfree_skb(oldskb);
- }
buffer_info->skb = skb;
buffer_info->length = adapter->rx_buffer_len;
check_page:
--
1.7.7.6
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [net-next 3/4] e1000: look in the page and not in skb->data for the last byte
2012-05-17 11:27 [net-next 0/4][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2012-05-17 11:27 ` [net-next 1/4] e1000e: fix typo in definition of E1000_CTRL_EXT_FORCE_SMBUS Jeff Kirsher
2012-05-17 11:27 ` [net-next 2/4] e1000: remove workaround for Errata 23 from jumbo alloc Jeff Kirsher
@ 2012-05-17 11:27 ` Jeff Kirsher
2012-05-17 11:38 ` Sebastian Andrzej Siewior
2012-05-17 11:27 ` [net-next 4/4] igb: Disable the BMC-to-OS Watchdog Enable bit for DMAC Jeff Kirsher
` (2 subsequent siblings)
5 siblings, 1 reply; 14+ messages in thread
From: Jeff Kirsher @ 2012-05-17 11:27 UTC (permalink / raw)
To: davem; +Cc: Sebastian Andrzej Siewior, netdev, gospo, sassmann, Jeff Kirsher
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
The code seems to want to look at the last byte where the HW puts some
information. Since the skb->data area is never seen by the HW I guess it
does not work as expected. We pass the page address to the HW so I
*think* in order to get to the last byte where the information might be
one should use the page buffer and take a look.
This is of course not more than just compile tested.
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 | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
index fefbf4d..6ac80c8 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_main.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
@@ -4066,7 +4066,11 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_adapter *adapter,
/* errors is only valid for DD + EOP descriptors */
if (unlikely((status & E1000_RXD_STAT_EOP) &&
(rx_desc->errors & E1000_RXD_ERR_FRAME_ERR_MASK))) {
- u8 last_byte = *(skb->data + length - 1);
+ u8 *mapped;
+ u8 last_byte;
+
+ mapped = kmap_atomic(buffer_info->page);
+ last_byte = *(mapped + length - 1);
if (TBI_ACCEPT(hw, status, rx_desc->errors, length,
last_byte)) {
spin_lock_irqsave(&adapter->stats_lock,
--
1.7.7.6
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [net-next 4/4] igb: Disable the BMC-to-OS Watchdog Enable bit for DMAC.
2012-05-17 11:27 [net-next 0/4][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
` (2 preceding siblings ...)
2012-05-17 11:27 ` [net-next 3/4] e1000: look in the page and not in skb->data for the last byte Jeff Kirsher
@ 2012-05-17 11:27 ` Jeff Kirsher
2012-05-17 11:51 ` [net-next 0/4][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2012-05-17 19:12 ` David Miller
5 siblings, 0 replies; 14+ messages in thread
From: Jeff Kirsher @ 2012-05-17 11:27 UTC (permalink / raw)
To: davem; +Cc: Matthew Vick, netdev, gospo, sassmann, Jeff Kirsher
From: Matthew Vick <matthew.vick@intel.com>
Under certain scenarios, it's possible that bursty manageability traffic
over the BMC-to-OS path may overrun the internal manageability receive
buffer causing dropped manageability packets. Clearing this bit prevents
this situation by interrupting coalescing to allow manageability traffic
through.
Signed-off-by: Matthew Vick <matthew.vick@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/igb/e1000_defines.h | 2 ++
drivers/net/ethernet/intel/igb/igb_main.c | 3 +++
2 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/drivers/net/ethernet/intel/igb/e1000_defines.h b/drivers/net/ethernet/intel/igb/e1000_defines.h
index 6409f85..ec7e4fe 100644
--- a/drivers/net/ethernet/intel/igb/e1000_defines.h
+++ b/drivers/net/ethernet/intel/igb/e1000_defines.h
@@ -301,6 +301,8 @@
* transactions */
#define E1000_DMACR_DMAC_LX_SHIFT 28
#define E1000_DMACR_DMAC_EN 0x80000000 /* Enable DMA Coalescing */
+/* DMA Coalescing BMC-to-OS Watchdog Enable */
+#define E1000_DMACR_DC_BMC2OSW_EN 0x00008000
#define E1000_DMCTXTH_DMCTTHR_MASK 0x00000FFF /* DMA Coalescing Transmit
* Threshold */
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 9bbf1a2..dd3bfe8 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -7147,6 +7147,9 @@ static void igb_init_dmac(struct igb_adapter *adapter, u32 pba)
/* watchdog timer= +-1000 usec in 32usec intervals */
reg |= (1000 >> 5);
+
+ /* Disable BMC-to-OS Watchdog Enable */
+ reg &= ~E1000_DMACR_DC_BMC2OSW_EN;
wr32(E1000_DMACR, reg);
/*
--
1.7.7.6
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [net-next 3/4] e1000: look in the page and not in skb->data for the last byte
2012-05-17 11:27 ` [net-next 3/4] e1000: look in the page and not in skb->data for the last byte Jeff Kirsher
@ 2012-05-17 11:38 ` Sebastian Andrzej Siewior
2012-05-17 11:50 ` Jeff Kirsher
0 siblings, 1 reply; 14+ messages in thread
From: Sebastian Andrzej Siewior @ 2012-05-17 11:38 UTC (permalink / raw)
To: Jeff Kirsher; +Cc: davem, netdev, gospo, sassmann
On 05/17/2012 01:27 PM, Jeff Kirsher wrote:
> diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
> index fefbf4d..6ac80c8 100644
> --- a/drivers/net/ethernet/intel/e1000/e1000_main.c
> +++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
> @@ -4066,7 +4066,11 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_adapter *adapter,
> /* errors is only valid for DD + EOP descriptors */
> if (unlikely((status& E1000_RXD_STAT_EOP)&&
> (rx_desc->errors& E1000_RXD_ERR_FRAME_ERR_MASK))) {
> - u8 last_byte = *(skb->data + length - 1);
> + u8 *mapped;
> + u8 last_byte;
> +
> + mapped = kmap_atomic(buffer_info->page);
> + last_byte = *(mapped + length - 1);
> if (TBI_ACCEPT(hw, status, rx_desc->errors, length,
> last_byte)) {
> spin_lock_irqsave(&adapter->stats_lock,
This is not what I've sent. My original patch [0] hat a unmap as well.
One comment was, that kmap_atomic() is too much overhead because the
page can never be highmem. So I changed it to page_address() [1].
[0] http://permalink.gmane.org/gmane.linux.drivers.e1000.devel/10008
[1] http://permalink.gmane.org/gmane.linux.drivers.e1000.devel/10012
Sebastian
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [net-next 3/4] e1000: look in the page and not in skb->data for the last byte
2012-05-17 11:38 ` Sebastian Andrzej Siewior
@ 2012-05-17 11:50 ` Jeff Kirsher
2012-05-17 11:56 ` Sebastian Andrzej Siewior
0 siblings, 1 reply; 14+ messages in thread
From: Jeff Kirsher @ 2012-05-17 11:50 UTC (permalink / raw)
To: Sebastian Andrzej Siewior; +Cc: davem, netdev, gospo, sassmann
[-- Attachment #1: Type: text/plain, Size: 1547 bytes --]
On Thu, 2012-05-17 at 13:38 +0200, Sebastian Andrzej Siewior wrote:
> On 05/17/2012 01:27 PM, Jeff Kirsher wrote:
> > diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
> > index fefbf4d..6ac80c8 100644
> > --- a/drivers/net/ethernet/intel/e1000/e1000_main.c
> > +++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
> > @@ -4066,7 +4066,11 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_adapter *adapter,
> > /* errors is only valid for DD + EOP descriptors */
> > if (unlikely((status& E1000_RXD_STAT_EOP)&&
> > (rx_desc->errors& E1000_RXD_ERR_FRAME_ERR_MASK))) {
> > - u8 last_byte = *(skb->data + length - 1);
> > + u8 *mapped;
> > + u8 last_byte;
> > +
> > + mapped = kmap_atomic(buffer_info->page);
> > + last_byte = *(mapped + length - 1);
> > if (TBI_ACCEPT(hw, status, rx_desc->errors, length,
> > last_byte)) {
> > spin_lock_irqsave(&adapter->stats_lock,
>
> This is not what I've sent. My original patch [0] hat a unmap as well.
> One comment was, that kmap_atomic() is too much overhead because the
> page can never be highmem. So I changed it to page_address() [1].
>
> [0] http://permalink.gmane.org/gmane.linux.drivers.e1000.devel/10008
> [1] http://permalink.gmane.org/gmane.linux.drivers.e1000.devel/10012
>
> Sebastian
Your correct, I apologize. This was my fault, I applied your v1 of the
patch and then realized there was a v2.
I will re-send the series with the correct patch.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [net-next 0/4][pull request] Intel Wired LAN Driver Updates
2012-05-17 11:27 [net-next 0/4][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
` (3 preceding siblings ...)
2012-05-17 11:27 ` [net-next 4/4] igb: Disable the BMC-to-OS Watchdog Enable bit for DMAC Jeff Kirsher
@ 2012-05-17 11:51 ` Jeff Kirsher
2012-05-17 19:12 ` David Miller
5 siblings, 0 replies; 14+ messages in thread
From: Jeff Kirsher @ 2012-05-17 11:51 UTC (permalink / raw)
To: davem; +Cc: netdev, gospo, sassmann
[-- Attachment #1: Type: text/plain, Size: 1082 bytes --]
On Thu, 2012-05-17 at 04:27 -0700, Jeff Kirsher wrote:
> This series of patches contains updates for e1000, e1000e and igb.
>
> The following are changes since commit dc6b9b78234fecdc6d2ca5e1629185718202bcf5:
> net: include/net/sock.h cleanup
> and are available in the git repository at:
> git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
>
> Bruce Allan (1):
> e1000e: fix typo in definition of E1000_CTRL_EXT_FORCE_SMBUS
>
> Matthew Vick (1):
> igb: Disable the BMC-to-OS Watchdog Enable bit for DMAC.
>
> Sebastian Andrzej Siewior (2):
> e1000: remove workaround for Errata 23 from jumbo alloc
> e1000: look in the page and not in skb->data for the last byte
>
> drivers/net/ethernet/intel/e1000/e1000_main.c | 30 ++++--------------------
> drivers/net/ethernet/intel/e1000e/defines.h | 2 +-
> drivers/net/ethernet/intel/igb/e1000_defines.h | 2 +
> drivers/net/ethernet/intel/igb/igb_main.c | 3 ++
> 4 files changed, 11 insertions(+), 26 deletions(-)
>
v2 of the series will be coming.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [net-next 3/4] e1000: look in the page and not in skb->data for the last byte
2012-05-17 11:50 ` Jeff Kirsher
@ 2012-05-17 11:56 ` Sebastian Andrzej Siewior
2012-05-17 12:02 ` Jeff Kirsher
0 siblings, 1 reply; 14+ messages in thread
From: Sebastian Andrzej Siewior @ 2012-05-17 11:56 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: davem, netdev, gospo, sassmann
On 05/17/2012 01:50 PM, Jeff Kirsher wrote:
>
> Your correct, I apologize. This was my fault, I applied your v1 of the
> patch and then realized there was a v2.
>
> I will re-send the series with the correct patch.
Okay. I haven't seen [0] in the series. Did you merge it somewhere?
[0] http://thread.gmane.org/gmane.linux.drivers.e1000.devel/10019
Sebastian
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [net-next 3/4] e1000: look in the page and not in skb->data for the last byte
2012-05-17 11:56 ` Sebastian Andrzej Siewior
@ 2012-05-17 12:02 ` Jeff Kirsher
0 siblings, 0 replies; 14+ messages in thread
From: Jeff Kirsher @ 2012-05-17 12:02 UTC (permalink / raw)
To: Sebastian Andrzej Siewior; +Cc: davem, netdev, gospo, sassmann
[-- Attachment #1: Type: text/plain, Size: 675 bytes --]
On Thu, 2012-05-17 at 13:56 +0200, Sebastian Andrzej Siewior wrote:
> On 05/17/2012 01:50 PM, Jeff Kirsher wrote:
> >
> > Your correct, I apologize. This was my fault, I applied your v1 of the
> > patch and then realized there was a v2.
> >
> > I will re-send the series with the correct patch.
>
> Okay. I haven't seen [0] in the series. Did you merge it somewhere?
>
> [0] http://thread.gmane.org/gmane.linux.drivers.e1000.devel/10019
>
> Sebastian
No, not yet. Aaron is still validating that patch since it was actually
the last one you sent me. I expect to be pushing it in the next day or
so with some ixgbe patches, once it finishes validation.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [net-next 2/4] e1000: remove workaround for Errata 23 from jumbo alloc
2012-05-17 11:27 ` [net-next 2/4] e1000: remove workaround for Errata 23 from jumbo alloc Jeff Kirsher
@ 2012-05-17 14:40 ` Ben Hutchings
2012-05-17 19:32 ` David Miller
0 siblings, 1 reply; 14+ messages in thread
From: Ben Hutchings @ 2012-05-17 14:40 UTC (permalink / raw)
To: Jeff Kirsher; +Cc: davem, Sebastian Andrzej Siewior, netdev, gospo, sassmann
On Thu, 2012-05-17 at 04:27 -0700, Jeff Kirsher wrote:
> From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
>
> According to the comment, errata 23 says that the memory we allocate
> can't cross a 64KiB boundary. In case of jumbo frames we allocate
> complete pages which can never cross the 64KiB boundary because
> PAGE_SIZE should be a multiple of 64KiB so we stop either before the
Should be a factor, not multiple.
[...]
> --- a/drivers/net/ethernet/intel/e1000/e1000_main.c
> +++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
> @@ -4391,30 +4391,6 @@ e1000_alloc_jumbo_rx_buffers(struct e1000_adapter *adapter,
> break;
> }
>
> - /* Fix for errata 23, can't cross 64kB boundary */
> - if (!e1000_check_64k_bound(adapter, skb->data, bufsz)) {
> - struct sk_buff *oldskb = skb;
> - e_err(rx_err, "skb align check failed: %u bytes at "
> - "%p\n", bufsz, skb->data);
> - /* Try again, without freeing the previous */
> - skb = netdev_alloc_skb_ip_align(netdev, bufsz);
> - /* Failed allocation, critical failure */
> - if (!skb) {
> - dev_kfree_skb(oldskb);
> - adapter->alloc_rx_buff_failed++;
> - break;
> - }
> -
> - if (!e1000_check_64k_bound(adapter, skb->data, bufsz)) {
> - /* give up */
> - dev_kfree_skb(skb);
> - dev_kfree_skb(oldskb);
> - break; /* while (cleaned_count--) */
> - }
> -
> - /* Use new allocation */
> - dev_kfree_skb(oldskb);
> - }
[...]
I don't believe PAGE_SIZE is >64K on any architecture, but perhaps you
should replace the run-time check with:
BUILD_BUG_ON(PAGE_SIZE > 0x10000);
in case that changes in future.
Ben.
--
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [net-next 0/4][pull request] Intel Wired LAN Driver Updates
2012-05-17 11:27 [net-next 0/4][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
` (4 preceding siblings ...)
2012-05-17 11:51 ` [net-next 0/4][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
@ 2012-05-17 19:12 ` David Miller
5 siblings, 0 replies; 14+ messages in thread
From: David Miller @ 2012-05-17 19:12 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, sassmann
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Thu, 17 May 2012 04:27:46 -0700
> This series of patches contains updates for e1000, e1000e and igb.
>
> The following are changes since commit dc6b9b78234fecdc6d2ca5e1629185718202bcf5:
> net: include/net/sock.h cleanup
> and are available in the git repository at:
> git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Pulled, thanks.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [net-next 2/4] e1000: remove workaround for Errata 23 from jumbo alloc
2012-05-17 14:40 ` Ben Hutchings
@ 2012-05-17 19:32 ` David Miller
0 siblings, 0 replies; 14+ messages in thread
From: David Miller @ 2012-05-17 19:32 UTC (permalink / raw)
To: bhutchings; +Cc: jeffrey.t.kirsher, bigeasy, netdev, gospo, sassmann
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Thu, 17 May 2012 15:40:30 +0100
> I don't believe PAGE_SIZE is >64K on any architecture, but perhaps you
> should replace the run-time check with:
powerpc can be built with PAGE_SHIFT == 18
^ permalink raw reply [flat|nested] 14+ messages in thread
* [net-next 1/4] e1000e: fix typo in definition of E1000_CTRL_EXT_FORCE_SMBUS
2012-05-17 12:31 [net-next v2 " Jeff Kirsher
@ 2012-05-17 12:31 ` Jeff Kirsher
0 siblings, 0 replies; 14+ messages in thread
From: Jeff Kirsher @ 2012-05-17 12:31 UTC (permalink / raw)
To: davem; +Cc: Bruce Allan, netdev, gospo, sassmann, Jeff Kirsher
From: Bruce Allan <bruce.w.allan@intel.com>
This define is needed by i217.
Reported-by: Bjorn Mork <bjorn@mork.no>
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/defines.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/ethernet/intel/e1000e/defines.h b/drivers/net/ethernet/intel/e1000e/defines.h
index 11c4666..351a409 100644
--- a/drivers/net/ethernet/intel/e1000e/defines.h
+++ b/drivers/net/ethernet/intel/e1000e/defines.h
@@ -76,7 +76,7 @@
/* Extended Device Control */
#define E1000_CTRL_EXT_LPCD 0x00000004 /* LCD Power Cycle Done */
#define E1000_CTRL_EXT_SDP3_DATA 0x00000080 /* Value of SW Definable Pin 3 */
-#define E1000_CTRL_EXT_FORCE_SMBUS 0x00000004 /* Force SMBus mode*/
+#define E1000_CTRL_EXT_FORCE_SMBUS 0x00000800 /* Force SMBus mode */
#define E1000_CTRL_EXT_EE_RST 0x00002000 /* Reinitialize from EEPROM */
#define E1000_CTRL_EXT_SPD_BYPS 0x00008000 /* Speed Select Bypass */
#define E1000_CTRL_EXT_RO_DIS 0x00020000 /* Relaxed Ordering disable */
--
1.7.7.6
^ permalink raw reply related [flat|nested] 14+ messages in thread
end of thread, other threads:[~2012-05-17 19:33 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-05-17 11:27 [net-next 0/4][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2012-05-17 11:27 ` [net-next 1/4] e1000e: fix typo in definition of E1000_CTRL_EXT_FORCE_SMBUS Jeff Kirsher
2012-05-17 11:27 ` [net-next 2/4] e1000: remove workaround for Errata 23 from jumbo alloc Jeff Kirsher
2012-05-17 14:40 ` Ben Hutchings
2012-05-17 19:32 ` David Miller
2012-05-17 11:27 ` [net-next 3/4] e1000: look in the page and not in skb->data for the last byte Jeff Kirsher
2012-05-17 11:38 ` Sebastian Andrzej Siewior
2012-05-17 11:50 ` Jeff Kirsher
2012-05-17 11:56 ` Sebastian Andrzej Siewior
2012-05-17 12:02 ` Jeff Kirsher
2012-05-17 11:27 ` [net-next 4/4] igb: Disable the BMC-to-OS Watchdog Enable bit for DMAC Jeff Kirsher
2012-05-17 11:51 ` [net-next 0/4][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2012-05-17 19:12 ` David Miller
2012-05-17 12:31 [net-next v2 " Jeff Kirsher
2012-05-17 12:31 ` [net-next 1/4] e1000e: fix typo in definition of E1000_CTRL_EXT_FORCE_SMBUS Jeff Kirsher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).