net: ipa: do not cache event ring state

An event ring's state only needs to be known when it is allocated,
reset, or deallocated.  We check an event ring's state both before
and after performing an event ring control command that changes
its state.  These are only issued at startup and shutdown, so there
is very little value in caching the state.

Stop recording a copy of the channel's last known state, and instead
fetch the true state from hardware whenever it's needed.  In such
cases, *do* record the state in a local variable, in case an error
message reports it (so the value reported is the value seen).

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ipa/gsi.c b/drivers/net/ipa/gsi.c
index 60eb765c5364792a6a9b62129d15a4dfa9d48d65..511c94f66036c176fbdbb9c46d9bec945103a349 100644 (file)
--- a/drivers/net/ipa/gsi.c
+++ b/drivers/net/ipa/gsi.c
@@ -408,30 +408,31 @@ static void gsi_evt_ring_command(struct gsi *gsi, u32 evt_ring_id,
                return;
 
        dev_err(dev, "GSI command %u for event ring %u timed out, state %u\n",
-               opcode, evt_ring_id, evt_ring->state);
+               opcode, evt_ring_id, gsi_evt_ring_state(gsi, evt_ring_id));
 }
 
 /* Allocate an event ring in NOT_ALLOCATED state */
 static int gsi_evt_ring_alloc_command(struct gsi *gsi, u32 evt_ring_id)
 {
-       struct gsi_evt_ring *evt_ring = &gsi->evt_ring[evt_ring_id];
+       enum gsi_evt_ring_state state;
 
        /* 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) {
+       state = gsi_evt_ring_state(gsi, evt_ring_id);
+       if (state != GSI_EVT_RING_STATE_NOT_ALLOCATED) {
                dev_err(gsi->dev, "event ring %u bad state %u before alloc\n",
-                       evt_ring_id, evt_ring->state);
+                       evt_ring_id, state);
                return -EINVAL;
        }
 
        gsi_evt_ring_command(gsi, evt_ring_id, GSI_EVT_ALLOCATE);
 
        /* If successful the event ring state will have changed */
-       if (evt_ring->state == GSI_EVT_RING_STATE_ALLOCATED)
+       state = gsi_evt_ring_state(gsi, evt_ring_id);
+       if (state == GSI_EVT_RING_STATE_ALLOCATED)
                return 0;
 
        dev_err(gsi->dev, "event ring %u bad state %u after alloc\n",
-               evt_ring_id, evt_ring->state);
+               evt_ring_id, state);
 
        return -EIO;
 }
@@ -439,45 +440,48 @@ static int gsi_evt_ring_alloc_command(struct gsi *gsi, u32 evt_ring_id)
 /* Reset a GSI event ring in ALLOCATED or ERROR state. */
 static void gsi_evt_ring_reset_command(struct gsi *gsi, u32 evt_ring_id)
 {
-       struct gsi_evt_ring *evt_ring = &gsi->evt_ring[evt_ring_id];
-       enum gsi_evt_ring_state state = evt_ring->state;
+       enum gsi_evt_ring_state state;
 
+       state = gsi_evt_ring_state(gsi, evt_ring_id);
        if (state != GSI_EVT_RING_STATE_ALLOCATED &&
            state != GSI_EVT_RING_STATE_ERROR) {
                dev_err(gsi->dev, "event ring %u bad state %u before reset\n",
-                       evt_ring_id, evt_ring->state);
+                       evt_ring_id, state);
                return;
        }
 
        gsi_evt_ring_command(gsi, evt_ring_id, GSI_EVT_RESET);
 
        /* If successful the event ring state will have changed */
-       if (evt_ring->state == GSI_EVT_RING_STATE_ALLOCATED)
+       state = gsi_evt_ring_state(gsi, evt_ring_id);
+       if (state == GSI_EVT_RING_STATE_ALLOCATED)
                return;
 
        dev_err(gsi->dev, "event ring %u bad state %u after reset\n",
-               evt_ring_id, evt_ring->state);
+               evt_ring_id, state);
 }
 
 /* Issue a hardware de-allocation request for an allocated event ring */
 static void gsi_evt_ring_de_alloc_command(struct gsi *gsi, u32 evt_ring_id)
 {
-       struct gsi_evt_ring *evt_ring = &gsi->evt_ring[evt_ring_id];
+       enum gsi_evt_ring_state state;
 
-       if (evt_ring->state != GSI_EVT_RING_STATE_ALLOCATED) {
+       state = gsi_evt_ring_state(gsi, evt_ring_id);
+       if (state != GSI_EVT_RING_STATE_ALLOCATED) {
                dev_err(gsi->dev, "event ring %u state %u before dealloc\n",
-                       evt_ring_id, evt_ring->state);
+                       evt_ring_id, state);
                return;
        }
 
        gsi_evt_ring_command(gsi, evt_ring_id, GSI_EVT_DE_ALLOC);
 
        /* If successful the event ring state will have changed */
-       if (evt_ring->state == GSI_EVT_RING_STATE_NOT_ALLOCATED)
+       state = gsi_evt_ring_state(gsi, evt_ring_id);
+       if (state == GSI_EVT_RING_STATE_NOT_ALLOCATED)
                return;
 
        dev_err(gsi->dev, "event ring %u bad state %u after dealloc\n",
-               evt_ring_id, evt_ring->state);
+               evt_ring_id, state);
 }
 
 /* Fetch the current state of a channel from hardware */
@@ -1107,7 +1111,6 @@ static void gsi_isr_evt_ctrl(struct gsi *gsi)
                event_mask ^= BIT(evt_ring_id);
 
                evt_ring = &gsi->evt_ring[evt_ring_id];
-               evt_ring->state = gsi_evt_ring_state(gsi, evt_ring_id);
 
                complete(&evt_ring->completion);
        }

diff --git a/drivers/net/ipa/gsi.h b/drivers/net/ipa/gsi.h
index 96c9aed397aadc14b68e5c931e435a039e66d8cf..d674db0ba4eb0fa9ba6f77b8d1506a89eef3c9f3 100644 (file)
--- a/drivers/net/ipa/gsi.h
+++ b/drivers/net/ipa/gsi.h
@@ -142,7 +142,6 @@ enum gsi_evt_ring_state {
 struct gsi_evt_ring {
        struct gsi_channel *channel;
        struct completion completion;   /* signals event ring state changes */
-       enum gsi_evt_ring_state state;
        struct gsi_ring ring;
 };