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)
183 lines
4.7 KiB
C
183 lines
4.7 KiB
C
/*
|
|
* $Id: xtkbd.c,v 1.11 2001/09/25 10:12:07 vojtech Exp $
|
|
*
|
|
* Copyright (c) 1999-2001 Vojtech Pavlik
|
|
*/
|
|
|
|
/*
|
|
* XT keyboard driver for Linux
|
|
*/
|
|
|
|
/*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*
|
|
* Should you need to contact me, the author, you can do so either by
|
|
* e-mail - mail your message to <vojtech@ucw.cz>, or by paper mail:
|
|
* Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic
|
|
*/
|
|
|
|
#include <linux/slab.h>
|
|
#include <linux/module.h>
|
|
#include <linux/input.h>
|
|
#include <linux/init.h>
|
|
#include <linux/serio.h>
|
|
|
|
#define DRIVER_DESC "XT keyboard driver"
|
|
|
|
MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
|
|
MODULE_DESCRIPTION(DRIVER_DESC);
|
|
MODULE_LICENSE("GPL");
|
|
|
|
#define XTKBD_EMUL0 0xe0
|
|
#define XTKBD_EMUL1 0xe1
|
|
#define XTKBD_KEY 0x7f
|
|
#define XTKBD_RELEASE 0x80
|
|
|
|
static unsigned char xtkbd_keycode[256] = {
|
|
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
|
|
16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
|
|
32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
|
|
48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
|
|
64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
|
|
80, 81, 82, 83, 0, 0, 0, 87, 88, 0, 0, 0, 0, 0, 0, 0,
|
|
0, 0, 0, 0, 0, 87, 88, 0, 0, 0, 0,110,111,103,108,105,
|
|
106
|
|
};
|
|
|
|
struct xtkbd {
|
|
unsigned char keycode[256];
|
|
struct input_dev *dev;
|
|
struct serio *serio;
|
|
char phys[32];
|
|
};
|
|
|
|
static irqreturn_t xtkbd_interrupt(struct serio *serio,
|
|
unsigned char data, unsigned int flags)
|
|
{
|
|
struct xtkbd *xtkbd = serio_get_drvdata(serio);
|
|
|
|
switch (data) {
|
|
case XTKBD_EMUL0:
|
|
case XTKBD_EMUL1:
|
|
break;
|
|
default:
|
|
|
|
if (xtkbd->keycode[data & XTKBD_KEY]) {
|
|
input_report_key(xtkbd->dev, xtkbd->keycode[data & XTKBD_KEY], !(data & XTKBD_RELEASE));
|
|
input_sync(xtkbd->dev);
|
|
} else {
|
|
printk(KERN_WARNING "xtkbd.c: Unknown key (scancode %#x) %s.\n",
|
|
data & XTKBD_KEY, data & XTKBD_RELEASE ? "released" : "pressed");
|
|
}
|
|
}
|
|
return IRQ_HANDLED;
|
|
}
|
|
|
|
static int xtkbd_connect(struct serio *serio, struct serio_driver *drv)
|
|
{
|
|
struct xtkbd *xtkbd;
|
|
struct input_dev *input_dev;
|
|
int err = -ENOMEM;
|
|
int i;
|
|
|
|
xtkbd = kmalloc(sizeof(struct xtkbd), GFP_KERNEL);
|
|
input_dev = input_allocate_device();
|
|
if (!xtkbd || !input_dev)
|
|
goto fail;
|
|
|
|
xtkbd->serio = serio;
|
|
xtkbd->dev = input_dev;
|
|
snprintf(xtkbd->phys, sizeof(xtkbd->phys), "%s/input0", serio->phys);
|
|
memcpy(xtkbd->keycode, xtkbd_keycode, sizeof(xtkbd->keycode));
|
|
|
|
input_dev->name = "XT Keyboard";
|
|
input_dev->phys = xtkbd->phys;
|
|
input_dev->id.bustype = BUS_XTKBD;
|
|
input_dev->id.vendor = 0x0001;
|
|
input_dev->id.product = 0x0001;
|
|
input_dev->id.version = 0x0100;
|
|
input_dev->cdev.dev = &serio->dev;
|
|
input_dev->private = xtkbd;
|
|
|
|
input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
|
|
input_dev->keycode = xtkbd->keycode;
|
|
input_dev->keycodesize = sizeof(unsigned char);
|
|
input_dev->keycodemax = ARRAY_SIZE(xtkbd_keycode);
|
|
|
|
for (i = 0; i < 255; i++)
|
|
set_bit(xtkbd->keycode[i], input_dev->keybit);
|
|
clear_bit(0, input_dev->keybit);
|
|
|
|
serio_set_drvdata(serio, xtkbd);
|
|
|
|
err = serio_open(serio, drv);
|
|
if (err)
|
|
goto fail;
|
|
|
|
input_register_device(xtkbd->dev);
|
|
return 0;
|
|
|
|
fail: serio_set_drvdata(serio, NULL);
|
|
input_free_device(input_dev);
|
|
kfree(xtkbd);
|
|
return err;
|
|
}
|
|
|
|
static void xtkbd_disconnect(struct serio *serio)
|
|
{
|
|
struct xtkbd *xtkbd = serio_get_drvdata(serio);
|
|
|
|
serio_close(serio);
|
|
serio_set_drvdata(serio, NULL);
|
|
input_unregister_device(xtkbd->dev);
|
|
kfree(xtkbd);
|
|
}
|
|
|
|
static struct serio_device_id xtkbd_serio_ids[] = {
|
|
{
|
|
.type = SERIO_XT,
|
|
.proto = SERIO_ANY,
|
|
.id = SERIO_ANY,
|
|
.extra = SERIO_ANY,
|
|
},
|
|
{ 0 }
|
|
};
|
|
|
|
MODULE_DEVICE_TABLE(serio, xtkbd_serio_ids);
|
|
|
|
static struct serio_driver xtkbd_drv = {
|
|
.driver = {
|
|
.name = "xtkbd",
|
|
},
|
|
.description = DRIVER_DESC,
|
|
.id_table = xtkbd_serio_ids,
|
|
.interrupt = xtkbd_interrupt,
|
|
.connect = xtkbd_connect,
|
|
.disconnect = xtkbd_disconnect,
|
|
};
|
|
|
|
static int __init xtkbd_init(void)
|
|
{
|
|
serio_register_driver(&xtkbd_drv);
|
|
return 0;
|
|
}
|
|
|
|
static void __exit xtkbd_exit(void)
|
|
{
|
|
serio_unregister_driver(&xtkbd_drv);
|
|
}
|
|
|
|
module_init(xtkbd_init);
|
|
module_exit(xtkbd_exit);
|