Long delayed input update

Hi!

First, let me apologize for sitting on these patches for so long, I hope I'll be quicker next time.

Linus, please pull the input patches from

bk://kernel.bkbits.net/vojtech/input

The patches are also available split out at

bk://kernel.bkbits.net/vojtech/input

The most important changes are an added ALPS touchpad driver, factored out PS/2 routines from atkbd and psmouse, and a reworked HID->input mapping for USB devices.

The diffstat:

 Documentation/input/joystick-parport.txt     |   13 
 Documentation/kernel-parameters.txt          |    6 
 MAINTAINERS                                  |   17 
 drivers/Makefile                             |    4 
 drivers/char/keyboard.c                      |   33 +
 drivers/input/gameport/emu10k1-gp.c          |    3 
 drivers/input/joydev.c                       |    6 
 drivers/input/joystick/Kconfig               |    2 
 drivers/input/joystick/gamecon.c             |  192 ++++-----
 drivers/input/joystick/iforce/iforce-main.c  |    4 
 drivers/input/joystick/iforce/iforce-serio.c |   18 
 drivers/input/joystick/iforce/iforce.h       |    2 
 drivers/input/joystick/magellan.c            |   24 -
 drivers/input/joystick/spaceball.c           |   24 -
 drivers/input/joystick/spaceorb.c            |   24 -
 drivers/input/joystick/stinger.c             |   24 -
 drivers/input/joystick/tmdc.c                |    2 
 drivers/input/joystick/twidjoy.c             |   20 
 drivers/input/joystick/warrior.c             |   24 -
 drivers/input/keyboard/atkbd.c               |  283 +++++++++----
 drivers/input/keyboard/lkkbd.c               |   24 -
 drivers/input/keyboard/newtonkbd.c           |   24 -
 drivers/input/keyboard/sunkbd.c              |   24 -
 drivers/input/keyboard/xtkbd.c               |   24 -
 drivers/input/misc/Kconfig                   |    2 
 drivers/input/misc/uinput.c                  |    3 
 drivers/input/mouse/Kconfig                  |    2 
 drivers/input/mouse/logips2pp.c              |    2 
 drivers/input/mouse/psmouse-base.c           |  310 +++++++++-----
 drivers/input/mouse/psmouse.h                |   40 +
 drivers/input/mouse/sermouse.c               |   24 -
 drivers/input/mouse/synaptics.c              |   54 +-
 drivers/input/mouse/vsxxxaa.c                |   24 -
 drivers/input/mousedev.c                     |  237 ++++++++---
 drivers/input/serio/Kconfig                  |   16 
 drivers/input/serio/Makefile                 |    1 
 drivers/input/serio/ambakmi.c                |   40 +
 drivers/input/serio/ct82c710.c               |  106 ++--
 drivers/input/serio/gscps2.c                 |   62 +-
 drivers/input/serio/i8042-io.h               |   31 +
 drivers/input/serio/i8042.c                  |  353 +++++++++-------
 drivers/input/serio/i8042.h                  |    7 
 drivers/input/serio/maceps2.c                |   86 ++--
 drivers/input/serio/parkbd.c                 |   47 +-
 drivers/input/serio/pcips2.c                 |   52 +-
 drivers/input/serio/q40kbd.c                 |  117 ++++-
 drivers/input/serio/rpckbd.c                 |   50 +-
 drivers/input/serio/sa1111ps2.c              |   39 +
 drivers/input/serio/serio.c                  |  576 +++++++++++++++++++++------
 drivers/input/serio/serio_raw.c              |  390 ++++++++++++++++++
 drivers/input/serio/serport.c                |   49 +-
 drivers/input/touchscreen/gunze.c            |   24 -
 drivers/input/touchscreen/h3600_ts_input.c   |   24 -
 drivers/input/tsdev.c                        |  301 ++++++++------
 drivers/serial/sunsu.c                       |   89 ++--
 drivers/serial/sunzilog.c                    |   80 ++-
 drivers/usb/input/hid-core.c                 |  104 ++--
 drivers/usb/input/hiddev.c                   |   17 
 fs/compat_ioctl.c                            |    2 
 include/asm-ppc/8253pit.h                    |   10 
 include/asm-ppc64/8253pit.h                  |   10 
 include/linux/compat_ioctl.h                 |   17 
 include/linux/input.h                        |    2 
 include/linux/serio.h                        |   66 ++-
 64 files changed, 3003 insertions(+), 1284 deletions(-)

The list of changesets:

[email protected], 2004-10-27 01:11:44-05:00, [email protected]
Input: parkbd - switch to using module_param. Parameter names are
parkbd.port and parkbd.mode

[email protected], 2004-10-21 23:57:49-05:00, [email protected]
Input: gscps2 - remove unused statically allocated gscps2_serio_port
variable as the port is allocated dynamically.

[email protected], 2004-10-21 23:56:41-05:00, [email protected]
Input: get rid of pm_dev in input core as it is deprecated and
nothing uses it anyway.

[email protected], 2004-10-21 23:55:41-05:00, [email protected]
Input: i8042 - get rid of reboot notifier as suspend method
should do the job.

[email protected], 2004-10-21 23:53:52-05:00, [email protected]
Input: i8042 - get rid of old style power management handler since
APM calls both pm_send and device_suspend.

[email protected], 2004-10-21 23:52:36-05:00, [email protected]
Input: i8042 - allow turning debugging on and off "on-fly"
so people do not have to recompile their kernels to provide debug info.

Adds new parameter i8042.debug also accessible through sysfs.

[email protected], 2004-10-21 23:51:43-05:00, [email protected]
Input: when creating input devices for hardware attached to
a serio port properly set input_device->dev pointer so when corresponding class device is created it will show proper links to parent device and driver in sysfs hierarchy.

[email protected], 2004-10-21 23:50:25-05:00, [email protected]
Input: evdev, joydev, mousedev, tsdev - remove class device and devfs
entry when hardware driver disconnects instead of waiting for the last user to drop off. This way hardware drivers can be unloaded at any time.

[email protected], 2004-10-21 23:49:17-05:00, [email protected]
Input: couple of whitespace fixes.

[email protected], 2004-10-20 10:13:15+02:00, [email protected]
input: Increase ACK timeouts in libps2 in case the RESET_BAT command is used.
This should fix most Synaptics "reset failed" cases. Thanks to Keith Packard for the report.
Also add some more keyboard IDs, so that unusual keyboards are accepted by libps2 and atkbd.

[email protected], 2004-10-19 12:58:36+02:00, [email protected]
Input: i8042 ACPI enumeration - add PNP IDs found in AMD64 laptops.

[email protected], 2004-10-16 13:15:38+02:00, [email protected]
input: Fix ssize_t prototype mismatch in psmouse and atkbd.

[email protected], 2004-09-30 01:31:12-05:00, [email protected]
Input: psmouse - explicitely specify packet size instead of relying
on protocol numbering scheme. Make protocol detection routines return -1 on failure to keep them consistent with ther rest of the code. Set mouse parameters right in detection routines instead of doing it in psmouse_extensions.

[email protected], 2004-09-30 01:30:25-05:00, [email protected]
Input: psmouse - make logips2pp fully decode its protocol packets
and not rely on generic handler to finish job.

[email protected], 2004-09-30 01:28:49-05:00, [email protected]
Input: psmouse - drop PS2TPP protocol (it is handled exactly like
PS2PP) to free spot for THINKPS protocol and keep old protocol numbers for binary compatibility with Synaptics/ALPS touchpad driver for X.

[email protected], 2004-09-30 01:28:03-05:00, [email protected]
Input: psmouse - export rate, resolution, resetafter and smartscroll
(Logitech only) as individual mouse attributes (sysfs) and allow them to be set/changed independently for each mouse:

echo -n "100" > /sys/bus/serio/devices/serio0/rate echo -n "200" > /sys/bus/serio/devices/serio0/resolution

[email protected], 2004-09-30 01:27:24-05:00, [email protected]
Input: psmouse - reset mouse before doing intellimouse/explorer
probes in case it got confused by earlier probes; switch to streaming mode before setting scale and resolution, otherwise some KVMs get confused.

[email protected], 2004-09-30 01:26:43-05:00, [email protected]
Input: synaptics - not only switch to 4-byte client protocol
but also revert to 3-byte mode if client selected lower protocol.

[email protected], 2004-09-30 01:25:47-05:00, [email protected]
Input: psmouse - add set_rate and set_resolution handlers to make
adding new protocols easier and remove special knowledge from psmouse-base.c

[email protected], 2004-09-30 01:24:59-05:00, [email protected]
Input: add a new signature for ALPS DualPoint found in
Dell Inspiron 8500

[email protected], 2004-09-24 12:26:54+02:00, [email protected]
input: More comment fixes in lkkbd.c

[email protected], 2004-09-24 11:40:14+02:00, [email protected]
Input: Add ACPI-based i8042 keyboard and aux controller enumeration; can be disabled by passing i8042.noacpi as a boot parameter.

Original code by Bjorn Helgaas <[email protected]>, reworked by Dmitry Torokhov <[email protected]>, FixedIO support from Hans-Frieder Vogt <[email protected]>

[email protected], 2004-09-24 11:36:34+02:00, [email protected]
Input: correct the the wrong use of "DB9" to the correct name, "DE9".
Also, some comments/debugging output is fixed up.

[email protected], 2004-09-24 10:30:25+02:00, [email protected]
input: Add LED definitions for PDAs.

[email protected], 2004-09-23 13:01:47+02:00, [email protected]
input: Remove calls to pm_access() and pm_dev_idle() from input.c, as
they're empty functions anyway.

[email protected], 2004-09-23 12:59:31+02:00, [email protected]
input: Tidy up & fix the hid-input.c driver. Dual-wheel A4 mice don't report the phantom
button anymore, D-Pads are mapped to Hat-switches, debug can print HID->Input mappings, more mappings added, devices with reports larger than MaxPacketSize work again.

[email protected], 2004-09-22 22:35:49-05:00, [email protected]
Input: clean up ALPS DualPoint logic

[email protected], 2004-09-22 10:46:32+02:00, [email protected]
input: More IOWarrior blacklist entries in hid.c, rearranging the
blacklist back to alphabetic order.

[email protected], 2004-09-22 01:50:38-05:00, [email protected]
Input: atkbd - export extra, scroll, set, softrepeat and softraw as individual
keyboard attributes (sysfs) and allow them to be set/changed independently for each keyboard:

echo -n "2" > /sys/bus/serio/devices/serio1/set echo -n "1" > /sys/bus/serio/devices/serio1/softrepeat

[email protected], 2004-09-22 01:49:31-05:00, [email protected]
Input: add serio_[un]pin_driver() functions so attribute handlers
can safely access driver bound to a serio port.

[email protected], 2004-09-22 01:48:40-05:00, [email protected]
Input: pull common code from psmouse and atkbd into libps2 module

[email protected], 2004-09-21 16:12:18+02:00, [email protected]
input: Add AT-compatible rawmode generation for ARM.

[email protected], 2004-09-21 15:48:50+02:00, [email protected]
input: Add ALPS touchpad driver, driver by Neil Brown, Peter Osterlund
and Dmitry Torokhov, some fixes by Vojtech Pavlik.

[email protected], 2004-09-21 15:27:54+02:00, [email protected]
input: Add support for Kensington ThinkingMouse PS/2 protocol.

[email protected], 2004-09-21 10:04:06+02:00, [email protected]
input: Some HID devices have problems returning the HID class descriptor.
Try a few times before giving up.

[email protected], 2004-09-21 09:24:21+02:00, [email protected]
input: Fix oops in gamecon

[email protected], 2004-09-19 13:46:50+02:00, [email protected]
input: Joydump depends on gameport

Vojtech Pavlik
SuSE Labs, SuSE CR

Hi,

This one needs the patch below to correct permissions braindamage.

Dmitry


===================================================================


[email protected], 2004-11-25 00:33:20-05:00, [email protected]
  Input: i8042 - fix "debug" parameter sysfs permissions.
  
  Signed-off-by: Dmitry Torokhov <[email protected]>


 i8042.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


===================================================================



diff -Nru a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
--- a/drivers/input/serio/i8042.c	2004-11-25 01:27:15 -05:00
+++ b/drivers/input/serio/i8042.c	2004-11-25 01:27:15 -05:00
@@ -68,7 +68,7 @@
 #define DEBUG
 #ifdef DEBUG
 static int i8042_debug;
-module_param_named(debug, i8042_debug, bool, 600);
+module_param_named(debug, i8042_debug, bool, 0600);
 MODULE_PARM_DESC(debug, "Turn i8042 debugging mode on and off");
 #endif

Applied. Linus, please pull now.

Vojtech Pavlik
SuSE Labs, SuSE CR

I pulled and immediately unpulled again.

Vojtech, stuff like this is unacceptable:

PS/2 driver library (SERIO_LIBPS2) [N/m/y/?] (NEW) ?

Say Y here if you are using a driver for device connected to a PS/2 port, such as PS/2 mouse or standard AT keyboard.

Stop messing with peoples minds. The default config should contain keyboard and mouse support, and unless the user asks for "Embedded" or the year 2010 comes along and you can't find computers with non-USB keyboards anyway, that's how it's going to remain.

We had this _idiocy_ early in 2.5.x, and it caused untold silly problems. We fixed it. We're not going to re-do that mistake.

Please re-do your BK tree without this. Also, considering that every _single_ time we've messed with the legacy keyboard/mouse controller there have been compatibility problems, I want to know what the advantages are. Does the work actually _fix_ anything, and has it in any way been tested on the millions of different versions of kbd controller clones out there?

Linus

When I do "make oldconfig" it silently sets SERIO_LIBPS2 to Y if I have either atkbd or psmouse built-in and if both of them are modules it gives option [M/y]. Do you have atkbd or psmouse selected?

It folds sizeable chunks of the same code from atkbd and psmouse so for ease of maintenance.

Dmitry

As far as I can see, you are correct, and unless you are on !X86 or have EMBEDDED enabled SERIO_LIBPS2 is always forced to yes.

But although it doesn't seem to be a problem, I'm wondering why SERIO_LIBPS2 is a user-visible option?

cu
Adrian

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

LIBPS2 is a mid-level library for accessing a device behing PS/2 port. Like with CRC library there potentially could be some out-of-tree moules using it so user has an option of building the library in the kernel, or as a module, or omitting it.

For the vast majority of users it is selected automatically without any questions.

Dmitry

What machine this was on? Kernel config won't allow you to unselect that option if AT Keyboard is selected, and that's always selected when CONFIG_PC is.

I tested it then, and now again. And I can't get the prompt you're getting.

	$ bk clone linus test
	$ cd test
	$ bk -r get
	$ make defconfig
	$ bk pull ../input
	$ make oldconfig

doesn't ask ANY questions.

I can imagine that option being asked about on a Mac, but there it might make sense, or at least cause no harm if you enable it, even if it's not needed.

The changes to the keyboard/mouse controller code (i8042.c) are added powermanagement callbacks, which are very much needed, and added ACPI probing, which, although not strictly needed, is a less intrusive way of detecting whether a kbd/mouse controller is present.

Regarding libps2, that doesn't touch the controller code itself, only the mouse and keyboard drivers. It's a refactoring of the code, eliminating a bunch of duplicate code which had a tendency of diverging and that was causing problems. It shouldn't change any functionality per se.

The refactoring itself didn't fix any problems, and it wasn't intended to, but it uncovered some bugs that when fixed, made real problems go away, like the ACK timeouts in RESET_BAT code path.

Does a few months in Andrew's tree count?

Vojtech Pavlik
SuSE Labs, SuSE CR

Ahh. It's a G5 mac, so I guess it isn't needed. Even so, that thing shouldn't show up. If I don't have AT keyboard _or_ mouse selected, it shouldn't be there - they should "select" it, and if nothing uses it, then there isn't anything to do. In no case should it show up as a question.

So it has been part of the -mm tree? Good.

Linus

I can hide it, the reasoning was that it may be useful for out-of-kernel modules, and because of that it's possible to enable it even when there are no users, and only then it's an option.

atkbd and psmouse do "select" it.

Yes.

Vojtech Pavlik
SuSE Labs, SuSE CR

Ok, that seems fine. I'll hide it behind "EMBEDDED" at least until somebody actually has an out-of-tree user on any platform where it makes any sense (on a PC it will be enabled _anyway_ by the kbd/mouse thing, and on anything else I don't see it making any sense anyway, and it clearly only confuses people - since it confused me).

Ok. I'll re-pull and make it embedded to make that irritating question go away.

Linus

i8042-style ports are not limited to PC - maceps2.c, q40kbd.c, rpckbd.c and sa1111ps2.c also implement them that's why libps2 wasn't limited to x86 arch.

Dmitry

So?

If you select ATKBD then LIBPS2 should be selected _automatically_.

My point is that there is _never_ a reason to ask about it. Ever.

I'll let crazy people select EMBEDDED if they want to see the question, but even that is in my opinion likely unnecessary.

Linus

I was referring to your statement that on PCs it is selected automatically as if only PC can use libps2.

I'll code some tiny PS/2 driver and will keep it out of the tree just to prove you wrong ;)

Dmitry

Ok.

Thanks.

Vojtech Pavlik
SuSE Labs, SuSE CR

Ok, now only couple of things were left out:

http://marc.theaimsgroup.com/?l=linux-kernel&m=110430679525030&w=2
08-atkbd-keycode-size.patch
Fix keycode table size initialization that got broken by my changes that exported 'set' and other settings via sysfs. setkeycodes should work again now.

http://marc.theaimsgroup.com/?l=linux-kernel&m=110430749420252&w=2
06-ps2pp-mouse-name.patch
Set mouse name to "Mouse" instead of leaving it NULL when using PS2++ protocol and don't have any other information (Wheel, Touchpad) about the mouse.

06 is not too critical but without 08 setkeycodes will not work.

In any case I'd like the following patches (01-08, see
http://marc.theaimsgroup.com/?l=linux-kernel&m=110430597110513&w=2) to be moved forward as they were also staged in -mm tree for over a month and work fine on my 3 boxes.

Dmitry

OK, I'll merge them, and prepare yet another pull for Linus.

Vojtech Pavlik
SuSE Labs, SuSE CR

Compiling in PC keyboard controller support will actually crash your shiny G5 mac ;-)