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.129.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 BC8561D6188 for ; Wed, 15 Jan 2025 09:38:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736933905; cv=none; b=JGtVz68ob0IsC6CrM+6r3ljU/xUQXLLPpALup6UqzABcADqPXXsb/epFkyzHmCB4tduDFC4Jli05k1Kb7oGbIR57fiU2o0qxUk8ER7NwNf/dpSCCgyZvTbfrIJN/ac9mySkAUATBC5qcXIjyVKfBalm+JuWyxKG+CmnDv4EUjA8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736933905; c=relaxed/simple; bh=YrhTYxEq3woHVQWy0hIjQ/ZFhrayo4qzQ11Arf1LuNY=; h=Message-ID:Date:MIME-Version:Subject:To:References:From: In-Reply-To:Content-Type; b=ggogYjUJuF6l1R1OqH5jMeJipgkJv8VenKe8+9M8r8OhjAR7BkEKB8Xs+p0tXFTWsIAL4pDshmSeH164buwpsA+31UalaqEANbwuXiw0RtiJZVO6AqTfjhj27X+p7oKuM8GzfCgRyd/yYesNT1f55uSV+Mt1KSE8ALd62ObbkAc= 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=XGNPD6MY; arc=none smtp.client-ip=170.10.129.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="XGNPD6MY" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1736933901; 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=QR8LXBb2+udwCPfAfkDkaUZ1FE9swloBgA5WVzX8KME=; b=XGNPD6MYEXDwINsSHR0oRlgJUxXGLXOFbUn9qVdvnZ6TKHLb9wUo9EEYgma1V0Tj/cd0nW ws29bXd+Nii1x9Ob5hYLl0rGoU9W4cqWVhBlYZrNoPhd0rMdy0/pp1zZp4khIj1A2PKit6 iuyA51uIB5wND/Du3Df7Ne4Eue+s3PM= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-175-c53rKKAwO26mISGORfBAnQ-1; Wed, 15 Jan 2025 04:38:20 -0500 X-MC-Unique: c53rKKAwO26mISGORfBAnQ-1 X-Mimecast-MFC-AGG-ID: c53rKKAwO26mISGORfBAnQ Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-5d9e4d33f04so274670a12.0 for ; Wed, 15 Jan 2025 01:38:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736933899; x=1737538699; 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=QR8LXBb2+udwCPfAfkDkaUZ1FE9swloBgA5WVzX8KME=; b=XSoz9nTeP5/mBDNOyhcYQhgzZ8O+zAHWcg8BzLQaa89K9Si6VkNvo2etXP9A209+Hq OOELmLbPxmq5LU5xKWnWZ8NHEBZt0tLO6jquVPybxdibeNVdi6QOmypM2Uc9wx/0QpCP vTAQvLcDjggvbt00axiAAlJYsfO7Yd+3RIyBisGa+RhvwtbX2KqRWWLV7pcUeqEfYiJr OYfoX0KIN8agKXDzzaPutAwECBLOLyfcz9PRWfBjsixLyeETyhyktwUrLV3bmp8haTR1 dPmikH0orTPxAdu8pL+xkGyPsG6n59e4T1f8c47PuC4sTnsGzllhUX2pbunxQr4gbMzV GxOw== X-Forwarded-Encrypted: i=1; AJvYcCX3rSPqNQnXfW5US8nSUHnu8KiZ9ucfo0BDv5AKL+HOTiBfM81HTcO7j1Z07EG+WbvJz4Vm7Le+tKp/j4w=@vger.kernel.org X-Gm-Message-State: AOJu0YyFmNyfWfoFCcIfi1avNAFXAZjGyodh2kcWCkwb4g5YFusJvnkB 6QURjsvCqfKt53XbxdZxcMtUD+f5LiSmqLuNeoP0+Kmcti4Rst85M+DuxEQusX3GTKaXGw9nIuY hQg/qLLYinWpX37U1wrxa7DiC2zFN+LR6f7R9WYh0X/XLlzH6PJCTMbB9xGW5IA== X-Gm-Gg: ASbGncv31C1Bz6+K9wfUE09IKaty0aMOk1CtixAJ+7C+tXwCvXwxbYQ/JnmzF+RFa4R btpV9pshMOaZZ2IMu3Z6xvkswAxLMtbV/j3tMSWLTLC7H7Ydy92zlH8jVkncTi2Je6LLrEk4Urn 1xyGghdyRP61ZmQshz8nZLLdtoTC1eEKwvn7VoAcO128jvYIrxiYv+n82f5Q8aQz1XPBU8cQmWD Ynkc0ZncmaUicirnAS6Dy4ZO6G52HTOwBiRs+7zAflakm6ahXi3jd0sFUU= X-Received: by 2002:a05:6402:2690:b0:5d2:7199:ae5 with SMTP id 4fb4d7f45d1cf-5d972dfbe9amr27275667a12.5.1736933898634; Wed, 15 Jan 2025 01:38:18 -0800 (PST) X-Google-Smtp-Source: AGHT+IFU6yTgCQLoQ/vo13eNXKQhw+U8UJ8tvsuUT34xE96x3J6rohoain39TDwm3Q2r1vzRKf/laQ== X-Received: by 2002:a05:6402:2690:b0:5d2:7199:ae5 with SMTP id 4fb4d7f45d1cf-5d972dfbe9amr27275649a12.5.1736933898174; Wed, 15 Jan 2025 01:38:18 -0800 (PST) Received: from [10.87.0.101] ([145.15.244.217]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5d9904a4127sm7252022a12.77.2025.01.15.01.38.16 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 15 Jan 2025 01:38:17 -0800 (PST) Message-ID: Date: Wed, 15 Jan 2025 10:38:13 +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 v7] 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: <20250115022825.101986-1-aichao@kylinos.cn> Content-Language: en-US, nl From: Hans de Goede In-Reply-To: <20250115022825.101986-1-aichao@kylinos.cn> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Hi, On 15-Jan-25 3:28 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 v7 > -Move notify_lock into lenovo_wmi_priv struct. Thanks, patch looks good to me: Reviewed-by: Hans de Goede Regards, Hans > change for v6 > -Change mutex() to guard(). > 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 | 69 +++++++++++++++--------- > 1 file changed, 44 insertions(+), 25 deletions(-) > > diff --git a/drivers/platform/x86/lenovo-wmi-camera.c b/drivers/platform/x86/lenovo-wmi-camera.c > index 0c0bedaf7407..eb60fb9a5b3f 100644 > --- a/drivers/platform/x86/lenovo-wmi-camera.c > +++ b/drivers/platform/x86/lenovo-wmi-camera.c > @@ -13,6 +13,7 @@ > #include > #include > #include > +#include > > #define WMI_LENOVO_CAMERABUTTON_EVENT_GUID "50C76F1F-D8E4-D895-0A3D-62F4EA400013" > > @@ -26,10 +27,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 +82,24 @@ static void lenovo_wmi_notify(struct wmi_device *wdev, union acpi_object *obj) > return; > } > > - mutex_lock(&priv->notify_lock); > + guard(mutex)(&priv->notify_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,21 +107,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,6 +116,9 @@ static void lenovo_wmi_remove(struct wmi_device *wdev) > { > struct lenovo_wmi_priv *priv = dev_get_drvdata(&wdev->dev); > > + if (priv->idev) > + input_unregister_device(priv->idev); > + > mutex_destroy(&priv->notify_lock); > } >