Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
User-Agent: Cyrus-JMAP/3.3.1-61-gb52c239-fm-20201210.001-gb52c2396
Mime-Version: 1.0
Message-Id: <bcb3bc76-da83-4ee1-8c2d-0453d359ae37@www.fastmail.com>
In-Reply-To: <_kQDaYPt7vh_mQfPr1tLJV2IP-p40OBPcU5zk-1xHhF9XJsm8Y-efANBgiRdWU-J2QTtOjmrfE0Tw6UrZpm6uG-zZGlfpaVOp9FuoKAbjzA=@protonmail.com>
References: <20210101061140.27547-1-jiaxun.yang@flygoat.com>
 <_kQDaYPt7vh_mQfPr1tLJV2IP-p40OBPcU5zk-1xHhF9XJsm8Y-efANBgiRdWU-J2QTtOjmrfE0Tw6UrZpm6uG-zZGlfpaVOp9FuoKAbjzA=@protonmail.com>
Date:   Sat, 02 Jan 2021 00:08:50 +0800
From:   "Jiaxun Yang" <jiaxun.yang@flygoat.com>
To:     =?UTF-8?Q?Barnab=C3=A1s_P=C5=91cze?= <pobrn@protonmail.com>
Cc:     "platform-driver-x86@vger.kernel.org" 
        <platform-driver-x86@vger.kernel.org>,
        "stable@vger.kernel.org" <stable@vger.kernel.org>,
        "Ike Panhc" <ike.pan@canonical.com>,
        "Hans de Goede" <hdegoede@redhat.com>,
        "Mark Gross" <mgross@linux.intel.com>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] platform/x86: ideapad-laptop: Add has_touchpad_switch
Content-Type: text/plain;charset=utf-8
Content-Transfer-Encoding: quoted-printable
Precedence: bulk


On Fri, Jan 1, 2021, at 10:20 PM, Barnab=C3=A1s P=C5=91cze wrote:
> Hi
>=20
>=20
> 2021. janu=C3=A1r 1., p=C3=A9ntek 7:11 keltez=C3=A9ssel, Jiaxun Yang =C3=
=ADrta:
>=20
> > Newer ideapads (e.g.: Yoga 14s, 720S 14) comes with I2C HID
> > Touchpad and do not use EC to switch touchpad. Reading VPCCMD_R_TOUC=
HPAD
> > will return zero thus touchpad may be blocked. Writing VPCCMD_W_TOUC=
HPAD
> > may cause a spurious key press.
> >
> > Add has_touchpad_switch to workaround these machines.
> >
> > Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
> > Cc: stable@vger.kernel.org # 5.4+
>=20
> Interestingly, the Lenovo Yoga 540-14IKB 80X8 has an HID-over-I2C touc=
hpad,
> and yet it can be controlled by reading/writing the appropriate EC reg=
isters.
>=20
>=20
> > ---
> >  drivers/platform/x86/ideapad-laptop.c | 18 +++++++++++++++++-
> >  1 file changed, 17 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platfor=
m/x86/ideapad-laptop.c
> > index 7598cd46cf60..b6a4db37d0fc 100644
> > --- a/drivers/platform/x86/ideapad-laptop.c
> > +++ b/drivers/platform/x86/ideapad-laptop.c
> > @@ -92,6 +92,7 @@ struct ideapad_private {
> >  	struct dentry *debug;
> >  	unsigned long cfg;
> >  	bool has_hw_rfkill_switch;
> > +	bool has_touchpad_switch;
> >  	const char *fnesc_guid;
> >  };
> >
> > @@ -535,7 +536,9 @@ static umode_t ideapad_is_visible(struct kobject=
 *kobj,
> >  	} else if (attr =3D=3D &dev_attr_fn_lock.attr) {
> >  		supported =3D acpi_has_method(priv->adev->handle, "HALS") &&
> >  			acpi_has_method(priv->adev->handle, "SALS");
> > -	} else
> > +	} else if (attr =3D=3D &dev_attr_touchpad.attr)
> > +		supported =3D priv->has_touchpad_switch;
> > +	else
> >  		supported =3D true;
> >
> >  	return supported ? attr->mode : 0;
> > @@ -867,6 +870,9 @@ static void ideapad_sync_touchpad_state(struct i=
deapad_private *priv)
> >  {
> >  	unsigned long value;
> >
> > +	if (!priv->has_touchpad_switch)
> > +		return;
> > +
> >  	/* Without reading from EC touchpad LED doesn't switch state */
> >  	if (!read_ec_data(priv->adev->handle, VPCCMD_R_TOUCHPAD, &value)) =
{
> >  		/* Some IdeaPads don't really turn off touchpad - they only
> > @@ -989,6 +995,12 @@ static int ideapad_acpi_add(struct platform_dev=
ice *pdev)
> >  	priv->platform_device =3D pdev;
> >  	priv->has_hw_rfkill_switch =3D dmi_check_system(hw_rfkill_list);
> >
> > +	/* Most ideapads with I2C HID don't use EC touchpad switch */
> > +	if (acpi_dev_present("PNP0C50", NULL, -1))
> > +		priv->has_touchpad_switch =3D false;
> > +	else
> > +		priv->has_touchpad_switch =3D true;
> > +
>=20
> `priv->has_touchpad_switch =3D !acpi_dev_present(...)`
> ?

Will fix.

>=20
>=20
> >  	ret =3D ideapad_sysfs_init(priv);
> >  	if (ret)
> >  		return ret;
> > @@ -1006,6 +1018,10 @@ static int ideapad_acpi_add(struct platform_d=
evice *pdev)
> >  	if (!priv->has_hw_rfkill_switch)
> >  		write_ec_cmd(priv->adev->handle, VPCCMD_W_RF, 1);
> >
> > +	/* The same for Touchpad */
> > +	if (!priv->has_touchpad_switch)
> > +		write_ec_cmd(priv->adev->handle, VPCCMD_W_TOUCHPAD, 1);
> > +
>=20
> Shouldn't it be the other way around: `if (priv->has_touchpad_switch)`=
?

It is to prevent accidentally disable touchpad on machines that do have =
EC switch,
so it's intentional.

Thanks.

- Jiaxun

>=20
>=20
>=20
> >  	for (i =3D 0; i < IDEAPAD_RFKILL_DEV_NUM; i++)
> >  		if (test_bit(ideapad_rfk_data[i].cfgbit, &priv->cfg))
> >  			ideapad_register_rfkill(priv, i);
> > --
> > 2.30.0
>=20
>=20
> Regards,
> Barnab=C3=A1s P=C5=91cze
>

--=20
- Jiaxun