mirror of
https://github.com/torvalds/linux.git
synced 2024-11-28 07:01:32 +00:00
cd354f1ae7
After Al Viro (finally) succeeded in removing the sched.h #include in module.h recently, it makes sense again to remove other superfluous sched.h includes. There are quite a lot of files which include it but don't actually need anything defined in there. Presumably these includes were once needed for macros that used to live in sched.h, but moved to other header files in the course of cleaning it up. To ease the pain, this time I did not fiddle with any header files and only removed #includes from .c-files, which tend to cause less trouble. Compile tested against 2.6.20-rc2 and 2.6.20-rc2-mm2 (with offsets) on alpha, arm, i386, ia64, mips, powerpc, and x86_64 with allnoconfig, defconfig, allmodconfig, and allyesconfig as well as a few randconfigs on x86_64 and all configs in arch/arm/configs on arm. I also checked that no new warnings were introduced by the patch (actually, some warnings are removed that were emitted by unnecessarily included header files). Signed-off-by: Tim Schmielau <tim@physik3.uni-rostock.de> Acked-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
161 lines
4.0 KiB
C
161 lines
4.0 KiB
C
#include <linux/types.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/blkdev.h>
|
|
#include <linux/interrupt.h>
|
|
|
|
#include <asm/page.h>
|
|
#include <asm/pgtable.h>
|
|
#include <asm/mvme147hw.h>
|
|
#include <asm/irq.h>
|
|
|
|
#include "scsi.h"
|
|
#include <scsi/scsi_host.h>
|
|
#include "wd33c93.h"
|
|
#include "mvme147.h"
|
|
|
|
#include<linux/stat.h>
|
|
|
|
#define HDATA(ptr) ((struct WD33C93_hostdata *)((ptr)->hostdata))
|
|
|
|
static struct Scsi_Host *mvme147_host = NULL;
|
|
|
|
static irqreturn_t mvme147_intr (int irq, void *dummy)
|
|
{
|
|
if (irq == MVME147_IRQ_SCSI_PORT)
|
|
wd33c93_intr (mvme147_host);
|
|
else
|
|
m147_pcc->dma_intr = 0x89; /* Ack and enable ints */
|
|
return IRQ_HANDLED;
|
|
}
|
|
|
|
static int dma_setup(struct scsi_cmnd *cmd, int dir_in)
|
|
{
|
|
unsigned char flags = 0x01;
|
|
unsigned long addr = virt_to_bus(cmd->SCp.ptr);
|
|
|
|
/* setup dma direction */
|
|
if (!dir_in)
|
|
flags |= 0x04;
|
|
|
|
/* remember direction */
|
|
HDATA(mvme147_host)->dma_dir = dir_in;
|
|
|
|
if (dir_in)
|
|
/* invalidate any cache */
|
|
cache_clear (addr, cmd->SCp.this_residual);
|
|
else
|
|
/* push any dirty cache */
|
|
cache_push (addr, cmd->SCp.this_residual);
|
|
|
|
/* start DMA */
|
|
m147_pcc->dma_bcr = cmd->SCp.this_residual | (1<<24);
|
|
m147_pcc->dma_dadr = addr;
|
|
m147_pcc->dma_cntrl = flags;
|
|
|
|
/* return success */
|
|
return 0;
|
|
}
|
|
|
|
static void dma_stop(struct Scsi_Host *instance, struct scsi_cmnd *SCpnt,
|
|
int status)
|
|
{
|
|
m147_pcc->dma_cntrl = 0;
|
|
}
|
|
|
|
int mvme147_detect(struct scsi_host_template *tpnt)
|
|
{
|
|
static unsigned char called = 0;
|
|
wd33c93_regs regs;
|
|
|
|
if (!MACH_IS_MVME147 || called)
|
|
return 0;
|
|
called++;
|
|
|
|
tpnt->proc_name = "MVME147";
|
|
tpnt->proc_info = &wd33c93_proc_info;
|
|
|
|
mvme147_host = scsi_register (tpnt, sizeof(struct WD33C93_hostdata));
|
|
if (!mvme147_host)
|
|
goto err_out;
|
|
|
|
mvme147_host->base = 0xfffe4000;
|
|
mvme147_host->irq = MVME147_IRQ_SCSI_PORT;
|
|
regs.SASR = (volatile unsigned char *)0xfffe4000;
|
|
regs.SCMD = (volatile unsigned char *)0xfffe4001;
|
|
wd33c93_init(mvme147_host, regs, dma_setup, dma_stop, WD33C93_FS_8_10);
|
|
|
|
if (request_irq(MVME147_IRQ_SCSI_PORT, mvme147_intr, 0, "MVME147 SCSI PORT", mvme147_intr))
|
|
goto err_unregister;
|
|
if (request_irq(MVME147_IRQ_SCSI_DMA, mvme147_intr, 0, "MVME147 SCSI DMA", mvme147_intr))
|
|
goto err_free_irq;
|
|
#if 0 /* Disabled; causes problems booting */
|
|
m147_pcc->scsi_interrupt = 0x10; /* Assert SCSI bus reset */
|
|
udelay(100);
|
|
m147_pcc->scsi_interrupt = 0x00; /* Negate SCSI bus reset */
|
|
udelay(2000);
|
|
m147_pcc->scsi_interrupt = 0x40; /* Clear bus reset interrupt */
|
|
#endif
|
|
m147_pcc->scsi_interrupt = 0x09; /* Enable interrupt */
|
|
|
|
m147_pcc->dma_cntrl = 0x00; /* ensure DMA is stopped */
|
|
m147_pcc->dma_intr = 0x89; /* Ack and enable ints */
|
|
|
|
return 1;
|
|
|
|
err_free_irq:
|
|
free_irq(MVME147_IRQ_SCSI_PORT, mvme147_intr);
|
|
err_unregister:
|
|
wd33c93_release();
|
|
scsi_unregister(mvme147_host);
|
|
err_out:
|
|
return 0;
|
|
}
|
|
|
|
static int mvme147_bus_reset(struct scsi_cmnd *cmd)
|
|
{
|
|
/* FIXME perform bus-specific reset */
|
|
|
|
/* FIXME 2: kill this function, and let midlayer fallback to
|
|
the same result, calling wd33c93_host_reset() */
|
|
|
|
spin_lock_irq(cmd->device->host->host_lock);
|
|
wd33c93_host_reset(cmd);
|
|
spin_unlock_irq(cmd->device->host->host_lock);
|
|
|
|
return SUCCESS;
|
|
}
|
|
|
|
#define HOSTS_C
|
|
|
|
#include "mvme147.h"
|
|
|
|
static struct scsi_host_template driver_template = {
|
|
.proc_name = "MVME147",
|
|
.name = "MVME147 built-in SCSI",
|
|
.detect = mvme147_detect,
|
|
.release = mvme147_release,
|
|
.queuecommand = wd33c93_queuecommand,
|
|
.eh_abort_handler = wd33c93_abort,
|
|
.eh_bus_reset_handler = mvme147_bus_reset,
|
|
.eh_host_reset_handler = wd33c93_host_reset,
|
|
.can_queue = CAN_QUEUE,
|
|
.this_id = 7,
|
|
.sg_tablesize = SG_ALL,
|
|
.cmd_per_lun = CMD_PER_LUN,
|
|
.use_clustering = ENABLE_CLUSTERING
|
|
};
|
|
|
|
|
|
#include "scsi_module.c"
|
|
|
|
int mvme147_release(struct Scsi_Host *instance)
|
|
{
|
|
#ifdef MODULE
|
|
/* XXX Make sure DMA is stopped! */
|
|
wd33c93_release();
|
|
free_irq(MVME147_IRQ_SCSI_PORT, mvme147_intr);
|
|
free_irq(MVME147_IRQ_SCSI_DMA, mvme147_intr);
|
|
#endif
|
|
return 1;
|
|
}
|