NTB: handle link up, D0 and D3 events correctly

Just like for Link-Down event, Link-Up and D3 events
are also mutually exclusive to Link-Down and D0 events
respectively. So we clear the bitmasks in peer_sta
depending on event type.

Signed-off-by: Arindam Nath <arindam.nath@amd.com>
Signed-off-by: Jon Mason <jdmason@kudzu.us>

diff --git a/drivers/ntb/hw/amd/ntb_hw_amd.c b/drivers/ntb/hw/amd/ntb_hw_amd.c
index d933a1dffdc68fd3bea545b5f5c84fd41ab4c76f..a1c4a21c58c314bcf943d25221c487354769d37b 100644 (file)
--- a/drivers/ntb/hw/amd/ntb_hw_amd.c
+++ b/drivers/ntb/hw/amd/ntb_hw_amd.c
@@ -568,6 +568,11 @@ static void amd_handle_event(struct amd_ntb_dev *ndev, int vec)
        case AMD_PEER_PMETO_EVENT:
        case AMD_LINK_UP_EVENT:
                ndev->peer_sta |= status;
+               if (status == AMD_LINK_UP_EVENT)
+                       ndev->peer_sta &= ~AMD_LINK_DOWN_EVENT;
+               else if (status == AMD_PEER_D3_EVENT)
+                       ndev->peer_sta &= ~AMD_PEER_D0_EVENT;
+
                amd_ack_smu(ndev, status);
 
                /* link down */
@@ -582,6 +587,7 @@ static void amd_handle_event(struct amd_ntb_dev *ndev, int vec)
                        dev_info(dev, "Wakeup is done.\n");
 
                ndev->peer_sta |= AMD_PEER_D0_EVENT;
+               ndev->peer_sta &= ~AMD_PEER_D3_EVENT;
                amd_ack_smu(ndev, AMD_PEER_D0_EVENT);
 
                /* start a timer to poll link status */