Date: Thu, 07 Mar 2013 14:14:49 -0500 From: Jung-uk Kim <jkim@FreeBSD.org> To: Gleb Smirnoff <glebius@freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r246856 - head/etc Message-ID: <5138E729.6070309@FreeBSD.org> In-Reply-To: <20130307081907.GF48089@glebius.int.ru> References: <201302152258.r1FMwiQp033077@svn.freebsd.org> <20130306150133.GB48089@FreeBSD.org> <51378E2E.4090709@FreeBSD.org> <20130307080756.GE48089@FreeBSD.org> <20130307081907.GF48089@glebius.int.ru>
next in thread | previous in thread | raw e-mail | index | archive | help
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 2013-03-07 03:19:07 -0500, Gleb Smirnoff wrote: > On Thu, Mar 07, 2013 at 12:07:56PM +0400, Gleb Smirnoff wrote: T> > On Wed, Mar 06, 2013 at 01:42:54PM -0500, Jung-uk Kim wrote: T> J> > You know, I disagreed with the above change because this type of T> > J> quirks can be easily handled by the driver. IMHO, > /etc/rc.resume is T> J> the last place to put it. When I committed > r233580 to fix resuming T> J> psm(4) and MFC'd it to stable/9 > (r234713), we had an agreement to back T> J> it out if we hear no > user complaints for enough time *without* merging T> J> your > /etc/rc.resume changes. At least, that's what I remember. In T> > J> fact, you never MFC'd your changes. So, I thought the agreement > is T> J> still valid and it is safe to back out. I am sorry for > not asking T> J> your confirmation, though. T> J> T> J> Now, please > consider fixing psm. If you can't find a generic T> J> solution, > it is okay to add your model-specific quirk in T> J> > sys/dev/atkbdc/psm.c like this: T> J> T> J> > http://svnweb.freebsd.org/base/head/sys/dev/atkbdc/psm.c?annotate=233580#l1441 > > T> J> > T> J> Also, please mention it in the manual page, i.e., the CAVEATS > section of T> J> psm(4). T> T> On my laptop the psm(4) is a generic > mouse: T> T> psm0: <PS/2 Mouse> irq 12 on atkbdc0 T> psm0: > [GIANT-LOCKED] T> psm0: model Generic PS/2 mouse, device ID 0 T> T> > Do you suggest to add PSM_CONFIG_INITAFTERSUSPEND flag for all > generic mice? > > P.S. I've tested this and it works. > > Index: psm.c > =================================================================== > > - --- psm.c (revision 247911) > +++ psm.c (working copy) @@ -1449,6 +1449,7 @@ case > MOUSE_MODEL_SYNAPTICS: case MOUSE_MODEL_GLIDEPOINT: case > MOUSE_MODEL_VERSAPAD: + case MOUSE_MODEL_GENERIC: sc->config > |= PSM_CONFIG_INITAFTERSUSPEND; break; default: > If we really have no other choice, it should be added to GENERIC.hints. Index: sys/amd64/conf/GENERIC.hints =================================================================== - --- sys/amd64/conf/GENERIC.hints (revision 247917) +++ sys/amd64/conf/GENERIC.hints (working copy) @@ -12,6 +12,7 @@ hint.atkbdc.0.port="0x060" hint.atkbd.0.at="atkbdc" hint.atkbd.0.irq="1" hint.psm.0.at="atkbdc" +hint.psm.0.flags="0x6000" hint.psm.0.irq="12" hint.sc.0.at="isa" hint.sc.0.flags="0x100" Index: sys/i386/conf/GENERIC.hints =================================================================== - --- sys/i386/conf/GENERIC.hints (revision 247917) +++ sys/i386/conf/GENERIC.hints (working copy) @@ -18,6 +18,7 @@ hint.atkbdc.0.port="0x060" hint.atkbd.0.at="atkbdc" hint.atkbd.0.irq="1" hint.psm.0.at="atkbdc" +hint.psm.0.flags="0x6000" hint.psm.0.irq="12" hint.sc.0.at="isa" hint.sc.0.flags="0x100" Jung-uk Kim -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iQEcBAEBAgAGBQJROOcpAAoJECXpabHZMqHO8VAIAIqogDH/140qIZSkql7UtFPt zCBsNw2Td5XiHx8dOQ5F9X6bneahxN2PhPQ6uvVgBbIj6z9mDfRZMWXJb7IqugqX 5o0tJCCRGc2RH9/Qq/H68VFKCPj3d1SX+29yeV1Oj3ORPboZ5h4tSq5kaidv7CrD kEGUNUYQzgnXiycWx8Bd6D5A2tll8TxtK4WB0zzJ94gU3wGJfo/SBzDRaJv/m622 4gzzt8WmP5ObqWL1gYvfP+/81bF709OrDfUsmHNN0bByc/VVd3ebvrTAxLNtZNa+ T0zoABdE0FpnlBam5yNniHzGpWdwStaCKY5zi19bu4EqN9m4nfl94HLMoU47V7k= =ouzq -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?5138E729.6070309>