[SCSI] m68k: new mac_esp scsi driver

Replace the mac_esp driver with a new one based on the esp_scsi core.

For esp_scsi: add support for sync transfers for the PIO mode, add a new
esp_driver_ops method to get the maximum dma transfer size (like the old
NCR53C9x driver), and some cleanups.

Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

1 files changed, 24 insertions, 11 deletions

diff --git a/drivers/scsi/esp_scsi.c b/drivers/scsi/esp_scsi.c
index bfdee5968892..a0b6d414953d 100644
--- a/drivers/scsi/esp_scsi.c
+++ b/drivers/scsi/esp_scsi.c
@@ -978,7 +978,7 @@ static int esp_check_spur_intr(struct esp *esp)
                          */
                         if (!esp->ops->dma_error(esp)) {
                                 printk(KERN_ERR PFX "esp%d: Spurious irq, "
-                                       "sreg=%x.\n",
+                                       "sreg=%02x.\n",
                                        esp->host->unique_id, esp->sreg);
                                 return -1;
                         }
@@ -1447,6 +1447,9 @@ static void esp_msgin_sdtr(struct esp *esp, struct esp_target_data *tp)
         if (offset > 15)
                 goto do_reject;
 
+        if (esp->flags & ESP_FLAG_DISABLE_SYNC)
+                offset = 0;
+
         if (offset) {
                 int rounded_up, one_clock;
 
@@ -1697,7 +1700,12 @@ again:
                 else
                         ent->flags &= ~ESP_CMD_FLAG_WRITE;
 
-                dma_len = esp_dma_length_limit(esp, dma_addr, dma_len);
+                if (esp->ops->dma_length_limit)
+                        dma_len = esp->ops->dma_length_limit(esp, dma_addr,
+                                                             dma_len);
+                else
+                        dma_len = esp_dma_length_limit(esp, dma_addr, dma_len);
+
                 esp->data_dma_len = dma_len;
 
                 if (!dma_len) {
@@ -1761,7 +1769,6 @@ again:
                 esp_advance_dma(esp, ent, cmd, bytes_sent);
                 esp_event(esp, ESP_EVENT_CHECK_PHASE);
                 goto again;
-                break;
         }
 
         case ESP_EVENT_STATUS: {
@@ -2235,7 +2242,7 @@ static void esp_bootup_reset(struct esp *esp)
 
 static void esp_set_clock_params(struct esp *esp)
 {
-        int fmhz;
+        int fhz;
         u8 ccf;
 
         /* This is getting messy but it has to be done correctly or else
@@ -2270,9 +2277,9 @@ static void esp_set_clock_params(struct esp *esp)
          *    This entails the smallest and largest sync period we could ever
          *    handle on this ESP.
          */
-        fmhz = esp->cfreq;
+        fhz = esp->cfreq;
 
-        ccf = ((fmhz / 1000000) + 4) / 5;
+        ccf = ((fhz / 1000000) + 4) / 5;
         if (ccf == 1)
                 ccf = 2;
 
@@ -2281,16 +2288,16 @@ static void esp_set_clock_params(struct esp *esp)
          * been unable to find the clock-frequency PROM property.  All
          * other machines provide useful values it seems.
          */
-        if (fmhz <= 5000000 || ccf < 1 || ccf > 8) {
-                fmhz = 20000000;
+        if (fhz <= 5000000 || ccf < 1 || ccf > 8) {
+                fhz = 20000000;
                 ccf = 4;
         }
 
         esp->cfact = (ccf == 8 ? 0 : ccf);
-        esp->cfreq = fmhz;
-        esp->ccycle = ESP_MHZ_TO_CYCLE(fmhz);
+        esp->cfreq = fhz;
+        esp->ccycle = ESP_HZ_TO_CYCLE(fhz);
         esp->ctick = ESP_TICK(ccf, esp->ccycle);
-        esp->neg_defp = ESP_NEG_DEFP(fmhz, ccf);
+        esp->neg_defp = ESP_NEG_DEFP(fhz, ccf);
         esp->sync_defp = SYNC_DEFP_SLOW;
 }
 
@@ -2382,6 +2389,12 @@ static int esp_slave_configure(struct scsi_device *dev)
         struct esp_target_data *tp = &esp->target[dev->id];
         int goal_tags, queue_depth;
 
+        if (esp->flags & ESP_FLAG_DISABLE_SYNC) {
+                /* Bypass async domain validation */
+                dev->ppr  = 0;
+                dev->sdtr = 0;
+        }
+
         goal_tags = 0;
 
         if (dev->tagged_supported) {