net: ipa: always report GSI state errors

We check the state of an event ring or channel both before and after
any GSI command issued that will change that state.  In most--but
not all--cases, if the state is something different than expected we
report an error message.

Add error messages where missing, so that all unexpected states
provide information about what went wrong.  Drop the parentheses
around the state value shown in all cases.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ipa/gsi.c b/drivers/net/ipa/gsi.c
index 55226b264e3c45391d1b7b83b1e06d7ac4a37a27..7e4e54ee09b14e472c3f3a17228027dbcb1043ec 100644 (file)
--- a/drivers/net/ipa/gsi.c
+++ b/drivers/net/ipa/gsi.c
@@ -358,13 +358,15 @@ static int gsi_evt_ring_alloc_command(struct gsi *gsi, u32 evt_ring_id)
 
        /* Get initial event ring state */
        evt_ring->state = gsi_evt_ring_state(gsi, evt_ring_id);
-
-       if (evt_ring->state != GSI_EVT_RING_STATE_NOT_ALLOCATED)
+       if (evt_ring->state != GSI_EVT_RING_STATE_NOT_ALLOCATED) {
+               dev_err(gsi->dev, "bad event ring state %u before alloc\n",
+                       evt_ring->state);
                return -EINVAL;
+       }
 
        ret = evt_ring_command(gsi, evt_ring_id, GSI_EVT_ALLOCATE);
        if (!ret && evt_ring->state != GSI_EVT_RING_STATE_ALLOCATED) {
-               dev_err(gsi->dev, "bad event ring state (%u) after alloc\n",
+               dev_err(gsi->dev, "bad event ring state %u after alloc\n",
                        evt_ring->state);
                ret = -EIO;
        }
@@ -381,14 +383,14 @@ static void gsi_evt_ring_reset_command(struct gsi *gsi, u32 evt_ring_id)
 
        if (state != GSI_EVT_RING_STATE_ALLOCATED &&
            state != GSI_EVT_RING_STATE_ERROR) {
-               dev_err(gsi->dev, "bad event ring state (%u) before reset\n",
+               dev_err(gsi->dev, "bad event ring state %u before reset\n",
                        evt_ring->state);
                return;
        }
 
        ret = evt_ring_command(gsi, evt_ring_id, GSI_EVT_RESET);
        if (!ret && evt_ring->state != GSI_EVT_RING_STATE_ALLOCATED)
-               dev_err(gsi->dev, "bad event ring state (%u) after reset\n",
+               dev_err(gsi->dev, "bad event ring state %u after reset\n",
                        evt_ring->state);
 }
 
@@ -399,14 +401,14 @@ static void gsi_evt_ring_de_alloc_command(struct gsi *gsi, u32 evt_ring_id)
        int ret;
 
        if (evt_ring->state != GSI_EVT_RING_STATE_ALLOCATED) {
-               dev_err(gsi->dev, "bad event ring state (%u) before dealloc\n",
+               dev_err(gsi->dev, "bad event ring state %u before dealloc\n",
                        evt_ring->state);
                return;
        }
 
        ret = evt_ring_command(gsi, evt_ring_id, GSI_EVT_DE_ALLOC);
        if (!ret && evt_ring->state != GSI_EVT_RING_STATE_NOT_ALLOCATED)
-               dev_err(gsi->dev, "bad event ring state (%u) after dealloc\n",
+               dev_err(gsi->dev, "bad event ring state %u after dealloc\n",
                        evt_ring->state);
 }
 
@@ -448,21 +450,23 @@ gsi_channel_command(struct gsi_channel *channel, enum gsi_ch_cmd_opcode opcode)
 static int gsi_channel_alloc_command(struct gsi *gsi, u32 channel_id)
 {
        struct gsi_channel *channel = &gsi->channel[channel_id];
+       struct device *dev = gsi->dev;
        enum gsi_channel_state state;
        int ret;
 
        /* Get initial channel state */
        state = gsi_channel_state(channel);
-       if (state != GSI_CHANNEL_STATE_NOT_ALLOCATED)
+       if (state != GSI_CHANNEL_STATE_NOT_ALLOCATED) {
+               dev_err(dev, "bad channel state %u before alloc\n", state);
                return -EINVAL;
+       }
 
        ret = gsi_channel_command(channel, GSI_CH_ALLOCATE);
 
        /* Channel state will normally have been updated */
        state = gsi_channel_state(channel);
        if (!ret && state != GSI_CHANNEL_STATE_ALLOCATED) {
-               dev_err(gsi->dev, "bad channel state (%u) after alloc\n",
-                       state);
+               dev_err(dev, "bad channel state %u after alloc\n", state);
                ret = -EIO;
        }
 
@@ -472,21 +476,23 @@ static int gsi_channel_alloc_command(struct gsi *gsi, u32 channel_id)
 /* Start an ALLOCATED channel */
 static int gsi_channel_start_command(struct gsi_channel *channel)
 {
+       struct device *dev = channel->gsi->dev;
        enum gsi_channel_state state;
        int ret;
 
        state = gsi_channel_state(channel);
        if (state != GSI_CHANNEL_STATE_ALLOCATED &&
-           state != GSI_CHANNEL_STATE_STOPPED)
+           state != GSI_CHANNEL_STATE_STOPPED) {
+               dev_err(dev, "bad channel state %u before start\n", state);
                return -EINVAL;
+       }
 
        ret = gsi_channel_command(channel, GSI_CH_START);
 
        /* Channel state will normally have been updated */
        state = gsi_channel_state(channel);
        if (!ret && state != GSI_CHANNEL_STATE_STARTED) {
-               dev_err(channel->gsi->dev,
-                       "bad channel state (%u) after start\n", state);
+               dev_err(dev, "bad channel state %u after start\n", state);
                ret = -EIO;
        }
 
@@ -496,13 +502,16 @@ static int gsi_channel_start_command(struct gsi_channel *channel)
 /* Stop a GSI channel in STARTED state */
 static int gsi_channel_stop_command(struct gsi_channel *channel)
 {
+       struct device *dev = channel->gsi->dev;
        enum gsi_channel_state state;
        int ret;
 
        state = gsi_channel_state(channel);
        if (state != GSI_CHANNEL_STATE_STARTED &&
-           state != GSI_CHANNEL_STATE_STOP_IN_PROC)
+           state != GSI_CHANNEL_STATE_STOP_IN_PROC) {
+               dev_err(dev, "bad channel state %u before stop\n", state);
                return -EINVAL;
+       }
 
        ret = gsi_channel_command(channel, GSI_CH_STOP);
 
@@ -515,8 +524,7 @@ static int gsi_channel_stop_command(struct gsi_channel *channel)
        if (state == GSI_CHANNEL_STATE_STOP_IN_PROC)
                return -EAGAIN;
 
-       dev_err(channel->gsi->dev,
-               "bad channel state (%u) after stop\n", state);
+       dev_err(dev, "bad channel state %u after stop\n", state);
 
        return -EIO;
 }
@@ -524,6 +532,7 @@ static int gsi_channel_stop_command(struct gsi_channel *channel)
 /* Reset a GSI channel in ALLOCATED or ERROR state. */
 static void gsi_channel_reset_command(struct gsi_channel *channel)
 {
+       struct device *dev = channel->gsi->dev;
        enum gsi_channel_state state;
        int ret;
 
@@ -532,8 +541,7 @@ static void gsi_channel_reset_command(struct gsi_channel *channel)
        state = gsi_channel_state(channel);
        if (state != GSI_CHANNEL_STATE_STOPPED &&
            state != GSI_CHANNEL_STATE_ERROR) {
-               dev_err(channel->gsi->dev,
-                       "bad channel state (%u) before reset\n", state);
+               dev_err(dev, "bad channel state %u before reset\n", state);
                return;
        }
 
@@ -542,21 +550,20 @@ static void gsi_channel_reset_command(struct gsi_channel *channel)
        /* Channel state will normally have been updated */
        state = gsi_channel_state(channel);
        if (!ret && state != GSI_CHANNEL_STATE_ALLOCATED)
-               dev_err(channel->gsi->dev,
-                       "bad channel state (%u) after reset\n", state);
+               dev_err(dev, "bad channel state %u after reset\n", state);
 }
 
 /* Deallocate an ALLOCATED GSI channel */
 static void gsi_channel_de_alloc_command(struct gsi *gsi, u32 channel_id)
 {
        struct gsi_channel *channel = &gsi->channel[channel_id];
+       struct device *dev = gsi->dev;
        enum gsi_channel_state state;
        int ret;
 
        state = gsi_channel_state(channel);
        if (state != GSI_CHANNEL_STATE_ALLOCATED) {
-               dev_err(gsi->dev,
-                       "bad channel state (%u) before dealloc\n", state);
+               dev_err(dev, "bad channel state %u before dealloc\n", state);
                return;
        }
 
@@ -565,8 +572,7 @@ static void gsi_channel_de_alloc_command(struct gsi *gsi, u32 channel_id)
        /* Channel state will normally have been updated */
        state = gsi_channel_state(channel);
        if (!ret && state != GSI_CHANNEL_STATE_NOT_ALLOCATED)
-               dev_err(gsi->dev,
-                       "bad channel state (%u) after dealloc\n", state);
+               dev_err(dev, "bad channel state %u after dealloc\n", state);
 }
 
 /* Ring an event ring doorbell, reporting the last entry processed by the AP.