net: ipa: rename gsi->event_enable_bitmap

Rename the "event_enable_bitmap" field of the GSI structure to be
"ieob_enabled_bitmap".  An upcoming patch will cache the last value
stored for another interrupt mask and this is a more direct naming
convention to follow.

Add a few comments to explain the bitmap fields in the GSI structure.

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 299791f..ea1126a 100644 (file)
--- a/drivers/net/ipa/gsi.c
+++ b/drivers/net/ipa/gsi.c
@@ -234,8 +234,8 @@ static void gsi_irq_ieob_enable(struct gsi *gsi, u32 evt_ring_id)
 {
        u32 val;
 
-       gsi->event_enable_bitmap |= BIT(evt_ring_id);
-       val = gsi->event_enable_bitmap;
+       gsi->ieob_enabled_bitmap |= BIT(evt_ring_id);
+       val = gsi->ieob_enabled_bitmap;
        iowrite32(val, gsi->virt + GSI_CNTXT_SRC_IEOB_IRQ_MSK_OFFSET);
 }
 
@@ -243,8 +243,8 @@ static void gsi_irq_ieob_disable(struct gsi *gsi, u32 evt_ring_id)
 {
        u32 val;
 
-       gsi->event_enable_bitmap &= ~BIT(evt_ring_id);
-       val = gsi->event_enable_bitmap;
+       gsi->ieob_enabled_bitmap &= ~BIT(evt_ring_id);
+       val = gsi->ieob_enabled_bitmap;
        iowrite32(val, gsi->virt + GSI_CNTXT_SRC_IEOB_IRQ_MSK_OFFSET);
 }
 
@@ -1774,7 +1774,7 @@ static void gsi_evt_ring_init(struct gsi *gsi)
        u32 evt_ring_id = 0;
 
        gsi->event_bitmap = gsi_event_bitmap_init(GSI_EVT_RING_COUNT_MAX);
-       gsi->event_enable_bitmap = 0;
+       gsi->ieob_enabled_bitmap = 0;
        do
                init_completion(&gsi->evt_ring[evt_ring_id].completion);
        while (++evt_ring_id < GSI_EVT_RING_COUNT_MAX);

diff --git a/drivers/net/ipa/gsi.h b/drivers/net/ipa/gsi.h
index 59ace83..fa7e2d3 100644 (file)
--- a/drivers/net/ipa/gsi.h
+++ b/drivers/net/ipa/gsi.h
@@ -156,9 +156,9 @@ struct gsi {
        u32 evt_ring_count;
        struct gsi_channel channel[GSI_CHANNEL_COUNT_MAX];
        struct gsi_evt_ring evt_ring[GSI_EVT_RING_COUNT_MAX];
-       u32 event_bitmap;
-       u32 event_enable_bitmap;
-       u32 modem_channel_bitmap;
+       u32 event_bitmap;               /* allocated event rings */
+       u32 modem_channel_bitmap;       /* modem channels to allocate */
+       u32 ieob_enabled_bitmap;        /* IEOB IRQ enabled (event rings) */
        struct completion completion;   /* for global EE commands */
        struct mutex mutex;             /* protects commands, programming */
 };