sfc: Allow DRV_GEN events to be used outside of selftests

Formerly, efx_test_eventq_irq() assumed it was the only user of
driver generated events. Allow it to interoperate with other users.

We can create more than 16 channels, so align event codes with
a multiple of 256 not 16.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 5 insertions, 11 deletions

diff --git a/drivers/net/sfc/selftest.c b/drivers/net/sfc/selftest.c
index 52ac14af83a4..c088740e3493 100644
--- a/drivers/net/sfc/selftest.c
+++ b/drivers/net/sfc/selftest.c
@@ -161,23 +161,17 @@ static int efx_test_interrupts(struct efx_nic *efx,
 static int efx_test_eventq_irq(struct efx_channel *channel,
                                struct efx_self_tests *tests)
 {
-        unsigned int magic, count;
-
-        /* Channel specific code, limited to 20 bits */
-        magic = (0x00010150 + channel->channel);
-        EFX_LOG(channel->efx, "channel %d testing event queue with code %x\n",
-                channel->channel, magic);
+        unsigned int magic_count, count;
 
         tests->eventq_dma[channel->channel] = -1;
         tests->eventq_int[channel->channel] = -1;
         tests->eventq_poll[channel->channel] = -1;
 
-        /* Reset flag and zero magic word */
+        magic_count = channel->magic_count;
         channel->efx->last_irq_cpu = -1;
-        channel->eventq_magic = 0;
         smp_wmb();
 
-        efx_nic_generate_test_event(channel, magic);
+        efx_nic_generate_test_event(channel);
 
         /* Wait for arrival of interrupt */
         count = 0;
@@ -187,7 +181,7 @@ static int efx_test_eventq_irq(struct efx_channel *channel,
                 if (channel->work_pending)
                         efx_process_channel_now(channel);
 
-                if (channel->eventq_magic == magic)
+                if (channel->magic_count != magic_count)
                         goto eventq_ok;
         } while (++count < 2);
 
@@ -204,7 +198,7 @@ static int efx_test_eventq_irq(struct efx_channel *channel,
 
         /* Check to see if event was received even if interrupt wasn't */
         efx_process_channel_now(channel);
-        if (channel->eventq_magic == magic) {
+        if (channel->magic_count != magic_count) {
                 EFX_ERR(channel->efx, "channel %d event was generated, but "
                         "failed to trigger an interrupt\n", channel->channel);
                 tests->eventq_dma[channel->channel] = 1;