mirror of
https://github.com/torvalds/linux.git
synced 2024-11-15 00:21:59 +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)
221 lines
5.4 KiB
C
221 lines
5.4 KiB
C
#include <linux/kernel.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/module.h>
|
|
#include <linux/init.h>
|
|
#include <linux/usb/input.h>
|
|
#include <asm/unaligned.h>
|
|
|
|
/*
|
|
* Version Information
|
|
* v0.0.1 - Original, extremely basic version, 2.4.xx only
|
|
* v0.0.2 - Updated, works with 2.5.62 and 2.4.20;
|
|
* - added pressure-threshold modules param code from
|
|
* Alex Perry <alex.perry@ieee.org>
|
|
*/
|
|
|
|
#define DRIVER_VERSION "v0.0.2"
|
|
#define DRIVER_AUTHOR "Josh Myer <josh@joshisanerd.com>"
|
|
#define DRIVER_DESC "USB KB Gear JamStudio Tablet driver"
|
|
#define DRIVER_LICENSE "GPL"
|
|
|
|
MODULE_AUTHOR(DRIVER_AUTHOR);
|
|
MODULE_DESCRIPTION(DRIVER_DESC);
|
|
MODULE_LICENSE(DRIVER_LICENSE);
|
|
|
|
#define USB_VENDOR_ID_KBGEAR 0x084e
|
|
|
|
static int kb_pressure_click = 0x10;
|
|
module_param(kb_pressure_click, int, 0);
|
|
MODULE_PARM_DESC(kb_pressure_click, "pressure threshold for clicks");
|
|
|
|
struct kbtab {
|
|
signed char *data;
|
|
dma_addr_t data_dma;
|
|
struct input_dev *dev;
|
|
struct usb_device *usbdev;
|
|
struct urb *irq;
|
|
int x, y;
|
|
int button;
|
|
int pressure;
|
|
__u32 serial[2];
|
|
char phys[32];
|
|
};
|
|
|
|
static void kbtab_irq(struct urb *urb)
|
|
{
|
|
struct kbtab *kbtab = urb->context;
|
|
unsigned char *data = kbtab->data;
|
|
struct input_dev *dev = kbtab->dev;
|
|
int retval;
|
|
|
|
switch (urb->status) {
|
|
case 0:
|
|
/* success */
|
|
break;
|
|
case -ECONNRESET:
|
|
case -ENOENT:
|
|
case -ESHUTDOWN:
|
|
/* this urb is terminated, clean up */
|
|
dbg("%s - urb shutting down with status: %d", __FUNCTION__, urb->status);
|
|
return;
|
|
default:
|
|
dbg("%s - nonzero urb status received: %d", __FUNCTION__, urb->status);
|
|
goto exit;
|
|
}
|
|
|
|
kbtab->x = le16_to_cpu(get_unaligned((__le16 *) &data[1]));
|
|
kbtab->y = le16_to_cpu(get_unaligned((__le16 *) &data[3]));
|
|
|
|
kbtab->pressure = (data[5]);
|
|
|
|
input_report_key(dev, BTN_TOOL_PEN, 1);
|
|
|
|
input_report_abs(dev, ABS_X, kbtab->x);
|
|
input_report_abs(dev, ABS_Y, kbtab->y);
|
|
|
|
/*input_report_key(dev, BTN_TOUCH , data[0] & 0x01);*/
|
|
input_report_key(dev, BTN_RIGHT, data[0] & 0x02);
|
|
|
|
if (-1 == kb_pressure_click) {
|
|
input_report_abs(dev, ABS_PRESSURE, kbtab->pressure);
|
|
} else {
|
|
input_report_key(dev, BTN_LEFT, (kbtab->pressure > kb_pressure_click) ? 1 : 0);
|
|
};
|
|
|
|
input_sync(dev);
|
|
|
|
exit:
|
|
retval = usb_submit_urb (urb, GFP_ATOMIC);
|
|
if (retval)
|
|
err ("%s - usb_submit_urb failed with result %d",
|
|
__FUNCTION__, retval);
|
|
}
|
|
|
|
static struct usb_device_id kbtab_ids[] = {
|
|
{ USB_DEVICE(USB_VENDOR_ID_KBGEAR, 0x1001), .driver_info = 0 },
|
|
{ }
|
|
};
|
|
|
|
MODULE_DEVICE_TABLE(usb, kbtab_ids);
|
|
|
|
static int kbtab_open(struct input_dev *dev)
|
|
{
|
|
struct kbtab *kbtab = dev->private;
|
|
|
|
kbtab->irq->dev = kbtab->usbdev;
|
|
if (usb_submit_urb(kbtab->irq, GFP_KERNEL))
|
|
return -EIO;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void kbtab_close(struct input_dev *dev)
|
|
{
|
|
struct kbtab *kbtab = dev->private;
|
|
|
|
usb_kill_urb(kbtab->irq);
|
|
}
|
|
|
|
static int kbtab_probe(struct usb_interface *intf, const struct usb_device_id *id)
|
|
{
|
|
struct usb_device *dev = interface_to_usbdev(intf);
|
|
struct usb_endpoint_descriptor *endpoint;
|
|
struct kbtab *kbtab;
|
|
struct input_dev *input_dev;
|
|
|
|
kbtab = kzalloc(sizeof(struct kbtab), GFP_KERNEL);
|
|
input_dev = input_allocate_device();
|
|
if (!kbtab || !input_dev)
|
|
goto fail1;
|
|
|
|
kbtab->data = usb_buffer_alloc(dev, 8, GFP_KERNEL, &kbtab->data_dma);
|
|
if (!kbtab->data)
|
|
goto fail1;
|
|
|
|
kbtab->irq = usb_alloc_urb(0, GFP_KERNEL);
|
|
if (!kbtab->irq)
|
|
goto fail2;
|
|
|
|
kbtab->usbdev = dev;
|
|
kbtab->dev = input_dev;
|
|
|
|
usb_make_path(dev, kbtab->phys, sizeof(kbtab->phys));
|
|
strlcat(kbtab->phys, "/input0", sizeof(kbtab->phys));
|
|
|
|
input_dev->name = "KB Gear Tablet";
|
|
input_dev->phys = kbtab->phys;
|
|
usb_to_input_id(dev, &input_dev->id);
|
|
input_dev->cdev.dev = &intf->dev;
|
|
input_dev->private = kbtab;
|
|
|
|
input_dev->open = kbtab_open;
|
|
input_dev->close = kbtab_close;
|
|
|
|
input_dev->evbit[0] |= BIT(EV_KEY) | BIT(EV_ABS) | BIT(EV_MSC);
|
|
input_dev->keybit[LONG(BTN_LEFT)] |= BIT(BTN_LEFT) | BIT(BTN_RIGHT) | BIT(BTN_MIDDLE);
|
|
input_dev->keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_PEN) | BIT(BTN_TOUCH);
|
|
input_dev->mscbit[0] |= BIT(MSC_SERIAL);
|
|
input_set_abs_params(input_dev, ABS_X, 0, 0x2000, 4, 0);
|
|
input_set_abs_params(input_dev, ABS_Y, 0, 0x1750, 4, 0);
|
|
input_set_abs_params(input_dev, ABS_PRESSURE, 0, 0xff, 0, 0);
|
|
|
|
endpoint = &intf->cur_altsetting->endpoint[0].desc;
|
|
|
|
usb_fill_int_urb(kbtab->irq, dev,
|
|
usb_rcvintpipe(dev, endpoint->bEndpointAddress),
|
|
kbtab->data, 8,
|
|
kbtab_irq, kbtab, endpoint->bInterval);
|
|
kbtab->irq->transfer_dma = kbtab->data_dma;
|
|
kbtab->irq->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
|
|
|
|
input_register_device(kbtab->dev);
|
|
|
|
usb_set_intfdata(intf, kbtab);
|
|
return 0;
|
|
|
|
fail2: usb_buffer_free(dev, 10, kbtab->data, kbtab->data_dma);
|
|
fail1: input_free_device(input_dev);
|
|
kfree(kbtab);
|
|
return -ENOMEM;
|
|
}
|
|
|
|
static void kbtab_disconnect(struct usb_interface *intf)
|
|
{
|
|
struct kbtab *kbtab = usb_get_intfdata(intf);
|
|
|
|
usb_set_intfdata(intf, NULL);
|
|
if (kbtab) {
|
|
usb_kill_urb(kbtab->irq);
|
|
input_unregister_device(kbtab->dev);
|
|
usb_free_urb(kbtab->irq);
|
|
usb_buffer_free(interface_to_usbdev(intf), 10, kbtab->data, kbtab->data_dma);
|
|
kfree(kbtab);
|
|
}
|
|
}
|
|
|
|
static struct usb_driver kbtab_driver = {
|
|
.name = "kbtab",
|
|
.probe = kbtab_probe,
|
|
.disconnect = kbtab_disconnect,
|
|
.id_table = kbtab_ids,
|
|
};
|
|
|
|
static int __init kbtab_init(void)
|
|
{
|
|
int retval;
|
|
retval = usb_register(&kbtab_driver);
|
|
if (retval)
|
|
goto out;
|
|
info(DRIVER_VERSION ":" DRIVER_DESC);
|
|
out:
|
|
return retval;
|
|
}
|
|
|
|
static void __exit kbtab_exit(void)
|
|
{
|
|
usb_deregister(&kbtab_driver);
|
|
}
|
|
|
|
module_init(kbtab_init);
|
|
module_exit(kbtab_exit);
|