From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 117C91805A for ; Tue, 14 Jan 2025 09:51:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736848299; cv=none; b=RPhF5IbO0xKQMDOUsmQifTz+iE2bpzB48V/gLASDLFaFTwMszzgkhqfUu6xN+Sdintn6pSksb/i/cis1UUmBqv04FRYWXaNNKhjrx5Q6wIg0kNlx7WkyH4hmjjaU4t8kTqXTZC6dkhVvLxccsvQPHANHKAK+wYcbrcg5+kQboVA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736848299; c=relaxed/simple; bh=c8kEptDqIhfctp2k0DMZHX8C3rO/3mbLZRb83EdieCw=; h=Message-ID:Date:MIME-Version:Subject:To:References:From: In-Reply-To:Content-Type; b=XWGbzV+n1fFWs2VVQS8wAwEAPpPaApMwNhiDEfU2iy5eMqnzD13oknfQTfqzlN/rLDhnz90hrTnSvwcEzZopb0P4QsUfa5RCR+e5tK83H7e7FK0vQcCzfhhZUB2eQOw3Wbxc/djEM3wYFBkshs7RBxVMJhwdj5c+VysEbDFX0I0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=a3d3Ba0S; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="a3d3Ba0S" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1736848295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NT6ivsctiXF9EXeR/3egSHX7+nqbT7O1pDJ1XKOeB18=; b=a3d3Ba0SvFe4G89OMEhfVBULr8e2l6mOykY50aFbkV4z/GBzZet7U5rKItPkMAg5XFSQUi 2E6UU+/toCpACqJgPl9q09bWFdfL2EbWWceHMKUl+xoEE5rN/LC7x5TYLmEDnmARQOuq1v nrmvkMLfvCBj/C83lIDFRCYmXuncdp8= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-100-aqcKwEVZPM-1fdx4mz5Jmg-1; Tue, 14 Jan 2025 04:51:34 -0500 X-MC-Unique: aqcKwEVZPM-1fdx4mz5Jmg-1 X-Mimecast-MFC-AGG-ID: aqcKwEVZPM-1fdx4mz5Jmg Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-aa68fd5393cso569583466b.0 for ; Tue, 14 Jan 2025 01:51:34 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736848293; x=1737453093; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=NT6ivsctiXF9EXeR/3egSHX7+nqbT7O1pDJ1XKOeB18=; b=e5SBQ71j/Y243KIUzU379SnN6uIUgb8UVJExAMaRl5cG9U56WhU8eLMDRP/Y2Z5glV lS5TaykbMHRJ18G0TLCY7qhZA92PP9Bsl4U5h/ZckBsuc3uLo1i3iQqAc+bNP7OgY9HB Y1NzgAyX1s6QakHtkum9/4d4kmy9gC1g8c3WmHmk9ZZiTBHyiFf6CcVO0v1CPJR+Av2U YPqgQZYnh61uXxwOG/KpzMCXTw8/5cT0/3XFpZUq1Ucg91qheIABhtUWwxL+7/yHMRGO t9JBtFDTIebdJX/zgZRgrgVv/8xxE3EJBc5dKs3bRe0js5ZsaPa8WUOPNiPWQrGR8GUi VTug== X-Forwarded-Encrypted: i=1; AJvYcCVdppmYH1Jv30d4kPwG8iVOBMsreDTUX71eMA49ep9eXOMIMPUFeE/iv3gcC1DMAEccus7lFnmSZa8wni4=@vger.kernel.org X-Gm-Message-State: AOJu0YzHIxRM+VnG7ZDgKGEd9CuHxXEKcvV1DCTmx1hNvJ60GutZGDKC dvx30cyJUgb8vKus1VXQilt9/QJwfprS7m3oyQO6zqHeZW6IDPtadIXJjav9VskB6J/4WMk720U YsYLwX4n5dFSu3949Qilpy5HU5yNEXw9pYU0vY+Yu3yUuohe23TN94AxnGtnSZ3whgrN9Z4W7 X-Gm-Gg: ASbGncsQWe/JLDbb/GSBYQd05GsJgAhklz1T9ZZnG5CtD3dZWd4kyPd4UzAhSb7KU8S 3sJteceU0tsz4btMbT6UG6mqISfYYR5gGsMI4eRwCKMOyxa9/PIbFPxAgp+Sq4kizNG10+jS2JA f/cJKmfEM0KmaI+aE58eJPrepQSPZcuhoRPx8/X9e2n1vqdwrNEd4PrQcCjmrvkoz0bgli4uKlc ZYdiWW3uOQWJDyuuM8BOk5mqCCwH8Xbzif/FlOCYANdhLC8yWUAHTv7rfrs6cCw0ZHSaCKQoOtE pT6Q0M9CaczRp16eKKtGxurJlm65+qzuznx/oCyMukOWzKJV4hF6kekDDiRQjkn0TK3Bz0tgUvx rWAFPaKKGkfYYYkiTOP57zO6k0WI3U0w= X-Received: by 2002:a17:907:c24c:b0:ab2:ca86:cb84 with SMTP id a640c23a62f3a-ab2ca86dd4cmr1753748566b.13.1736848292738; Tue, 14 Jan 2025 01:51:32 -0800 (PST) X-Google-Smtp-Source: AGHT+IFgWkUe6RgwuydkmdJLP3IASo0+AcT+U5MXVaanlcibnju8QhntMJ8aAwso16rgCMt6b6hWXQ== X-Received: by 2002:a17:907:c24c:b0:ab2:ca86:cb84 with SMTP id a640c23a62f3a-ab2ca86dd4cmr1753747466b.13.1736848292282; Tue, 14 Jan 2025 01:51:32 -0800 (PST) Received: from ?IPV6:2001:1c00:c32:7800:5bfa:a036:83f0:f9ec? (2001-1c00-0c32-7800-5bfa-a036-83f0-f9ec.cable.dynamic.v6.ziggo.nl. [2001:1c00:c32:7800:5bfa:a036:83f0:f9ec]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ab2c95b1d5esm613117066b.150.2025.01.14.01.51.31 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 14 Jan 2025 01:51:31 -0800 (PST) Message-ID: <789984c3-42c9-451e-857d-815d53dedd0b@redhat.com> Date: Tue, 14 Jan 2025 10:51:30 +0100 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v6] platform/x86: lenovo-wmi-camera: Use SW_CAMERA_LENS_COVER instead of KEY_CAMERA_ACESS To: Ai Chao , ilpo.jarvinen@linux.intel.com, platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org References: <20250114063934.3116444-1-aichao@kylinos.cn> Content-Language: en-US, nl From: Hans de Goede In-Reply-To: <20250114063934.3116444-1-aichao@kylinos.cn> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Hi, On 14-Jan-25 7:39 AM, Ai Chao wrote: > Use SW_CAMERA_LENS_COVER instead of KEY_CAMERA_ACESS_ENABLE and > KEY_CAMERA_ACESS_DISABLE. When the camera toggle switch was hit, > the lenovo-wmi-camera driver would report an event code. > > Signed-off-by: Ai Chao > --- > change for v6 > -Change mutex() to guard(). Thank you for the new version, I see that as part of this change you have also moved the mutex out of struct lenovo_wmi_priv making it a global variable. Making the mutex global is not necessary for the use of guard() and is undesirable. Please submit a new version where the mutex is kept as part of struct lenovo_wmi_priv. Regards, Hans > change for v5 > -Add input_report_switch before input_register_device. > change for v4 > -Add mutex_unlock and report a switch state of 0 if SW_CAMERA_ON. > change for v3 > -Used input_register_device and input_allocate_device. > change for v2 > -Only delays the input-device registration and switches to reporting SW_CAMERA_LENS_COVER. > > drivers/platform/x86/lenovo-wmi-camera.c | 75 +++++++++++++++--------- > 1 file changed, 46 insertions(+), 29 deletions(-) > > diff --git a/drivers/platform/x86/lenovo-wmi-camera.c b/drivers/platform/x86/lenovo-wmi-camera.c > index 0c0bedaf7407..36835cd64758 100644 > --- a/drivers/platform/x86/lenovo-wmi-camera.c > +++ b/drivers/platform/x86/lenovo-wmi-camera.c > @@ -13,12 +13,15 @@ > #include > #include > #include > +#include > > #define WMI_LENOVO_CAMERABUTTON_EVENT_GUID "50C76F1F-D8E4-D895-0A3D-62F4EA400013" > > +/* Lenovo WMI camera button notify lock */ > +static DEFINE_MUTEX(notify_lock); > + > struct lenovo_wmi_priv { > struct input_dev *idev; > - struct mutex notify_lock; /* lenovo WMI camera button notify lock */ > }; > > enum { > @@ -26,10 +29,38 @@ enum { > SW_CAMERA_ON = 1, > }; > > +static int camera_shutter_input_setup(struct wmi_device *wdev, u8 camera_mode) > +{ > + struct lenovo_wmi_priv *priv = dev_get_drvdata(&wdev->dev); > + int err; > + > + priv->idev = input_allocate_device(); > + if (!priv->idev) > + return -ENOMEM; > + > + priv->idev->name = "Lenovo WMI Camera Button"; > + priv->idev->phys = "wmi/input0"; > + priv->idev->id.bustype = BUS_HOST; > + priv->idev->dev.parent = &wdev->dev; > + > + input_set_capability(priv->idev, EV_SW, SW_CAMERA_LENS_COVER); > + > + input_report_switch(priv->idev, SW_CAMERA_LENS_COVER, > + camera_mode == SW_CAMERA_ON ? 0 : 1); > + input_sync(priv->idev); > + > + err = input_register_device(priv->idev); > + if (err) { > + input_free_device(priv->idev); > + priv->idev = NULL; > + } > + > + return err; > +} > + > static void lenovo_wmi_notify(struct wmi_device *wdev, union acpi_object *obj) > { > struct lenovo_wmi_priv *priv = dev_get_drvdata(&wdev->dev); > - unsigned int keycode; > u8 camera_mode; > > if (obj->type != ACPI_TYPE_BUFFER) { > @@ -53,22 +84,24 @@ static void lenovo_wmi_notify(struct wmi_device *wdev, union acpi_object *obj) > return; > } > > - mutex_lock(&priv->notify_lock); > + guard(mutex)(¬ify_lock); > > - keycode = camera_mode == SW_CAMERA_ON ? > - KEY_CAMERA_ACCESS_ENABLE : KEY_CAMERA_ACCESS_DISABLE; > - input_report_key(priv->idev, keycode, 1); > - input_sync(priv->idev); > - input_report_key(priv->idev, keycode, 0); > - input_sync(priv->idev); > + if (!priv->idev) { > + if (camera_shutter_input_setup(wdev, camera_mode)) > + dev_warn(&wdev->dev, "Failed to register input device\n"); > + return; > + } > > - mutex_unlock(&priv->notify_lock); > + if (camera_mode == SW_CAMERA_ON) > + input_report_switch(priv->idev, SW_CAMERA_LENS_COVER, 0); > + else > + input_report_switch(priv->idev, SW_CAMERA_LENS_COVER, 1); > + input_sync(priv->idev); > } > > static int lenovo_wmi_probe(struct wmi_device *wdev, const void *context) > { > struct lenovo_wmi_priv *priv; > - int ret; > > priv = devm_kzalloc(&wdev->dev, sizeof(*priv), GFP_KERNEL); > if (!priv) > @@ -76,23 +109,6 @@ static int lenovo_wmi_probe(struct wmi_device *wdev, const void *context) > > dev_set_drvdata(&wdev->dev, priv); > > - priv->idev = devm_input_allocate_device(&wdev->dev); > - if (!priv->idev) > - return -ENOMEM; > - > - priv->idev->name = "Lenovo WMI Camera Button"; > - priv->idev->phys = "wmi/input0"; > - priv->idev->id.bustype = BUS_HOST; > - priv->idev->dev.parent = &wdev->dev; > - input_set_capability(priv->idev, EV_KEY, KEY_CAMERA_ACCESS_ENABLE); > - input_set_capability(priv->idev, EV_KEY, KEY_CAMERA_ACCESS_DISABLE); > - > - ret = input_register_device(priv->idev); > - if (ret) > - return ret; > - > - mutex_init(&priv->notify_lock); > - > return 0; > } > > @@ -100,7 +116,8 @@ static void lenovo_wmi_remove(struct wmi_device *wdev) > { > struct lenovo_wmi_priv *priv = dev_get_drvdata(&wdev->dev); > > - mutex_destroy(&priv->notify_lock); > + if (priv->idev) > + input_unregister_device(priv->idev); > } > > static const struct wmi_device_id lenovo_wmi_id_table[] = {