Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=583aae1094d28aa1d58360318388c11d2ae7ed9c
Commit:     583aae1094d28aa1d58360318388c11d2ae7ed9c
Parent:     39a3d2d19cc8dc9d7ec3a1fefe95d7de0c6dc317
Author:     Masakazu Mokuno <[EMAIL PROTECTED]>
AuthorDate: Fri Jul 20 17:35:54 2007 +0900
Committer:  Jeff Garzik <[EMAIL PROTECTED]>
CommitDate: Tue Jul 24 16:28:40 2007 -0400

    ps3: fix rare issue that reenabling rx DMA fails
    
    Fixed rare issue that 'lv1_net_start_rx_dma failed, status=-9" was shown
    in dmesg.  This meant restarting rx DMA had been rejected by the hypervisor.
    This issue would caused if the guest os requested starting DMA when
    the hypervisor thought the DMA was in progress.
    The state machine for DMA status of the hypervisor would be updated
    by processing interrupt in the hypervisor.
    Thus we should wait for the interrupt delivery before restarting
    DMA.
    
    Signed-off-by: Masakazu Mokuno <[EMAIL PROTECTED]>
    Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
---
 drivers/net/ps3_gelic_net.c |    9 +++++++--
 drivers/net/ps3_gelic_net.h |    1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ps3_gelic_net.c b/drivers/net/ps3_gelic_net.c
index 518c5c3..d596df9 100644
--- a/drivers/net/ps3_gelic_net.c
+++ b/drivers/net/ps3_gelic_net.c
@@ -943,8 +943,8 @@ refill:
        descr->prev->next_descr_addr = descr->bus_addr;
 
        if (dmac_chain_ended) {
-               gelic_net_enable_rxdmac(card);
-               dev_dbg(ctodev(card), "reenable rx dma\n");
+               card->rx_dma_restart_required = 1;
+               dev_dbg(ctodev(card), "reenable rx dma scheduled\n");
        }
 
        return 1;
@@ -1020,6 +1020,11 @@ static irqreturn_t gelic_net_interrupt(int irq, void 
*ptr)
        if (!status)
                return IRQ_NONE;
 
+       if (card->rx_dma_restart_required) {
+               card->rx_dma_restart_required = 0;
+               gelic_net_enable_rxdmac(card);
+       }
+
        if (status & GELIC_NET_RXINT) {
                gelic_net_rx_irq_off(card);
                netif_rx_schedule(netdev);
diff --git a/drivers/net/ps3_gelic_net.h b/drivers/net/ps3_gelic_net.h
index 030e2e2..01d729b 100644
--- a/drivers/net/ps3_gelic_net.h
+++ b/drivers/net/ps3_gelic_net.h
@@ -206,6 +206,7 @@ struct gelic_net_card {
 
        struct gelic_net_descr_chain tx_chain;
        struct gelic_net_descr_chain rx_chain;
+       int rx_dma_restart_required;
        /* gurad dmac descriptor chain*/
        spinlock_t chain_lock;
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to