2.6.26 -stable review patch. If anyone has any objections, please let us know. ------------------ From: Brice Goglin part of commit 0dcffac1a329be69bab0ac604bf7283737108e68 upstream (the upstream multislice patch contains this fix within a large rework of the code since there is one rx_done ring per slice. The old allocating is replaced by a call to myri10ge_probe_slices()) Allocating the rx_done ring requires mgp->max_intr_slots to be valid, which requires that we already loaded the firmware we are going to use with this ring. So move the allocating after myri10ge_load_firmware() (but keep it before myri10ge_reset() which already needs the rx_done ring). If fixedsa regression where loading the driver would not appear to do anything. Regression introduced in 2.6.26-rc3 by commit 014377a1df693ff30a9e8b69f0bbb0a38e601f75 Reported and patch tested by Lukas Hejtmanek at http://lkml.org/lkml/2008/7/22/305 Reproduced and patch tested also by me. Signed-off-by: Brice Goglin Signed-off-by: Greg Kroah-Hartman --- drivers/net/myri10ge/myri10ge.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) --- a/drivers/net/myri10ge/myri10ge.c +++ b/drivers/net/myri10ge/myri10ge.c @@ -3215,26 +3215,26 @@ static int myri10ge_probe(struct pci_dev for (i = 0; i < ETH_ALEN; i++) netdev->dev_addr[i] = mgp->mac_addr[i]; - /* allocate rx done ring */ - bytes = mgp->max_intr_slots * sizeof(*mgp->ss.rx_done.entry); - mgp->ss.rx_done.entry = dma_alloc_coherent(&pdev->dev, bytes, - &mgp->ss.rx_done.bus, GFP_KERNEL); - if (mgp->ss.rx_done.entry == NULL) - goto abort_with_ioremap; - memset(mgp->ss.rx_done.entry, 0, bytes); - myri10ge_select_firmware(mgp); status = myri10ge_load_firmware(mgp); if (status != 0) { dev_err(&pdev->dev, "failed to load firmware\n"); - goto abort_with_rx_done; + goto abort_with_ioremap; } + /* allocate rx done ring */ + bytes = mgp->max_intr_slots * sizeof(*mgp->ss.rx_done.entry); + mgp->ss.rx_done.entry = dma_alloc_coherent(&pdev->dev, bytes, + &mgp->ss.rx_done.bus, GFP_KERNEL); + if (mgp->ss.rx_done.entry == NULL) + goto abort_with_firmware; + memset(mgp->ss.rx_done.entry, 0, bytes); + status = myri10ge_reset(mgp); if (status != 0) { dev_err(&pdev->dev, "failed reset\n"); - goto abort_with_firmware; + goto abort_with_rx_done; } pci_set_drvdata(pdev, mgp); @@ -3260,7 +3260,7 @@ static int myri10ge_probe(struct pci_dev * is set to correct value if MSI is enabled */ status = myri10ge_request_irq(mgp); if (status != 0) - goto abort_with_firmware; + goto abort_with_rx_done; netdev->irq = pdev->irq; myri10ge_free_irq(mgp); @@ -3289,14 +3289,14 @@ static int myri10ge_probe(struct pci_dev abort_with_state: pci_restore_state(pdev); -abort_with_firmware: - myri10ge_dummy_rdma(mgp, 0); - abort_with_rx_done: bytes = mgp->max_intr_slots * sizeof(*mgp->ss.rx_done.entry); dma_free_coherent(&pdev->dev, bytes, mgp->ss.rx_done.entry, mgp->ss.rx_done.bus); +abort_with_firmware: + myri10ge_dummy_rdma(mgp, 0); + abort_with_ioremap: iounmap(mgp->sram); -- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/