LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] igb: Reinitialize tx/rx ring count on resume
@ 2008-11-07 19:20 Darrick J. Wong
  2008-11-07 22:54 ` [E1000-devel] " Duyck, Alexander H
  0 siblings, 1 reply; 2+ messages in thread
From: Darrick J. Wong @ 2008-11-07 19:20 UTC (permalink / raw)
  To: Darrick J. Wong, Jeff Kirsher, Jesse Brandeburg, Bruce Allan,
	PJ Waskiewicz, John Ronciak
  Cc: linux-kernel, e1000-devel


When suspending the device, adapter->[tr]x_ring structures are freed.  Upon
resume, these two pointers are reallocated but adapter->[tr]x_ring->count is
not set to any value.  This causes igb_setup_tx_resources to fail on zero-sized
buffers and thus the NIC doesn't come back up.

Signed-off-by: Darrick J. Wong <djwong@us.ibm.com>
---

 drivers/net/igb/igb_main.c |   28 +++++++++++++++++++++-------
 1 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index 1f397cd..6df8d1d 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -951,6 +951,21 @@ static int igb_is_need_ioport(struct pci_dev *pdev)
 }
 
 /**
+ * igb_set_num_queues - Initialize default queue counts for RX/TX rings
+ * @adapter: Adapter to set queue counts
+ **/
+static void igb_set_num_queues(struct igb_adapter *adapter)
+{
+	int i;
+	adapter->tx_ring->count = 256;
+	for (i = 0; i < adapter->num_tx_queues; i++)
+		adapter->tx_ring[i].count = adapter->tx_ring->count;
+	adapter->rx_ring->count = 256;
+	for (i = 0; i < adapter->num_rx_queues; i++)
+		adapter->rx_ring[i].count = adapter->rx_ring->count;
+}
+
+/**
  * igb_probe - Device Initialization Routine
  * @pdev: PCI device information struct
  * @ent: entry in igb_pci_tbl
@@ -970,7 +985,7 @@ static int __devinit igb_probe(struct pci_dev *pdev,
 	struct pci_dev *us_dev;
 	const struct e1000_info *ei = igb_info_tbl[ent->driver_data];
 	unsigned long mmio_start, mmio_len;
-	int i, err, pci_using_dac, pos;
+	int err, pci_using_dac, pos;
 	u16 eeprom_data = 0, state = 0;
 	u16 eeprom_apme_mask = IGB_EEPROM_APME;
 	u32 part_num;
@@ -1192,12 +1207,7 @@ static int __devinit igb_probe(struct pci_dev *pdev,
 	INIT_WORK(&adapter->watchdog_task, igb_watchdog_task);
 
 	/* Initialize link & ring properties that are user-changeable */
-	adapter->tx_ring->count = 256;
-	for (i = 0; i < adapter->num_tx_queues; i++)
-		adapter->tx_ring[i].count = adapter->tx_ring->count;
-	adapter->rx_ring->count = 256;
-	for (i = 0; i < adapter->num_rx_queues; i++)
-		adapter->rx_ring[i].count = adapter->rx_ring->count;
+	igb_set_num_queues(adapter);
 
 	adapter->fc_autoneg = true;
 	hw->mac.autoneg = true;
@@ -1552,9 +1562,11 @@ int igb_setup_tx_resources(struct igb_adapter *adapter,
 	int size;
 
 	size = sizeof(struct igb_buffer) * tx_ring->count;
+	WARN_ON(!size);
 	tx_ring->buffer_info = vmalloc(size);
 	if (!tx_ring->buffer_info)
 		goto err;
+
 	memset(tx_ring->buffer_info, 0, size);
 
 	/* round up to nearest 4K */
@@ -4388,6 +4400,8 @@ static int igb_resume(struct pci_dev *pdev)
 		return -ENOMEM;
 	}
 
+	igb_set_num_queues(adapter);
+
 	/* e1000_power_up_phy(adapter); */
 
 	igb_reset(adapter);


^ permalink raw reply	[flat|nested] 2+ messages in thread

* RE: [E1000-devel] [PATCH] igb: Reinitialize tx/rx ring count on resume
  2008-11-07 19:20 [PATCH] igb: Reinitialize tx/rx ring count on resume Darrick J. Wong
@ 2008-11-07 22:54 ` Duyck, Alexander H
  0 siblings, 0 replies; 2+ messages in thread
From: Duyck, Alexander H @ 2008-11-07 22:54 UTC (permalink / raw)
  To: Darrick J. Wong, Kirsher, Jeffrey T, Brandeburg, Jesse, Allan,
	Bruce W, Waskiewicz Jr, Peter P, Ronciak, John
  Cc: e1000-devel, linux-kernel

Darrick J. Wong wrote:
> When suspending the device, adapter->[tr]x_ring structures are freed.
> Upon resume, these two pointers are reallocated but
> adapter->[tr]x_ring->count is not set to any value.  This causes
> igb_setup_tx_resources to fail on zero-sized buffers and thus the NIC
> doesn't come back up. 

This patch is a good start, but it ends up resetting the ring sizes on a suspend/resume which we really shouldn't be doing.  I will see about pushing a patch with the ring sizes moved up into the adapter struct.  This should help to resolve the issue and maintain the ring count through suspend/resume.

Thanks,

Alex

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2008-11-07 22:55 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-11-07 19:20 [PATCH] igb: Reinitialize tx/rx ring count on resume Darrick J. Wong
2008-11-07 22:54 ` [E1000-devel] " Duyck, Alexander H

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).