From patchwork Tue Jun 25 09:35:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: You-Sheng Yang X-Patchwork-Id: 1952017 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4W7fpH0D52z20ZS for ; Tue, 25 Jun 2024 19:35:50 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1sM2aX-0001vU-OJ; Tue, 25 Jun 2024 09:35:45 +0000 Received: from mail-pj1-f53.google.com ([209.85.216.53]) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1sM2aV-0001uY-Oc for kernel-team@lists.ubuntu.com; Tue, 25 Jun 2024 09:35:43 +0000 Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-2c84df0e2f4so1781620a91.1 for ; Tue, 25 Jun 2024 02:35:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719308142; x=1719912942; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zysK+vcjOj4HU2mOxJH8EsN7SnDKxEgIoj/oAKUNwyE=; b=GkMvy1jeeQzDYlyVjUGwOAIzuJB35cgfXRhYhp2tjeVh8Yx9lne8XHIP3keyp80/EY +PvaX4K4Ia2Y64X7akUITVKxNCV1KZVzISEeuicIic94IUYCeQ5I/U/5ID42LLS/AA3g tjRmKnzZbQI6I5bWPmvGXnj6uQHY7rgJyjPUmgWkA+8iEPhPiDtC8JmifhuBXwnzH/Ee asDJN8owOBh4CUemRW0ioWUKesznA382KsZJYGtgmo0hs6/0RRLrzoksREfs9cJbX8q8 wG9g4xWZ/X8DKXCxyWYHA2zfWrjU9CezC8PUF1tETNn7f4X+zUwQPlar+jzMAFsnibBm iRvA== X-Gm-Message-State: AOJu0YwcfNaB8ATYHA8YJ61yjYMtF1sq3LP1FLTiXm9aYEoji1ZdeFHO Di7uTS9DaCtnBJ8bDGUvQuPg2yoUCFrgNxQAOG96loGXPLMrNlhvJ7sqTivS X-Google-Smtp-Source: AGHT+IFIXYSUcNdTc5sdALdyG5XOqiWOCSVNWfRWahA7kIOOVdPs8AXgfd0tQumf0uz6NsUGxpbwOQ== X-Received: by 2002:a17:90a:c685:b0:2c8:647:3238 with SMTP id 98e67ed59e1d1-2c8489d91c9mr10883094a91.9.1719308141590; Tue, 25 Jun 2024 02:35:41 -0700 (PDT) Received: from localhost.localdomain (125-229-129-140.hinet-ip.hinet.net. [125.229.129.140]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2c819db9803sm8176683a91.45.2024.06.25.02.35.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jun 2024 02:35:41 -0700 (PDT) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/7][Unstable] UBUNTU: SAUCE: media: ivsc: csi: don't count privacy on as error Date: Tue, 25 Jun 2024 17:35:14 +0800 Message-ID: <20240625093520.3804382-2-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240625093520.3804382-1-vicamo.yang@canonical.com> References: <20240625093520.3804382-1-vicamo.yang@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.216.53; envelope-from=vicamo@gmail.com; helo=mail-pj1-f53.google.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Wentong Wu BugLink: https://bugs.launchpad.net/bugs/2067364 Prior to the ongoing command privacy is on, it would return -1 to indicate the current privacy status, and the ongoing command would be well executed by firmware as well, so this is not error. This patch changes its behavior to notify privacy on directly by V4L2 privacy control instead of reporting error. Fixes: 29006e196a56 ("media: pci: intel: ivsc: Add CSI submodule") Reported-by: Hao Yao Signed-off-by: Wentong Wu Tested-by: Jason Chen (cherry picked from https://lore.kernel.org/r/all/20240607132547.2820515-2-wentong.wu@intel.com) Signed-off-by: You-Sheng Yang --- drivers/media/pci/intel/ivsc/mei_csi.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/media/pci/intel/ivsc/mei_csi.c b/drivers/media/pci/intel/ivsc/mei_csi.c index f04a89584334..24060ac2c3a0 100644 --- a/drivers/media/pci/intel/ivsc/mei_csi.c +++ b/drivers/media/pci/intel/ivsc/mei_csi.c @@ -190,7 +190,11 @@ static int mei_csi_send(struct mei_csi *csi, u8 *buf, size_t len) /* command response status */ ret = csi->cmd_response.status; - if (ret) { + if (ret == -1) { + /* notify privacy on instead of reporting error */ + ret = 0; + v4l2_ctrl_s_ctrl(csi->privacy_ctrl, 1); + } else if (ret) { ret = -EINVAL; goto out; } From patchwork Tue Jun 25 09:35:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: You-Sheng Yang X-Patchwork-Id: 1952018 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4W7fpH5V55z20X1 for ; Tue, 25 Jun 2024 19:35:51 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1sM2aX-0001vj-UU; Tue, 25 Jun 2024 09:35:45 +0000 Received: from mail-pl1-f175.google.com ([209.85.214.175]) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1sM2aX-0001up-6f for kernel-team@lists.ubuntu.com; Tue, 25 Jun 2024 09:35:45 +0000 Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-1f9fb3ca81bso21352175ad.3 for ; Tue, 25 Jun 2024 02:35:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719308143; x=1719912943; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pfXOtQI6AMEZTvUGyMEMpWt/K79Qg+9ByfHdoJb+9oA=; b=V6TkGy8DvkqJ946ADKO5gVy2oQUYvLFxm6NqqNVk6XW48QiKBlUJcOcHAi6g1WloFL obdnf4sYO8makSnqUrZ+EljIVP/PJk1cRXGQCsI3FVLZs54+heiPxFsnAsbwHZnaJ9R7 erstY/K35nmaHW3I4k4ZcZVL805mA6crIjbkDWhzySRMGzL3VBh5Vi3rOHcTCnDrLlX3 o/JYoRfH4HnCX4Kr620OdJNCrpuzGHUGy9VNVcybg0jAcShMh031IEuWSZpNQN75zNHE nkjgQztfaH767q//OZ+pb2dCYK/YVyjulETUkTMt6e5nNHSv6JcyA65kd5kkHRfkagSe 5r9w== X-Gm-Message-State: AOJu0YzBVNF/aSf/YaKWvzrKUuuH8d7zfOGbjfvoUWy8yt78EizjWlBM F5IcJOl5KZP3tYiLG5Ay/MI9ytUySm0nyp/q9jSV54JqP5XiJ3bZtEJa4ta2 X-Google-Smtp-Source: AGHT+IFu3jVipbsiT045unZOZFu2ncrIHlmZtE3yceYLG4IPkSKoKmHz5L2wzrCObWh1DpoJXSQNmg== X-Received: by 2002:a17:90b:4c8f:b0:2c2:f2f9:a121 with SMTP id 98e67ed59e1d1-2c8614911e8mr5316203a91.39.1719308143013; Tue, 25 Jun 2024 02:35:43 -0700 (PDT) Received: from localhost.localdomain (125-229-129-140.hinet-ip.hinet.net. [125.229.129.140]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2c819db9803sm8176683a91.45.2024.06.25.02.35.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jun 2024 02:35:42 -0700 (PDT) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/7][Unstable] UBUNTU: SAUCE: media: ivsc: csi: add separate lock for v4l2 control handler Date: Tue, 25 Jun 2024 17:35:15 +0800 Message-ID: <20240625093520.3804382-3-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240625093520.3804382-1-vicamo.yang@canonical.com> References: <20240625093520.3804382-1-vicamo.yang@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.214.175; envelope-from=vicamo@gmail.com; helo=mail-pl1-f175.google.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Wentong Wu BugLink: https://bugs.launchpad.net/bugs/2067364 There're possibilities that privacy status change notification happens in the middle of the ongoing mei command which already takes the command lock, but v4l2_ctrl_s_ctrl() would also need the same lock prior to this patch, so this may results in circular locking problem. This patch adds one dedicated lock for v4l2 control handler to avoid described issue. Reported-by: Hao Yao Signed-off-by: Wentong Wu Tested-by: Jason Chen (cherry picked from https://lore.kernel.org/r/all/20240607132547.2820515-3-wentong.wu@intel.com) Signed-off-by: You-Sheng Yang --- drivers/media/pci/intel/ivsc/mei_csi.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/media/pci/intel/ivsc/mei_csi.c b/drivers/media/pci/intel/ivsc/mei_csi.c index 24060ac2c3a0..16791a7f4f15 100644 --- a/drivers/media/pci/intel/ivsc/mei_csi.c +++ b/drivers/media/pci/intel/ivsc/mei_csi.c @@ -126,6 +126,8 @@ struct mei_csi { struct v4l2_ctrl_handler ctrl_handler; struct v4l2_ctrl *freq_ctrl; struct v4l2_ctrl *privacy_ctrl; + /* lock for v4l2 controls */ + struct mutex ctrl_lock; unsigned int remote_pad; /* start streaming or not */ int streaming; @@ -563,11 +565,13 @@ static int mei_csi_init_controls(struct mei_csi *csi) u32 max; int ret; + mutex_init(&csi->ctrl_lock); + ret = v4l2_ctrl_handler_init(&csi->ctrl_handler, 2); if (ret) return ret; - csi->ctrl_handler.lock = &csi->lock; + csi->ctrl_handler.lock = &csi->ctrl_lock; max = ARRAY_SIZE(link_freq_menu_items) - 1; csi->freq_ctrl = v4l2_ctrl_new_int_menu(&csi->ctrl_handler, @@ -759,6 +763,7 @@ static int mei_csi_probe(struct mei_cl_device *cldev, err_ctrl_handler: v4l2_ctrl_handler_free(&csi->ctrl_handler); + mutex_destroy(&csi->ctrl_lock); v4l2_async_nf_unregister(&csi->notifier); v4l2_async_nf_cleanup(&csi->notifier); @@ -778,6 +783,7 @@ static void mei_csi_remove(struct mei_cl_device *cldev) v4l2_async_nf_unregister(&csi->notifier); v4l2_async_nf_cleanup(&csi->notifier); v4l2_ctrl_handler_free(&csi->ctrl_handler); + mutex_destroy(&csi->ctrl_lock); v4l2_async_unregister_subdev(&csi->subdev); v4l2_subdev_cleanup(&csi->subdev); media_entity_cleanup(&csi->subdev.entity); From patchwork Tue Jun 25 09:35:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: You-Sheng Yang X-Patchwork-Id: 1952019 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4W7fpK588Wz20X1 for ; Tue, 25 Jun 2024 19:35:53 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1sM2aa-0001yO-9i; Tue, 25 Jun 2024 09:35:48 +0000 Received: from mail-pg1-f178.google.com ([209.85.215.178]) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1sM2aY-0001ve-TX for kernel-team@lists.ubuntu.com; Tue, 25 Jun 2024 09:35:47 +0000 Received: by mail-pg1-f178.google.com with SMTP id 41be03b00d2f7-7178ba1c24bso2559484a12.3 for ; Tue, 25 Jun 2024 02:35:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719308144; x=1719912944; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9ox99+AAE8Oz5TmUNkeX5TqxZpygCN3McP8auQYXD98=; b=GVep2OYd0i0zJYhIQGkx4yzTzUjZlYiifTPMI+aiqRcs9l7rY2Oe8/iepOUnGgFwro ZER25yDbALGC8G4ffrCE4csodMthCXLFwsD8M/uyVWd7evCoQrXkWL77QCK3qj4B4uw4 iSGKsTxvNOI17oEFZhe8gXjfCcFjCtWerz1L5v/1tGd/KiPOrbqSfB1tzdaw8kQ3Cvn1 idaudgaC5dMVAO8j/rPiYbljMNVZgrW9JKv0M/9h9CCOcKGUPcCixM+bL7dSti/8VWjk 38q5MyNnvCuP+Bxb7tD8aqY8tEgHBNaGyf1HbNvHNd6t4FysGGiIqVmY/zmNarAJaijP 5YlQ== X-Gm-Message-State: AOJu0Yxbh85p+jMwCZSgotyq+OlG0M0AHwzKtIgIhSipvPUmoks+S6Y6 CoF7zqgVKwSC8OAWcexXl2omxHJIjCnEenNT41V7ptsy95xmv5+OnhfnWndb X-Google-Smtp-Source: AGHT+IFBm2NrWAm5S6dLhA2zvp0XjQVHFyg4z5oGY6yjegZJHoKfzL0SMwURNJrZUXhXmz/VS3tg+w== X-Received: by 2002:a17:90b:4f49:b0:2c4:e2cd:9216 with SMTP id 98e67ed59e1d1-2c861246bfemr6506135a91.16.1719308144433; Tue, 25 Jun 2024 02:35:44 -0700 (PDT) Received: from localhost.localdomain (125-229-129-140.hinet-ip.hinet.net. [125.229.129.140]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2c819db9803sm8176683a91.45.2024.06.25.02.35.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jun 2024 02:35:43 -0700 (PDT) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH 3/7][Unstable] UBUNTU: SAUCE: media: ivsc: csi: remove privacy status in struct mei_csi Date: Tue, 25 Jun 2024 17:35:16 +0800 Message-ID: <20240625093520.3804382-4-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240625093520.3804382-1-vicamo.yang@canonical.com> References: <20240625093520.3804382-1-vicamo.yang@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.215.178; envelope-from=vicamo@gmail.com; helo=mail-pg1-f178.google.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Wentong Wu BugLink: https://bugs.launchpad.net/bugs/2067364 The privacy status is maintained by privacy_ctrl, on which all of the privacy status changes will go through, so there is no point in maintaining one more element any more. Reported-by: Hao Yao Signed-off-by: Wentong Wu Tested-by: Jason Chen (cherry picked from https://lore.kernel.org/r/all/20240607132547.2820515-4-wentong.wu@intel.com) Signed-off-by: You-Sheng Yang --- drivers/media/pci/intel/ivsc/mei_csi.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/media/pci/intel/ivsc/mei_csi.c b/drivers/media/pci/intel/ivsc/mei_csi.c index 16791a7f4f15..2a9c12c975ca 100644 --- a/drivers/media/pci/intel/ivsc/mei_csi.c +++ b/drivers/media/pci/intel/ivsc/mei_csi.c @@ -138,9 +138,6 @@ struct mei_csi { u32 nr_of_lanes; /* frequency of the CSI-2 link */ u64 link_freq; - - /* privacy status */ - enum ivsc_privacy_status status; }; static const struct v4l2_mbus_framefmt mei_csi_format_mbus_default = { @@ -271,10 +268,9 @@ static void mei_csi_rx(struct mei_cl_device *cldev) switch (notif.cmd_id) { case CSI_PRIVACY_NOTIF: - if (notif.cont.cont < CSI_PRIVACY_MAX) { - csi->status = notif.cont.cont; - v4l2_ctrl_s_ctrl(csi->privacy_ctrl, csi->status); - } + if (notif.cont.cont < CSI_PRIVACY_MAX) + v4l2_ctrl_s_ctrl(csi->privacy_ctrl, + notif.cont.cont == CSI_PRIVACY_ON); break; case CSI_SET_OWNER: case CSI_SET_CONF: From patchwork Tue Jun 25 09:35:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: You-Sheng Yang X-Patchwork-Id: 1952020 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4W7fpM1X3Zz20X1 for ; Tue, 25 Jun 2024 19:35:55 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1sM2ab-00020Z-HJ; Tue, 25 Jun 2024 09:35:49 +0000 Received: from mail-pg1-f174.google.com ([209.85.215.174]) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1sM2aa-0001x8-4g for kernel-team@lists.ubuntu.com; Tue, 25 Jun 2024 09:35:48 +0000 Received: by mail-pg1-f174.google.com with SMTP id 41be03b00d2f7-710437d0affso3962800a12.3 for ; Tue, 25 Jun 2024 02:35:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719308146; x=1719912946; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cbqO0q1rncmk5p/M6LXJZmyO/+j/VdBEIzm07lGNUJY=; b=ZItK9u1ayayn94FvcNH5X+dZz5TdQx+7pf3wcgxE8XLUp1uUTYGf1iWMmXpqD3Vriv eI9pVfg7QORT9+x0CyKoOSJ0QCZ8q2ArW0ewUWKbJXyDxIdpq5RxsqFGP8r2Q5mq+iHQ ChQ10oE/lEDl9qTNNlSKUYoBt2tTOirb0y12t7+kMl1sarg216zFwlWQHXfvd1nQ/CmB u94HfioNZ8lXHe+t95dgB1LQOP3MnKt5h2FMy6mgsVn3JRhk+S/SQy/ZlXcHml5BQF+6 T9b8VdLcmZhjyQ9jVpIpLTmjVRAnDIT5+giOMdsmoTkDhYlW1bRbZsIhyH8fQb2HUEwR 3K7g== X-Gm-Message-State: AOJu0Yx8vgYbWdgmCWGi0FgxmPr6PfLee+fZ5xS0vCGXcXOAh9hmyq8w PKYWvjyrJPAVnwgW8G/BHfMwFd9XGrS9U90gu9Bout2pOfMXNgDTqxLY0fLs X-Google-Smtp-Source: AGHT+IHlKecPcn20ti9g0jPAtRaFaWQ4XbyHszRZgqU8RVtW1dAvYYpXPqRrEOoYnDv6dnTpOSdzbA== X-Received: by 2002:a05:6a20:f3b0:b0:1b8:92f4:ebb4 with SMTP id adf61e73a8af0-1bcf8027d15mr5389362637.62.1719308145945; Tue, 25 Jun 2024 02:35:45 -0700 (PDT) Received: from localhost.localdomain (125-229-129-140.hinet-ip.hinet.net. [125.229.129.140]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2c819db9803sm8176683a91.45.2024.06.25.02.35.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jun 2024 02:35:45 -0700 (PDT) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH 4/7][Unstable] UBUNTU: SAUCE: mei: vsc: Enhance IVSC chipset stability during warm reboot Date: Tue, 25 Jun 2024 17:35:17 +0800 Message-ID: <20240625093520.3804382-5-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240625093520.3804382-1-vicamo.yang@canonical.com> References: <20240625093520.3804382-1-vicamo.yang@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.215.174; envelope-from=vicamo@gmail.com; helo=mail-pg1-f174.google.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Wentong Wu BugLink: https://bugs.launchpad.net/bugs/2067364 During system shutdown, incorporate reset logic to ensure the IVSC chipset remains in a valid state. This adjustment guarantees that the IVSC chipset operates in a known state following a warm reboot. Fixes: 566f5ca97680 ("mei: Add transport driver for IVSC device") Cc: stable@vger.kernel.org # for 6.8+ Signed-off-by: Wentong Wu Tested-by: Jason Chen (cherry picked from https://lore.kernel.org/all/20240624014223.4171341-2-wentong.wu@intel.com/) Signed-off-by: You-Sheng Yang --- drivers/misc/mei/vsc-tp.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/misc/mei/vsc-tp.c b/drivers/misc/mei/vsc-tp.c index e6a98dba8a73..5f3195636e53 100644 --- a/drivers/misc/mei/vsc-tp.c +++ b/drivers/misc/mei/vsc-tp.c @@ -568,6 +568,19 @@ static void vsc_tp_remove(struct spi_device *spi) free_irq(spi->irq, tp); } +static void vsc_tp_shutdown(struct spi_device *spi) +{ + struct vsc_tp *tp = spi_get_drvdata(spi); + + platform_device_unregister(tp->pdev); + + mutex_destroy(&tp->mutex); + + vsc_tp_reset(tp); + + free_irq(spi->irq, tp); +} + static const struct acpi_device_id vsc_tp_acpi_ids[] = { { "INTC1009" }, /* Raptor Lake */ { "INTC1058" }, /* Tiger Lake */ @@ -580,6 +593,7 @@ MODULE_DEVICE_TABLE(acpi, vsc_tp_acpi_ids); static struct spi_driver vsc_tp_driver = { .probe = vsc_tp_probe, .remove = vsc_tp_remove, + .shutdown = vsc_tp_shutdown, .driver = { .name = "vsc-tp", .acpi_match_table = vsc_tp_acpi_ids, From patchwork Tue Jun 25 09:35:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: You-Sheng Yang X-Patchwork-Id: 1952021 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4W7fpP5shrz20X1 for ; Tue, 25 Jun 2024 19:35:57 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1sM2ad-000248-QG; Tue, 25 Jun 2024 09:35:51 +0000 Received: from mail-pg1-f180.google.com ([209.85.215.180]) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1sM2ab-0001zf-UY for kernel-team@lists.ubuntu.com; Tue, 25 Jun 2024 09:35:50 +0000 Received: by mail-pg1-f180.google.com with SMTP id 41be03b00d2f7-7178727da84so2463786a12.0 for ; Tue, 25 Jun 2024 02:35:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719308147; x=1719912947; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FWUZYalmvMflnX+PUb7F+CW6xF8Evl9yhs5poW4hzMM=; b=SWh5UIb8MyVz00wcFliO27Rjqan2F00Yb9qG79qVUGd3mHPQ2pVssgR6IjFKNGqv3h pbdFdrbp3aK4oWXKOUO2tYBwyATpS5+4yvaWNuq+Vusiw4TZOkiq/vf4UaeEZjl7awEL aayDXzry9rNwXgvQMV7PoALtQgmSpuZ5u4KZlh7GotLJGwwlVv3uttn1ut0ak/3lkXcJ zsSurmU7lABZOjVRhVCfsBFBw1MrNXwXQ3FBOnvziwtJHh5E6ki9Aru6swj4nWYNZuGn UfqCWYUWExoKGlsLd6mb0zJXcL8Jqaa8O/Ufq8jES1m6+M5sRkseJ+/VNy11hnLvVI2U Crvg== X-Gm-Message-State: AOJu0YwAG3oEJoMzAAZydM1l3KD8Lwdkjt3vIGnR2Pc/lfMCBkSxpbbw HdUkGx6JLPYMYCP0QmUio+FRVx9QPO/e/ZAZCm86xRH1RweXj5PvKlBGSiYf X-Google-Smtp-Source: AGHT+IE4aWT/nkgvocKjhx4oOYKDG5fj3O43RlABXfAMj85BhCVEc/nk33DfeM22p1ur3XTxDUFqMg== X-Received: by 2002:a17:90a:610:b0:2c3:1937:3042 with SMTP id 98e67ed59e1d1-2c8504c7eedmr6650979a91.5.1719308147307; Tue, 25 Jun 2024 02:35:47 -0700 (PDT) Received: from localhost.localdomain (125-229-129-140.hinet-ip.hinet.net. [125.229.129.140]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2c819db9803sm8176683a91.45.2024.06.25.02.35.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jun 2024 02:35:46 -0700 (PDT) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH 5/7][Unstable] UBUNTU: SAUCE: mei: vsc: Enhance SPI transfer of IVSC rom Date: Tue, 25 Jun 2024 17:35:18 +0800 Message-ID: <20240625093520.3804382-6-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240625093520.3804382-1-vicamo.yang@canonical.com> References: <20240625093520.3804382-1-vicamo.yang@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.215.180; envelope-from=vicamo@gmail.com; helo=mail-pg1-f180.google.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Wentong Wu BugLink: https://bugs.launchpad.net/bugs/2067364 Constructing the SPI transfer command as per the specific request. Fixes: 566f5ca97680 ("mei: Add transport driver for IVSC device") Cc: stable@vger.kernel.org # for 6.8+ Signed-off-by: Wentong Wu Tested-by: Jason Chen (cherry picked from https://lore.kernel.org/all/20240624014223.4171341-3-wentong.wu@intel.com/) Signed-off-by: You-Sheng Yang --- drivers/misc/mei/vsc-tp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/misc/mei/vsc-tp.c b/drivers/misc/mei/vsc-tp.c index 5f3195636e53..fed156919fda 100644 --- a/drivers/misc/mei/vsc-tp.c +++ b/drivers/misc/mei/vsc-tp.c @@ -331,7 +331,7 @@ int vsc_tp_rom_xfer(struct vsc_tp *tp, const void *obuf, void *ibuf, size_t len) return ret; } - ret = vsc_tp_dev_xfer(tp, tp->tx_buf, tp->rx_buf, len); + ret = vsc_tp_dev_xfer(tp, tp->tx_buf, ibuf ? tp->rx_buf : ibuf, len); if (ret) return ret; From patchwork Tue Jun 25 09:35:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: You-Sheng Yang X-Patchwork-Id: 1952022 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4W7fpS0FTcz20X1 for ; Tue, 25 Jun 2024 19:36:00 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1sM2af-000286-Mo; Tue, 25 Jun 2024 09:35:53 +0000 Received: from mail-pj1-f47.google.com ([209.85.216.47]) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1sM2ad-00022D-FR for kernel-team@lists.ubuntu.com; Tue, 25 Jun 2024 09:35:51 +0000 Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-2c80637ee79so3602685a91.0 for ; Tue, 25 Jun 2024 02:35:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719308149; x=1719912949; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=clcKdTOxWBMLmzBNFNIlxjn17YXmMaZP/FRJllpTLi0=; b=Qr+PQnZM2ff7kYfapxUjZRAOB7HLl1nQfZuJByuJt03OY8sCdTP3iACIsVOHJLg6Rp LQaOWDL7Qvsi5qpsiRn2kRprz4L3B5Q0dUEtZHq9SM1SA07C+YLcIf2+D+XRil9d5NTW 4v8HbL1MSxSiUbxV/Cb9ssnbwMDmeYlTZ8WUDXHDHwQ7AbhgdtmmmCG5nYPtF0RyD8QD pthvWgkPSIctsxjBDTb3j8sOawILXq3Lu9n12CfRHceGqxOmcfL5M3zAKiDYml3Ac4ZK ilSHXAY9ety1f8co/77afv8n/4SGUEvfSI0FKGBYDkwt4neAST9eeao2RmA6dIv1YDck U1Iw== X-Gm-Message-State: AOJu0YxsaXWdgn48jN6wGCKL48oJOWvqYwjGqY8EaTrxaK/X6jMs6fhR 6MqovigEU8x15HYPi85QDOM57ec3WRa/hb2IYytzVGPk2uT/ipq7TNankdM2 X-Google-Smtp-Source: AGHT+IFk67CbRLOtu2XqC2g8Rbx2owupB0bVWY50JOwTk/pODdGK7+d4Ifq6yTZfCYS91n31+PBKkg== X-Received: by 2002:a17:90a:604e:b0:2bd:f1d5:8e3e with SMTP id 98e67ed59e1d1-2c86146c80emr5387358a91.35.1719308148895; Tue, 25 Jun 2024 02:35:48 -0700 (PDT) Received: from localhost.localdomain (125-229-129-140.hinet-ip.hinet.net. [125.229.129.140]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2c819db9803sm8176683a91.45.2024.06.25.02.35.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jun 2024 02:35:48 -0700 (PDT) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH 6/7][Unstable] UBUNTU: SAUCE: mei: vsc: Utilize the appropriate byte order swap function Date: Tue, 25 Jun 2024 17:35:19 +0800 Message-ID: <20240625093520.3804382-7-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240625093520.3804382-1-vicamo.yang@canonical.com> References: <20240625093520.3804382-1-vicamo.yang@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.216.47; envelope-from=vicamo@gmail.com; helo=mail-pj1-f47.google.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Wentong Wu BugLink: https://bugs.launchpad.net/bugs/2067364 Switch from cpu_to_be32_array() to be32_to_cpu_array() for the received rom data. Fixes: 566f5ca97680 ("mei: Add transport driver for IVSC device") Cc: stable@vger.kernel.org # for 6.8+ Signed-off-by: Wentong Wu Tested-by: Jason Chen (cherry picked from https://lore.kernel.org/all/20240624014223.4171341-4-wentong.wu@intel.com/) Signed-off-by: You-Sheng Yang --- drivers/misc/mei/vsc-tp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/misc/mei/vsc-tp.c b/drivers/misc/mei/vsc-tp.c index fed156919fda..12236599649e 100644 --- a/drivers/misc/mei/vsc-tp.c +++ b/drivers/misc/mei/vsc-tp.c @@ -336,7 +336,7 @@ int vsc_tp_rom_xfer(struct vsc_tp *tp, const void *obuf, void *ibuf, size_t len) return ret; if (ibuf) - cpu_to_be32_array(ibuf, tp->rx_buf, words); + be32_to_cpu_array(ibuf, tp->rx_buf, words); return ret; } From patchwork Tue Jun 25 09:35:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: You-Sheng Yang X-Patchwork-Id: 1952023 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4W7fpS6kZNz20X1 for ; Tue, 25 Jun 2024 19:36:00 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1sM2ah-0002BN-7l; Tue, 25 Jun 2024 09:35:55 +0000 Received: from mail-pg1-f182.google.com ([209.85.215.182]) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1sM2ae-00023a-Gp for kernel-team@lists.ubuntu.com; Tue, 25 Jun 2024 09:35:52 +0000 Received: by mail-pg1-f182.google.com with SMTP id 41be03b00d2f7-7182a634815so2485787a12.3 for ; Tue, 25 Jun 2024 02:35:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719308150; x=1719912950; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0GISFu4J3UrqxiuEMJgYCnDbd5CZSGxDGOGADt0IMjg=; b=H7CT2y0FM1HYnM10Vct2yGaXne6Lo4k8f/9FCvziHOjCDd63c0nbNXM6U8tsbJuwR3 E5rPrkZOhvr7lxkKcebcPMqvakW+FeXGcvMk1DzcWWmgxlom58qJqcRhN7s3Ym1mtd2W DP2mDVYkLQL2wTmg40fw1hR7qeRD9tBbfS0t/LE2Ua1KO8F8ZM5EncIBrTNiOQYvUDZJ J7ZovTi4LUJz7gdnV2q3lqnUghZ2v4jgBStIyzlXeXU80ru4qZ5a86Dmb6b7GrDcP9UO 0Sh8nCGXr7trUtjNOKi302TJ6eL/25GfQscDL+vI7Q1cLDs8ai8f9orQZPVmwCbdRShA ndOQ== X-Gm-Message-State: AOJu0YxwaqLr2URRUGcNrUGhWvL5q8yTnUS+Wh6VNGBB8w2CkavCC3PR P5t48r7fAtYeUls6kl11twQHSLvlMpZ+Oq/KBXWnHAqyq/yWS2GbU/I4PR2I X-Google-Smtp-Source: AGHT+IFSkJlHhqDyLnO7IUEwkGr+efa5p9S/C8HYAPqQ0fSKuiEb/0HHnxxpYwKhNLYOAaGIdYibWw== X-Received: by 2002:a05:6a20:4f21:b0:1b7:d5d5:415b with SMTP id adf61e73a8af0-1bcf7ffa946mr5426845637.57.1719308150296; Tue, 25 Jun 2024 02:35:50 -0700 (PDT) Received: from localhost.localdomain (125-229-129-140.hinet-ip.hinet.net. [125.229.129.140]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2c819db9803sm8176683a91.45.2024.06.25.02.35.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jun 2024 02:35:49 -0700 (PDT) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH 7/7][Unstable] UBUNTU: SAUCE: mei: vsc: Prevent timeout error with added delay post-firmware download Date: Tue, 25 Jun 2024 17:35:20 +0800 Message-ID: <20240625093520.3804382-8-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240625093520.3804382-1-vicamo.yang@canonical.com> References: <20240625093520.3804382-1-vicamo.yang@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.215.182; envelope-from=vicamo@gmail.com; helo=mail-pg1-f182.google.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Wentong Wu BugLink: https://bugs.launchpad.net/bugs/2067364 After completing the firmware download, the firmware requires some time to become functional. This change introduces additional sleep time before the first read operation to prevent a confusing timeout error in vsc_tp_xfer(). Fixes: 566f5ca97680 ("mei: Add transport driver for IVSC device") Cc: stable@vger.kernel.org # for 6.8+ Signed-off-by: Wentong Wu Tested-by: Jason Chen (cherry picked from https://lore.kernel.org/all/20240624014223.4171341-5-wentong.wu@intel.com/) Signed-off-by: You-Sheng Yang --- drivers/misc/mei/platform-vsc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/misc/mei/platform-vsc.c b/drivers/misc/mei/platform-vsc.c index 1ec65d87488a..d02f6e881139 100644 --- a/drivers/misc/mei/platform-vsc.c +++ b/drivers/misc/mei/platform-vsc.c @@ -28,8 +28,8 @@ #define MEI_VSC_MAX_MSG_SIZE 512 -#define MEI_VSC_POLL_DELAY_US (50 * USEC_PER_MSEC) -#define MEI_VSC_POLL_TIMEOUT_US (200 * USEC_PER_MSEC) +#define MEI_VSC_POLL_DELAY_US (100 * USEC_PER_MSEC) +#define MEI_VSC_POLL_TIMEOUT_US (400 * USEC_PER_MSEC) #define mei_dev_to_vsc_hw(dev) ((struct mei_vsc_hw *)((dev)->hw))