7d12e780e0
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
161 lines
4 KiB
C
161 lines
4 KiB
C
#include <linux/types.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/blkdev.h>
|
|
#include <linux/sched.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;
|
|
}
|