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)
121 lines
3.0 KiB
C
121 lines
3.0 KiB
C
/*
|
|
* i2sbus driver -- private definitions
|
|
*
|
|
* Copyright 2006 Johannes Berg <johannes@sipsolutions.net>
|
|
*
|
|
* GPL v2, can be found in COPYING.
|
|
*/
|
|
#ifndef __I2SBUS_H
|
|
#define __I2SBUS_H
|
|
#include <linux/interrupt.h>
|
|
#include <linux/spinlock.h>
|
|
#include <linux/mutex.h>
|
|
|
|
#include <sound/pcm.h>
|
|
|
|
#include <asm/prom.h>
|
|
#include <asm/pmac_feature.h>
|
|
#include <asm/dbdma.h>
|
|
|
|
#include "i2sbus-interface.h"
|
|
#include "../soundbus.h"
|
|
|
|
struct i2sbus_control {
|
|
struct list_head list;
|
|
struct macio_chip *macio;
|
|
};
|
|
|
|
#define MAX_DBDMA_COMMANDS 32
|
|
|
|
struct dbdma_command_mem {
|
|
dma_addr_t bus_addr;
|
|
dma_addr_t bus_cmd_start;
|
|
struct dbdma_cmd *cmds;
|
|
void *space;
|
|
int size;
|
|
u32 running:1;
|
|
};
|
|
|
|
struct pcm_info {
|
|
u32 created:1, /* has this direction been created with alsa? */
|
|
active:1; /* is this stream active? */
|
|
/* runtime information */
|
|
struct snd_pcm_substream *substream;
|
|
int current_period;
|
|
u32 frame_count;
|
|
struct dbdma_command_mem dbdma_ring;
|
|
volatile struct dbdma_regs __iomem *dbdma;
|
|
};
|
|
|
|
enum {
|
|
aoa_resource_i2smmio = 0,
|
|
aoa_resource_txdbdma,
|
|
aoa_resource_rxdbdma,
|
|
};
|
|
|
|
struct i2sbus_dev {
|
|
struct soundbus_dev sound;
|
|
struct macio_dev *macio;
|
|
struct i2sbus_control *control;
|
|
volatile struct i2s_interface_regs __iomem *intfregs;
|
|
|
|
struct resource resources[3];
|
|
struct resource *allocated_resource[3];
|
|
int interrupts[3];
|
|
char rnames[3][32];
|
|
|
|
/* info about currently active substreams */
|
|
struct pcm_info out, in;
|
|
snd_pcm_format_t format;
|
|
unsigned int rate;
|
|
|
|
/* list for a single controller */
|
|
struct list_head item;
|
|
/* number of bus on controller */
|
|
int bus_number;
|
|
/* for use by control layer */
|
|
struct pmf_function *enable,
|
|
*cell_enable,
|
|
*cell_disable,
|
|
*clock_enable,
|
|
*clock_disable;
|
|
|
|
/* locks */
|
|
/* spinlock for low-level interrupt locking */
|
|
spinlock_t low_lock;
|
|
/* mutex for high-level consistency */
|
|
struct mutex lock;
|
|
};
|
|
|
|
#define soundbus_dev_to_i2sbus_dev(sdev) \
|
|
container_of(sdev, struct i2sbus_dev, sound)
|
|
|
|
/* pcm specific functions */
|
|
extern int
|
|
i2sbus_attach_codec(struct soundbus_dev *dev, struct snd_card *card,
|
|
struct codec_info *ci, void *data);
|
|
extern void
|
|
i2sbus_detach_codec(struct soundbus_dev *dev, void *data);
|
|
extern irqreturn_t
|
|
i2sbus_tx_intr(int irq, void *devid);
|
|
extern irqreturn_t
|
|
i2sbus_rx_intr(int irq, void *devid);
|
|
|
|
/* control specific functions */
|
|
extern int i2sbus_control_init(struct macio_dev* dev,
|
|
struct i2sbus_control **c);
|
|
extern void i2sbus_control_destroy(struct i2sbus_control *c);
|
|
extern int i2sbus_control_add_dev(struct i2sbus_control *c,
|
|
struct i2sbus_dev *i2sdev);
|
|
extern void i2sbus_control_remove_dev(struct i2sbus_control *c,
|
|
struct i2sbus_dev *i2sdev);
|
|
extern int i2sbus_control_enable(struct i2sbus_control *c,
|
|
struct i2sbus_dev *i2sdev);
|
|
extern int i2sbus_control_cell(struct i2sbus_control *c,
|
|
struct i2sbus_dev *i2sdev,
|
|
int enable);
|
|
extern int i2sbus_control_clock(struct i2sbus_control *c,
|
|
struct i2sbus_dev *i2sdev,
|
|
int enable);
|
|
#endif /* __I2SBUS_H */
|