From: Finn Thain <fthain@telegraphics.com.au> To: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>, "Martin K. Petersen" <martin.petersen@oracle.com>, Michael Schmitz <schmitzmic@gmail.com>, <linux-m68k@vger.kernel.org>, <linux-scsi@vger.kernel.org>, <linux-kernel@vger.kernel.org> Cc: Ondrej Zary <linux@rainbow-software.org>, Sam Creasey <sammy@sammy.net> Subject: [PATCH 11/22] atari_scsi: Adopt NCR5380.c core driver Date: Mon, 14 Mar 2016 15:27:11 +1100 [thread overview] Message-ID: <20160314042703.476012300@telegraphics.com.au> (raw) In-Reply-To: 20160314042700.596192247@telegraphics.com.au [-- Attachment #1: atari_scsi-adopt-NCR5380-c --] [-- Type: text/plain, Size: 4333 bytes --] Add support for the Atari ST DMA chip to the NCR5380.c core driver. This code is copied from atari_NCR5380.c. Signed-off-by: Finn Thain <fthain@telegraphics.com.au> --- drivers/scsi/NCR5380.c | 32 ++++++++++++++++++++++++++++++++ drivers/scsi/atari_scsi.c | 6 +++--- 2 files changed, 35 insertions(+), 3 deletions(-) Index: linux/drivers/scsi/NCR5380.c =================================================================== --- linux.orig/drivers/scsi/NCR5380.c 2016-03-14 15:26:39.000000000 +1100 +++ linux/drivers/scsi/NCR5380.c 2016-03-14 15:26:42.000000000 +1100 @@ -29,6 +29,8 @@ * Ronald van Cuijlenborg, Alan Cox and others. */ +/* Ported to Atari by Roman Hodek and others. */ + /* * Further development / testing that should be done : * @@ -141,6 +143,14 @@ #define NCR5380_io_delay(x) #endif +#ifndef NCR5380_acquire_dma_irq +#define NCR5380_acquire_dma_irq(x) (1) +#endif + +#ifndef NCR5380_release_dma_irq +#define NCR5380_release_dma_irq(x) +#endif + static int do_abort(struct Scsi_Host *); static void do_reset(struct Scsi_Host *); @@ -658,6 +668,9 @@ static int NCR5380_queue_command(struct cmd->result = 0; + if (!NCR5380_acquire_dma_irq(instance)) + return SCSI_MLQUEUE_HOST_BUSY; + spin_lock_irqsave(&hostdata->lock, flags); /* @@ -682,6 +695,19 @@ static int NCR5380_queue_command(struct return 0; } +static inline void maybe_release_dma_irq(struct Scsi_Host *instance) +{ + struct NCR5380_hostdata *hostdata = shost_priv(instance); + + /* Caller does the locking needed to set & test these data atomically */ + if (list_empty(&hostdata->disconnected) && + list_empty(&hostdata->unissued) && + list_empty(&hostdata->autosense) && + !hostdata->connected && + !hostdata->selecting) + NCR5380_release_dma_irq(instance); +} + /** * dequeue_next_cmd - dequeue a command for processing * @instance: the scsi host instance @@ -783,6 +809,7 @@ static void NCR5380_main(struct work_str if (!NCR5380_select(instance, cmd)) { dsprintk(NDEBUG_MAIN, instance, "main: select complete\n"); + maybe_release_dma_irq(instance); } else { dsprintk(NDEBUG_MAIN | NDEBUG_QUEUES, instance, "main: select failed, returning %p to queue\n", cmd); @@ -1828,6 +1855,8 @@ static void NCR5380_information_transfer /* Enable reselect interrupts */ NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask); + + maybe_release_dma_irq(instance); return; case MESSAGE_REJECT: /* Accept message by clearing ACK */ @@ -1963,6 +1992,7 @@ static void NCR5380_information_transfer hostdata->connected = NULL; cmd->result = DID_ERROR << 16; complete_cmd(instance, cmd); + maybe_release_dma_irq(instance); NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask); return; } @@ -2256,6 +2286,7 @@ out: dsprintk(NDEBUG_ABORT, instance, "abort: successfully aborted %p\n", cmd); queue_work(hostdata->work_q, &hostdata->main_task); + maybe_release_dma_irq(instance); spin_unlock_irqrestore(&hostdata->lock, flags); return result; @@ -2336,6 +2367,7 @@ static int NCR5380_bus_reset(struct scsi hostdata->dma_len = 0; queue_work(hostdata->work_q, &hostdata->main_task); + maybe_release_dma_irq(instance); spin_unlock_irqrestore(&hostdata->lock, flags); return SUCCESS; Index: linux/drivers/scsi/atari_scsi.c =================================================================== --- linux.orig/drivers/scsi/atari_scsi.c 2016-03-14 15:26:37.000000000 +1100 +++ linux/drivers/scsi/atari_scsi.c 2016-03-14 15:26:42.000000000 +1100 @@ -97,9 +97,9 @@ #define NCR5380_abort atari_scsi_abort #define NCR5380_info atari_scsi_info -#define NCR5380_dma_read_setup(instance, data, count) \ +#define NCR5380_dma_recv_setup(instance, data, count) \ atari_scsi_dma_setup(instance, data, count, 0) -#define NCR5380_dma_write_setup(instance, data, count) \ +#define NCR5380_dma_send_setup(instance, data, count) \ atari_scsi_dma_setup(instance, data, count, 1) #define NCR5380_dma_residual(instance) \ atari_scsi_dma_residual(instance) @@ -713,7 +713,7 @@ static void atari_scsi_falcon_reg_write( } -#include "atari_NCR5380.c" +#include "NCR5380.c" static int atari_scsi_bus_reset(struct scsi_cmnd *cmd) {
WARNING: multiple messages have this Message-ID (diff)
From: Finn Thain <fthain@telegraphics.com.au> To: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>, "Martin K. Petersen" <martin.petersen@oracle.com>, Michael Schmitz <schmitzmic@gmail.com>, linux-m68k@vger.kernel.org, linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ondrej Zary <linux@rainbow-software.org>, Sam Creasey <sammy@sammy.net> Subject: [PATCH 11/22] atari_scsi: Adopt NCR5380.c core driver Date: Mon, 14 Mar 2016 15:27:11 +1100 [thread overview] Message-ID: <20160314042703.476012300@telegraphics.com.au> (raw) In-Reply-To: 20160314042700.596192247@telegraphics.com.au [-- Attachment #1: atari_scsi-adopt-NCR5380-c --] [-- Type: text/plain, Size: 4333 bytes --] Add support for the Atari ST DMA chip to the NCR5380.c core driver. This code is copied from atari_NCR5380.c. Signed-off-by: Finn Thain <fthain@telegraphics.com.au> --- drivers/scsi/NCR5380.c | 32 ++++++++++++++++++++++++++++++++ drivers/scsi/atari_scsi.c | 6 +++--- 2 files changed, 35 insertions(+), 3 deletions(-) Index: linux/drivers/scsi/NCR5380.c =================================================================== --- linux.orig/drivers/scsi/NCR5380.c 2016-03-14 15:26:39.000000000 +1100 +++ linux/drivers/scsi/NCR5380.c 2016-03-14 15:26:42.000000000 +1100 @@ -29,6 +29,8 @@ * Ronald van Cuijlenborg, Alan Cox and others. */ +/* Ported to Atari by Roman Hodek and others. */ + /* * Further development / testing that should be done : * @@ -141,6 +143,14 @@ #define NCR5380_io_delay(x) #endif +#ifndef NCR5380_acquire_dma_irq +#define NCR5380_acquire_dma_irq(x) (1) +#endif + +#ifndef NCR5380_release_dma_irq +#define NCR5380_release_dma_irq(x) +#endif + static int do_abort(struct Scsi_Host *); static void do_reset(struct Scsi_Host *); @@ -658,6 +668,9 @@ static int NCR5380_queue_command(struct cmd->result = 0; + if (!NCR5380_acquire_dma_irq(instance)) + return SCSI_MLQUEUE_HOST_BUSY; + spin_lock_irqsave(&hostdata->lock, flags); /* @@ -682,6 +695,19 @@ static int NCR5380_queue_command(struct return 0; } +static inline void maybe_release_dma_irq(struct Scsi_Host *instance) +{ + struct NCR5380_hostdata *hostdata = shost_priv(instance); + + /* Caller does the locking needed to set & test these data atomically */ + if (list_empty(&hostdata->disconnected) && + list_empty(&hostdata->unissued) && + list_empty(&hostdata->autosense) && + !hostdata->connected && + !hostdata->selecting) + NCR5380_release_dma_irq(instance); +} + /** * dequeue_next_cmd - dequeue a command for processing * @instance: the scsi host instance @@ -783,6 +809,7 @@ static void NCR5380_main(struct work_str if (!NCR5380_select(instance, cmd)) { dsprintk(NDEBUG_MAIN, instance, "main: select complete\n"); + maybe_release_dma_irq(instance); } else { dsprintk(NDEBUG_MAIN | NDEBUG_QUEUES, instance, "main: select failed, returning %p to queue\n", cmd); @@ -1828,6 +1855,8 @@ static void NCR5380_information_transfer /* Enable reselect interrupts */ NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask); + + maybe_release_dma_irq(instance); return; case MESSAGE_REJECT: /* Accept message by clearing ACK */ @@ -1963,6 +1992,7 @@ static void NCR5380_information_transfer hostdata->connected = NULL; cmd->result = DID_ERROR << 16; complete_cmd(instance, cmd); + maybe_release_dma_irq(instance); NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask); return; } @@ -2256,6 +2286,7 @@ out: dsprintk(NDEBUG_ABORT, instance, "abort: successfully aborted %p\n", cmd); queue_work(hostdata->work_q, &hostdata->main_task); + maybe_release_dma_irq(instance); spin_unlock_irqrestore(&hostdata->lock, flags); return result; @@ -2336,6 +2367,7 @@ static int NCR5380_bus_reset(struct scsi hostdata->dma_len = 0; queue_work(hostdata->work_q, &hostdata->main_task); + maybe_release_dma_irq(instance); spin_unlock_irqrestore(&hostdata->lock, flags); return SUCCESS; Index: linux/drivers/scsi/atari_scsi.c =================================================================== --- linux.orig/drivers/scsi/atari_scsi.c 2016-03-14 15:26:37.000000000 +1100 +++ linux/drivers/scsi/atari_scsi.c 2016-03-14 15:26:42.000000000 +1100 @@ -97,9 +97,9 @@ #define NCR5380_abort atari_scsi_abort #define NCR5380_info atari_scsi_info -#define NCR5380_dma_read_setup(instance, data, count) \ +#define NCR5380_dma_recv_setup(instance, data, count) \ atari_scsi_dma_setup(instance, data, count, 0) -#define NCR5380_dma_write_setup(instance, data, count) \ +#define NCR5380_dma_send_setup(instance, data, count) \ atari_scsi_dma_setup(instance, data, count, 1) #define NCR5380_dma_residual(instance) \ atari_scsi_dma_residual(instance) @@ -713,7 +713,7 @@ static void atari_scsi_falcon_reg_write( } -#include "atari_NCR5380.c" +#include "NCR5380.c" static int atari_scsi_bus_reset(struct scsi_cmnd *cmd) {
next prev parent reply other threads:[~2016-03-14 4:46 UTC|newest] Thread overview: 100+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-03-14 4:27 [PATCH 00/22] ncr5380: Eliminate macros, reduce code duplication, fix bugs etc Finn Thain 2016-03-14 4:27 ` Finn Thain 2016-03-14 4:27 ` [PATCH 01/22] g_ncr5380: Remove CONFIG_SCSI_GENERIC_NCR53C400 Finn Thain 2016-03-14 4:27 ` Finn Thain 2016-03-14 7:21 ` Hannes Reinecke 2016-03-14 4:27 ` [PATCH 02/22] ncr5380: Remove FLAG_NO_PSEUDO_DMA where possible Finn Thain 2016-03-14 4:27 ` Finn Thain 2016-03-14 7:21 ` Hannes Reinecke 2016-03-14 4:27 ` [PATCH 03/22] ncr5380: Remove REAL_DMA and REAL_DMA_POLL macros Finn Thain 2016-03-14 4:27 ` Finn Thain 2016-03-14 7:23 ` Hannes Reinecke 2016-03-14 7:23 ` Hannes Reinecke 2016-03-14 4:27 ` [PATCH 04/22] atari_NCR5380: Remove DMA_MIN_SIZE macro Finn Thain 2016-03-14 4:27 ` Finn Thain 2016-03-14 7:25 ` Hannes Reinecke 2016-03-14 7:25 ` Hannes Reinecke 2016-03-15 3:18 ` Finn Thain 2016-03-14 4:27 ` [PATCH 05/22] ncr5380: Disable the DMA errata workaround flag by default Finn Thain 2016-03-14 4:27 ` Finn Thain 2016-03-14 4:27 ` Finn Thain 2016-03-14 7:26 ` Hannes Reinecke 2016-03-14 7:26 ` Hannes Reinecke 2016-03-14 7:26 ` Hannes Reinecke 2016-03-14 4:27 ` [PATCH 06/22] ncr5380: Remove PSEUDO_DMA macro Finn Thain 2016-03-14 4:27 ` Finn Thain 2016-03-14 4:27 ` Finn Thain 2016-03-14 7:28 ` Hannes Reinecke 2016-03-14 7:28 ` Hannes Reinecke 2016-03-14 4:27 ` [PATCH 07/22] ncr5380: Remove BOARD_REQUIRES_NO_DELAY macro Finn Thain 2016-03-14 4:27 ` Finn Thain 2016-03-14 7:33 ` Hannes Reinecke 2016-03-14 4:27 ` [PATCH 08/22] ncr5380: Use DMA hooks for PDMA Finn Thain 2016-03-14 4:27 ` Finn Thain 2016-03-14 4:27 ` Finn Thain 2016-03-14 7:34 ` Hannes Reinecke 2016-03-14 7:34 ` Hannes Reinecke 2016-03-14 4:27 ` [PATCH 09/22] ncr5380: Adopt uniform DMA setup convention Finn Thain 2016-03-14 4:27 ` Finn Thain 2016-03-14 4:27 ` Finn Thain 2016-03-14 7:36 ` Hannes Reinecke 2016-03-14 7:36 ` Hannes Reinecke 2016-03-15 3:19 ` Finn Thain 2016-03-15 3:19 ` Finn Thain 2016-03-15 6:49 ` Hannes Reinecke 2016-03-15 6:49 ` Hannes Reinecke 2016-03-14 4:27 ` [PATCH 10/22] ncr5380: Merge DMA implementation from atari_NCR5380 core driver Finn Thain 2016-03-14 4:27 ` Finn Thain 2016-03-14 4:27 ` Finn Thain 2016-03-14 7:38 ` Hannes Reinecke 2016-03-14 7:38 ` Hannes Reinecke 2016-03-14 4:27 ` Finn Thain [this message] 2016-03-14 4:27 ` [PATCH 11/22] atari_scsi: Adopt NCR5380.c " Finn Thain 2016-03-14 7:39 ` Hannes Reinecke 2016-03-14 4:27 ` [PATCH 12/22] sun3_scsi: " Finn Thain 2016-03-14 4:27 ` Finn Thain 2016-03-14 7:40 ` Hannes Reinecke 2016-03-14 7:40 ` Hannes Reinecke 2016-03-14 4:27 ` [PATCH 13/22] ncr5380: Remove disused atari_NCR5380.c " Finn Thain 2016-03-14 4:27 ` Finn Thain 2016-03-14 7:42 ` Hannes Reinecke 2016-03-14 7:42 ` Hannes Reinecke 2016-03-14 4:27 ` [PATCH 14/22] ncr5380: Add MAX_LUN limit Finn Thain 2016-03-14 4:27 ` Finn Thain 2016-03-14 7:43 ` Hannes Reinecke 2016-03-14 7:51 ` Christoph Hellwig 2016-03-15 3:20 ` Finn Thain 2016-03-15 8:26 ` Christoph Hellwig 2016-03-14 4:27 ` [PATCH 15/22] dmx3191d: Drop max_sectors limit Finn Thain 2016-03-14 4:27 ` Finn Thain 2016-03-14 7:43 ` Hannes Reinecke 2016-03-14 4:27 ` [PATCH 16/22] ncr5380: Fix register decoding for debugging Finn Thain 2016-03-14 4:27 ` Finn Thain 2016-03-14 7:46 ` Hannes Reinecke 2016-03-15 3:21 ` Finn Thain 2016-03-14 4:27 ` [PATCH 17/22] ncr5380: Remove remaining register storage qualifiers Finn Thain 2016-03-14 4:27 ` Finn Thain 2016-03-14 7:46 ` Hannes Reinecke 2016-03-14 4:27 ` [PATCH 18/22] ncr5380: Remove DONT_USE_INTR and AUTOPROBE_IRQ macros Finn Thain 2016-03-14 4:27 ` Finn Thain 2016-03-14 4:27 ` Finn Thain 2016-03-14 7:47 ` Hannes Reinecke 2016-03-14 7:47 ` Hannes Reinecke 2016-03-14 4:27 ` [PATCH 19/22] ncr5380: Update usage documentation Finn Thain 2016-03-14 4:27 ` Finn Thain 2016-03-14 7:47 ` Hannes Reinecke 2016-03-14 4:27 ` [PATCH 20/22] atari_scsi: Set a reasonable default for cmd_per_lun Finn Thain 2016-03-14 4:27 ` Finn Thain 2016-03-14 7:49 ` Hannes Reinecke 2016-03-15 3:27 ` Finn Thain 2016-03-15 6:53 ` Hannes Reinecke 2016-03-15 8:27 ` Finn Thain 2016-03-15 14:34 ` James Bottomley 2016-03-14 4:27 ` [PATCH 21/22] atari_scsi: Allow can_queue to be increased for Falcon Finn Thain 2016-03-14 4:27 ` Finn Thain 2016-03-14 7:58 ` Hannes Reinecke 2016-03-14 7:58 ` Hannes Reinecke 2016-03-14 4:27 ` [PATCH 22/22] mac_scsi: Fix pseudo DMA implementation Finn Thain 2016-03-14 4:27 ` Finn Thain 2016-03-14 7:59 ` Hannes Reinecke 2016-03-18 7:03 ` [PATCH 00/22] ncr5380: Eliminate macros, reduce code duplication, fix bugs etc Michael Schmitz
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20160314042703.476012300@telegraphics.com.au \ --to=fthain@telegraphics.com.au \ --cc=James.Bottomley@HansenPartnership.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-m68k@vger.kernel.org \ --cc=linux-scsi@vger.kernel.org \ --cc=linux@rainbow-software.org \ --cc=martin.petersen@oracle.com \ --cc=sammy@sammy.net \ --cc=schmitzmic@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.