]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
staging: gpib: Remove atn_asserted global variable
authorDave Penkler <dpenkler@gmail.com>
Fri, 18 Apr 2025 17:34:31 +0000 (19:34 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 25 Apr 2025 14:08:26 +0000 (16:08 +0200)
atn_asserted was introduced to deal with an issue where certain models
of the Raspberry Pi would lose interrupts under heavy load. Using
a combination of edge and level interrupts the problem was resolved
so the work-around is no longer needed.

This patch removes the work-around.

Tested-by: Dave Penkler <dpenkler@gmail.com>
Signed-off-by: Dave Penkler <dpenkler@gmail.com>
Link: https://lore.kernel.org/r/20250418173434.2892-6-dpenkler@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/gpib/gpio/gpib_bitbang.c

index caa8361da696eb3a6ab5d49c15b2c12c26af923f..1d650cb57cd273e07d7e72633b8dabbe059c49b6 100644 (file)
@@ -306,7 +306,6 @@ struct bb_priv {
        int dav_seq;
        long all_irqs;
        int dav_idle;
-       int atn_asserted;
 
        enum talker_function_state talker_state;
        enum listener_function_state listener_state;
@@ -614,7 +613,8 @@ static irqreturn_t bb_NRFD_interrupt(int irq, void *arg)
                goto nrfd_exit;
        }
 
-       if (priv->atn_asserted && priv->w_cnt >= priv->length) { // test for end of transfer
+       if (priv->w_cnt >= priv->length) { // test for missed NDAC end of transfer
+               dev_err(board->gpib_dev, "Unexpected NRFD exit\n");
                priv->write_done = 1;
                priv->w_busy = 0;
                wake_up_interruptible(&board->wait);
@@ -686,14 +686,14 @@ static irqreturn_t bb_NDAC_interrupt(int irq, void *arg)
 
        dbg_printk(3, "accepted %zu\n", priv->w_cnt - 1);
 
-       if (!priv->atn_asserted && priv->w_cnt >= priv->length) { // test for end of transfer
+       gpiod_set_value(DAV, 1); // Data not available
+       priv->dav_tx = 1;
+       priv->phase = 510;
+
+       if (priv->w_cnt >= priv->length) { // test for end of transfer
                priv->write_done = 1;
                priv->w_busy = 0;
                wake_up_interruptible(&board->wait);
-       } else {
-               gpiod_set_value(DAV, 1); // Data not available
-               priv->dav_tx = 1;
-               priv->phase = 510;
        }
 
 ndac_exit:
@@ -850,6 +850,7 @@ static void set_atn(struct gpib_board *board, int atn_asserted)
                        priv->listener_state = listener_addressed;
                if (priv->talker_state == talker_active)
                        priv->talker_state = talker_addressed;
+               SET_DIR_WRITE(priv);  // need to be able to read bus NRFD/NDAC
        } else {
                if (priv->listener_state == listener_addressed) {
                        priv->listener_state = listener_active;
@@ -859,7 +860,6 @@ static void set_atn(struct gpib_board *board, int atn_asserted)
                        priv->talker_state = talker_active;
        }
        gpiod_direction_output(_ATN, !atn_asserted);
-       priv->atn_asserted = atn_asserted;
 }
 
 static int bb_take_control(struct gpib_board *board, int synchronous)