mirror of
https://github.com/torvalds/linux
synced 2024-11-05 18:23:50 +00:00
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)
266 lines
8 KiB
C
266 lines
8 KiB
C
/* $Id: hfcscard.c,v 1.10.2.4 2004/01/14 16:04:48 keil Exp $
|
|
*
|
|
* low level stuff for hfcs based cards (Teles3c, ACER P10)
|
|
*
|
|
* Author Karsten Keil
|
|
* Copyright by Karsten Keil <keil@isdn4linux.de>
|
|
*
|
|
* This software may be used and distributed according to the terms
|
|
* of the GNU General Public License, incorporated herein by reference.
|
|
*
|
|
*/
|
|
|
|
#include <linux/init.h>
|
|
#include <linux/isapnp.h>
|
|
#include "hisax.h"
|
|
#include "hfc_2bds0.h"
|
|
#include "isdnl1.h"
|
|
|
|
extern const char *CardType[];
|
|
|
|
static const char *hfcs_revision = "$Revision: 1.10.2.4 $";
|
|
|
|
static irqreturn_t
|
|
hfcs_interrupt(int intno, void *dev_id)
|
|
{
|
|
struct IsdnCardState *cs = dev_id;
|
|
u_char val, stat;
|
|
u_long flags;
|
|
|
|
spin_lock_irqsave(&cs->lock, flags);
|
|
if ((HFCD_ANYINT | HFCD_BUSY_NBUSY) &
|
|
(stat = cs->BC_Read_Reg(cs, HFCD_DATA, HFCD_STAT))) {
|
|
val = cs->BC_Read_Reg(cs, HFCD_DATA, HFCD_INT_S1);
|
|
if (cs->debug & L1_DEB_ISAC)
|
|
debugl1(cs, "HFCS: stat(%02x) s1(%02x)", stat, val);
|
|
hfc2bds0_interrupt(cs, val);
|
|
} else {
|
|
if (cs->debug & L1_DEB_ISAC)
|
|
debugl1(cs, "HFCS: irq_no_irq stat(%02x)", stat);
|
|
}
|
|
spin_unlock_irqrestore(&cs->lock, flags);
|
|
return IRQ_HANDLED;
|
|
}
|
|
|
|
static void
|
|
hfcs_Timer(struct IsdnCardState *cs)
|
|
{
|
|
cs->hw.hfcD.timer.expires = jiffies + 75;
|
|
/* WD RESET */
|
|
/* WriteReg(cs, HFCD_DATA, HFCD_CTMT, cs->hw.hfcD.ctmt | 0x80);
|
|
add_timer(&cs->hw.hfcD.timer);
|
|
*/
|
|
}
|
|
|
|
static void
|
|
release_io_hfcs(struct IsdnCardState *cs)
|
|
{
|
|
release2bds0(cs);
|
|
del_timer(&cs->hw.hfcD.timer);
|
|
if (cs->hw.hfcD.addr)
|
|
release_region(cs->hw.hfcD.addr, 2);
|
|
}
|
|
|
|
static void
|
|
reset_hfcs(struct IsdnCardState *cs)
|
|
{
|
|
printk(KERN_INFO "HFCS: resetting card\n");
|
|
cs->hw.hfcD.cirm = HFCD_RESET;
|
|
if (cs->typ == ISDN_CTYPE_TELES3C)
|
|
cs->hw.hfcD.cirm |= HFCD_MEM8K;
|
|
cs->BC_Write_Reg(cs, HFCD_DATA, HFCD_CIRM, cs->hw.hfcD.cirm); /* Reset On */
|
|
mdelay(10);
|
|
cs->hw.hfcD.cirm = 0;
|
|
if (cs->typ == ISDN_CTYPE_TELES3C)
|
|
cs->hw.hfcD.cirm |= HFCD_MEM8K;
|
|
cs->BC_Write_Reg(cs, HFCD_DATA, HFCD_CIRM, cs->hw.hfcD.cirm); /* Reset Off */
|
|
mdelay(10);
|
|
if (cs->typ == ISDN_CTYPE_TELES3C)
|
|
cs->hw.hfcD.cirm |= HFCD_INTB;
|
|
else if (cs->typ == ISDN_CTYPE_ACERP10)
|
|
cs->hw.hfcD.cirm |= HFCD_INTA;
|
|
cs->BC_Write_Reg(cs, HFCD_DATA, HFCD_CIRM, cs->hw.hfcD.cirm);
|
|
cs->BC_Write_Reg(cs, HFCD_DATA, HFCD_CLKDEL, 0x0e);
|
|
cs->BC_Write_Reg(cs, HFCD_DATA, HFCD_TEST, HFCD_AUTO_AWAKE); /* S/T Auto awake */
|
|
cs->hw.hfcD.ctmt = HFCD_TIM25 | HFCD_AUTO_TIMER;
|
|
cs->BC_Write_Reg(cs, HFCD_DATA, HFCD_CTMT, cs->hw.hfcD.ctmt);
|
|
cs->hw.hfcD.int_m2 = HFCD_IRQ_ENABLE;
|
|
cs->hw.hfcD.int_m1 = HFCD_INTS_B1TRANS | HFCD_INTS_B2TRANS |
|
|
HFCD_INTS_DTRANS | HFCD_INTS_B1REC | HFCD_INTS_B2REC |
|
|
HFCD_INTS_DREC | HFCD_INTS_L1STATE;
|
|
cs->BC_Write_Reg(cs, HFCD_DATA, HFCD_INT_M1, cs->hw.hfcD.int_m1);
|
|
cs->BC_Write_Reg(cs, HFCD_DATA, HFCD_INT_M2, cs->hw.hfcD.int_m2);
|
|
cs->BC_Write_Reg(cs, HFCD_DATA, HFCD_STATES, HFCD_LOAD_STATE | 2); /* HFC ST 2 */
|
|
udelay(10);
|
|
cs->BC_Write_Reg(cs, HFCD_DATA, HFCD_STATES, 2); /* HFC ST 2 */
|
|
cs->hw.hfcD.mst_m = HFCD_MASTER;
|
|
cs->BC_Write_Reg(cs, HFCD_DATA, HFCD_MST_MODE, cs->hw.hfcD.mst_m); /* HFC Master */
|
|
cs->hw.hfcD.sctrl = 0;
|
|
cs->BC_Write_Reg(cs, HFCD_DATA, HFCD_SCTRL, cs->hw.hfcD.sctrl);
|
|
}
|
|
|
|
static int
|
|
hfcs_card_msg(struct IsdnCardState *cs, int mt, void *arg)
|
|
{
|
|
u_long flags;
|
|
int delay;
|
|
|
|
if (cs->debug & L1_DEB_ISAC)
|
|
debugl1(cs, "HFCS: card_msg %x", mt);
|
|
switch (mt) {
|
|
case CARD_RESET:
|
|
spin_lock_irqsave(&cs->lock, flags);
|
|
reset_hfcs(cs);
|
|
spin_unlock_irqrestore(&cs->lock, flags);
|
|
return(0);
|
|
case CARD_RELEASE:
|
|
release_io_hfcs(cs);
|
|
return(0);
|
|
case CARD_INIT:
|
|
delay = (75*HZ)/100 +1;
|
|
cs->hw.hfcD.timer.expires = jiffies + delay;
|
|
add_timer(&cs->hw.hfcD.timer);
|
|
spin_lock_irqsave(&cs->lock, flags);
|
|
reset_hfcs(cs);
|
|
init2bds0(cs);
|
|
spin_unlock_irqrestore(&cs->lock, flags);
|
|
delay = (80*HZ)/1000 +1;
|
|
msleep(80);
|
|
spin_lock_irqsave(&cs->lock, flags);
|
|
cs->hw.hfcD.ctmt |= HFCD_TIM800;
|
|
cs->BC_Write_Reg(cs, HFCD_DATA, HFCD_CTMT, cs->hw.hfcD.ctmt);
|
|
cs->BC_Write_Reg(cs, HFCD_DATA, HFCD_MST_MODE, cs->hw.hfcD.mst_m);
|
|
spin_unlock_irqrestore(&cs->lock, flags);
|
|
return(0);
|
|
case CARD_TEST:
|
|
return(0);
|
|
}
|
|
return(0);
|
|
}
|
|
|
|
#ifdef __ISAPNP__
|
|
static struct isapnp_device_id hfc_ids[] __devinitdata = {
|
|
{ ISAPNP_VENDOR('A', 'N', 'X'), ISAPNP_FUNCTION(0x1114),
|
|
ISAPNP_VENDOR('A', 'N', 'X'), ISAPNP_FUNCTION(0x1114),
|
|
(unsigned long) "Acer P10" },
|
|
{ ISAPNP_VENDOR('B', 'I', 'L'), ISAPNP_FUNCTION(0x0002),
|
|
ISAPNP_VENDOR('B', 'I', 'L'), ISAPNP_FUNCTION(0x0002),
|
|
(unsigned long) "Billion 2" },
|
|
{ ISAPNP_VENDOR('B', 'I', 'L'), ISAPNP_FUNCTION(0x0001),
|
|
ISAPNP_VENDOR('B', 'I', 'L'), ISAPNP_FUNCTION(0x0001),
|
|
(unsigned long) "Billion 1" },
|
|
{ ISAPNP_VENDOR('T', 'A', 'G'), ISAPNP_FUNCTION(0x7410),
|
|
ISAPNP_VENDOR('T', 'A', 'G'), ISAPNP_FUNCTION(0x7410),
|
|
(unsigned long) "IStar PnP" },
|
|
{ ISAPNP_VENDOR('T', 'A', 'G'), ISAPNP_FUNCTION(0x2610),
|
|
ISAPNP_VENDOR('T', 'A', 'G'), ISAPNP_FUNCTION(0x2610),
|
|
(unsigned long) "Teles 16.3c" },
|
|
{ ISAPNP_VENDOR('S', 'F', 'M'), ISAPNP_FUNCTION(0x0001),
|
|
ISAPNP_VENDOR('S', 'F', 'M'), ISAPNP_FUNCTION(0x0001),
|
|
(unsigned long) "Tornado Tipa C" },
|
|
{ ISAPNP_VENDOR('K', 'Y', 'E'), ISAPNP_FUNCTION(0x0001),
|
|
ISAPNP_VENDOR('K', 'Y', 'E'), ISAPNP_FUNCTION(0x0001),
|
|
(unsigned long) "Genius Speed Surfer" },
|
|
{ 0, }
|
|
};
|
|
|
|
static struct isapnp_device_id *ipid __devinitdata = &hfc_ids[0];
|
|
static struct pnp_card *pnp_c __devinitdata = NULL;
|
|
#endif
|
|
|
|
int __devinit
|
|
setup_hfcs(struct IsdnCard *card)
|
|
{
|
|
struct IsdnCardState *cs = card->cs;
|
|
char tmp[64];
|
|
|
|
strcpy(tmp, hfcs_revision);
|
|
printk(KERN_INFO "HiSax: HFC-S driver Rev. %s\n", HiSax_getrev(tmp));
|
|
|
|
#ifdef __ISAPNP__
|
|
if (!card->para[1] && isapnp_present()) {
|
|
struct pnp_dev *pnp_d;
|
|
while(ipid->card_vendor) {
|
|
if ((pnp_c = pnp_find_card(ipid->card_vendor,
|
|
ipid->card_device, pnp_c))) {
|
|
pnp_d = NULL;
|
|
if ((pnp_d = pnp_find_dev(pnp_c,
|
|
ipid->vendor, ipid->function, pnp_d))) {
|
|
int err;
|
|
|
|
printk(KERN_INFO "HiSax: %s detected\n",
|
|
(char *)ipid->driver_data);
|
|
pnp_disable_dev(pnp_d);
|
|
err = pnp_activate_dev(pnp_d);
|
|
if (err<0) {
|
|
printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n",
|
|
__FUNCTION__, err);
|
|
return(0);
|
|
}
|
|
card->para[1] = pnp_port_start(pnp_d, 0);
|
|
card->para[0] = pnp_irq(pnp_d, 0);
|
|
if (!card->para[0] || !card->para[1]) {
|
|
printk(KERN_ERR "HFC PnP:some resources are missing %ld/%lx\n",
|
|
card->para[0], card->para[1]);
|
|
pnp_disable_dev(pnp_d);
|
|
return(0);
|
|
}
|
|
break;
|
|
} else {
|
|
printk(KERN_ERR "HFC PnP: PnP error card found, no device\n");
|
|
}
|
|
}
|
|
ipid++;
|
|
pnp_c = NULL;
|
|
}
|
|
if (!ipid->card_vendor) {
|
|
printk(KERN_INFO "HFC PnP: no ISAPnP card found\n");
|
|
return(0);
|
|
}
|
|
}
|
|
#endif
|
|
cs->hw.hfcD.addr = card->para[1] & 0xfffe;
|
|
cs->irq = card->para[0];
|
|
cs->hw.hfcD.cip = 0;
|
|
cs->hw.hfcD.int_s1 = 0;
|
|
cs->hw.hfcD.send = NULL;
|
|
cs->bcs[0].hw.hfc.send = NULL;
|
|
cs->bcs[1].hw.hfc.send = NULL;
|
|
cs->hw.hfcD.dfifosize = 512;
|
|
cs->dc.hfcd.ph_state = 0;
|
|
cs->hw.hfcD.fifo = 255;
|
|
if (cs->typ == ISDN_CTYPE_TELES3C) {
|
|
cs->hw.hfcD.bfifosize = 1024 + 512;
|
|
} else if (cs->typ == ISDN_CTYPE_ACERP10) {
|
|
cs->hw.hfcD.bfifosize = 7*1024 + 512;
|
|
} else
|
|
return (0);
|
|
if (!request_region(cs->hw.hfcD.addr, 2, "HFCS isdn")) {
|
|
printk(KERN_WARNING
|
|
"HiSax: %s config port %x-%x already in use\n",
|
|
CardType[card->typ],
|
|
cs->hw.hfcD.addr,
|
|
cs->hw.hfcD.addr + 2);
|
|
return (0);
|
|
}
|
|
printk(KERN_INFO
|
|
"HFCS: defined at 0x%x IRQ %d HZ %d\n",
|
|
cs->hw.hfcD.addr,
|
|
cs->irq, HZ);
|
|
if (cs->typ == ISDN_CTYPE_TELES3C) {
|
|
/* Teles 16.3c IO ADR is 0x200 | YY0U (YY Bit 15/14 address) */
|
|
outb(0x00, cs->hw.hfcD.addr);
|
|
outb(0x56, cs->hw.hfcD.addr | 1);
|
|
} else if (cs->typ == ISDN_CTYPE_ACERP10) {
|
|
/* Acer P10 IO ADR is 0x300 */
|
|
outb(0x00, cs->hw.hfcD.addr);
|
|
outb(0x57, cs->hw.hfcD.addr | 1);
|
|
}
|
|
set_cs_func(cs);
|
|
cs->hw.hfcD.timer.function = (void *) hfcs_Timer;
|
|
cs->hw.hfcD.timer.data = (long) cs;
|
|
init_timer(&cs->hw.hfcD.timer);
|
|
cs->cardmsg = &hfcs_card_msg;
|
|
cs->irq_func = &hfcs_interrupt;
|
|
return (1);
|
|
}
|