From patchwork Wed Mar 5 03:33:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xu, Even" X-Patchwork-Id: 14001908 X-Patchwork-Delegate: jikos@jikos.cz Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.14]) (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 B4E172E3398; Wed, 5 Mar 2025 03:34:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.14 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741145660; cv=none; b=G9YlVrrS2lkjOmSFHSTtZTKvjZwgzhC13fAi1X0D23tmoFhmK0/h5QjXdnYBZ6QRTPHUIVCP0iHqR8pkaYUgndXEDqC7kB3YfKGRewK5hsfPYg+VqrcobxVyGZNqNTUDYpLNdEuXx2cK0MWjHcztkRrkAQm+rhKDfnfmOVNuX4c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741145660; c=relaxed/simple; bh=5SZnYqKtintM6MElQl5EBSZk67lFq4gMneY8nZvCMv4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=m7eNmCpNcb9+oLttW4kWtOM056GprEaGwvHei20BkkX+a14OmKp/arKOPoftoq/bT3oAvZKXjKJfFXA1tcoODPSJPe9oFenNZCdrmUNE0VmqZQOK5N8xVcMomDc8A5T79c/R2hVduzHhKbR+CAHWR2wqGZyU6hepHtasS1B9gvI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=CSajs5dv; arc=none smtp.client-ip=198.175.65.14 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="CSajs5dv" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741145659; x=1772681659; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=5SZnYqKtintM6MElQl5EBSZk67lFq4gMneY8nZvCMv4=; b=CSajs5dvYj6P4+YQfpMKa+0ytsSAwFNEj5AWBRIfuvc2LiYPaJ00aE8s Z1soPFx0l+I7GQrMAe4dd1zzDi1m5ECvGyu9WY0H1Jh/zNvqHQWmgN8Xa xiZ9CSdtSz3j0qoYBv0oXFV9EyJjDWZz5hOUtIeh2kEQucjknBzhfq8sM kUM5yWKP5dTqnLZaoFSlKVnzwyhUDxE7rGl3jk5a4e9wq8J/bkDd0IqYg E0BUm8epVKmHdL6K2bJ5diTl5My6vQ9kPuMddC13n+V12YRPIH+RPo8d+ xoNKtBwclqYF/Tgcb/cPv9/7XwyzYmGh3UiOxRc73k5vkR4EgT4S6IxlT Q==; X-CSE-ConnectionGUID: HPtqvoI+TWaXg2cZoVRuXg== X-CSE-MsgGUID: SLxA9uLIS92/23i8GpcS0g== X-IronPort-AV: E=McAfee;i="6700,10204,11363"; a="45864374" X-IronPort-AV: E=Sophos;i="6.14,221,1736841600"; d="scan'208";a="45864374" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by orvoesa106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Mar 2025 19:34:17 -0800 X-CSE-ConnectionGUID: HlFpmsfDSeG07EW4IBuqew== X-CSE-MsgGUID: TQeBKdYwQQSJqQYe6oZ1NQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,221,1736841600"; d="scan'208";a="118284014" Received: from shsensorbuild.sh.intel.com ([10.239.133.18]) by orviesa009.jf.intel.com with ESMTP; 04 Mar 2025 19:34:15 -0800 From: Even Xu To: jikos@kernel.org, bentiss@kernel.org Cc: srinivas.pandruvada@linux.intel.com, mpearson-lenovo@squebb.ca, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Even Xu Subject: [PATCH v2 1/2] HID: Intel-thc-hid: Intel-quickspi: Correct device state names gramatically Date: Wed, 5 Mar 2025 11:33:30 +0800 Message-Id: <20250305033331.2544941-2-even.xu@intel.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20250305033331.2544941-1-even.xu@intel.com> References: <20250305033331.2544941-1-even.xu@intel.com> Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Correct quickspi device state name and change the list order to follow device state working flow. Signed-off-by: Even Xu --- drivers/hid/intel-thc-hid/intel-quickspi/pci-quickspi.c | 2 +- drivers/hid/intel-thc-hid/intel-quickspi/quickspi-dev.h | 4 ++-- drivers/hid/intel-thc-hid/intel-quickspi/quickspi-protocol.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/hid/intel-thc-hid/intel-quickspi/pci-quickspi.c b/drivers/hid/intel-thc-hid/intel-quickspi/pci-quickspi.c index 4641e818dfa4..59d0b71e6e4f 100644 --- a/drivers/hid/intel-thc-hid/intel-quickspi/pci-quickspi.c +++ b/drivers/hid/intel-thc-hid/intel-quickspi/pci-quickspi.c @@ -426,7 +426,7 @@ static struct quickspi_device *quickspi_dev_init(struct pci_dev *pdev, void __io thc_interrupt_enable(qsdev->thc_hw, true); - qsdev->state = QUICKSPI_INITED; + qsdev->state = QUICKSPI_INITIATED; return qsdev; } diff --git a/drivers/hid/intel-thc-hid/intel-quickspi/quickspi-dev.h b/drivers/hid/intel-thc-hid/intel-quickspi/quickspi-dev.h index 75179bb26767..6fdf674b21c5 100644 --- a/drivers/hid/intel-thc-hid/intel-quickspi/quickspi-dev.h +++ b/drivers/hid/intel-thc-hid/intel-quickspi/quickspi-dev.h @@ -57,9 +57,9 @@ enum quickspi_dev_state { QUICKSPI_NONE, + QUICKSPI_INITIATED, QUICKSPI_RESETING, - QUICKSPI_RESETED, - QUICKSPI_INITED, + QUICKSPI_RESET, QUICKSPI_ENABLED, QUICKSPI_DISABLED, }; diff --git a/drivers/hid/intel-thc-hid/intel-quickspi/quickspi-protocol.c b/drivers/hid/intel-thc-hid/intel-quickspi/quickspi-protocol.c index 7373238ceb18..935a6684926c 100644 --- a/drivers/hid/intel-thc-hid/intel-quickspi/quickspi-protocol.c +++ b/drivers/hid/intel-thc-hid/intel-quickspi/quickspi-protocol.c @@ -333,7 +333,7 @@ int reset_tic(struct quickspi_device *qsdev) return -EINVAL; } - qsdev->state = QUICKSPI_RESETED; + qsdev->state = QUICKSPI_RESET; ret = quickspi_get_device_descriptor(qsdev); if (ret) From patchwork Wed Mar 5 03:33:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xu, Even" X-Patchwork-Id: 14001909 X-Patchwork-Delegate: jikos@jikos.cz Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.14]) (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 37B0115D5C4; Wed, 5 Mar 2025 03:34:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.14 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741145660; cv=none; b=eZ4RwPyVC4Y66hEiYMFfEWz/GwfAbFaa05tL39NvTXTXQNdxwZcOFF2hhld3allH4K0OGq8m2tDtlWmex/ur4lKaH2gnd8GQB/BstzDEY8P9IDnlR2INc4Dhxyw1T4ZG3mASEXLh1bEnV2eETI20y0Vmf+v7q1RVRs/IuIjA2iU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741145660; c=relaxed/simple; bh=v9xdEXzdevwEwRpz0Pd8yR6OBiqo1aPlHapSV5BX8xw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=hZ92cm4Kn8zIYucgqjcnGPN7TFooiLHSUxn4Og5pZGIna/0tiOM9xtUjzIs3R3HRmr9xsXsvjsWttAJRCu9dRp5UrwyUT3SNEp513CDfrHxsZcr5ILwOW2LCYUASQl12tb8V8mhVW573ALvUXIxh/PyAEiz4LnXikw/n0DZHHPk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=KZn+OFyJ; arc=none smtp.client-ip=198.175.65.14 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="KZn+OFyJ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741145659; x=1772681659; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=v9xdEXzdevwEwRpz0Pd8yR6OBiqo1aPlHapSV5BX8xw=; b=KZn+OFyJ+SrxseDYl4u6dow3STtu8KCURSnvf63nRroYntuXkXGya5tN VYQFRUw1HHiPo2uAlfYOzSygOTlFSv1L5NC+VQNVTPRXBwZql4a+ni987 tE/yI23+qvxyOxEYCPw7xww8e6xT/PUw2LqVt7NuIBAOyL8ZJ91Wa1wkW eJCpBXwCClEdl2iKlXMmf+2wwKCBc9GEolrBN4W42zw/1YswnYxLGCs7i 1BcFXsj5v4vP/5vxkTkPiuMozeWkPxaAKtMwpD7cVq9MSCUyOSRfLNZ+j BoFZr378qNmPm1MtgkswMDu2Ig3PiULRu2kG8V53eed+tIWEfRkGqrbsn A==; X-CSE-ConnectionGUID: rJuWUfBdStCQzvPH4eKafg== X-CSE-MsgGUID: WJzRqF6BRcupwmbIPFO3pw== X-IronPort-AV: E=McAfee;i="6700,10204,11363"; a="45864380" X-IronPort-AV: E=Sophos;i="6.14,221,1736841600"; d="scan'208";a="45864380" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by orvoesa106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Mar 2025 19:34:19 -0800 X-CSE-ConnectionGUID: Rwe9SuZ2TIy2dkwY1xTiww== X-CSE-MsgGUID: Jlcrxd5jTlqQdCNS3Tu6Ww== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,221,1736841600"; d="scan'208";a="118284027" Received: from shsensorbuild.sh.intel.com ([10.239.133.18]) by orviesa009.jf.intel.com with ESMTP; 04 Mar 2025 19:34:17 -0800 From: Even Xu To: jikos@kernel.org, bentiss@kernel.org Cc: srinivas.pandruvada@linux.intel.com, mpearson-lenovo@squebb.ca, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Even Xu Subject: [PATCH v2 2/2] HID: Intel-thc-hid: Intel-quickspi: Change device state correctly after S4 Date: Wed, 5 Mar 2025 11:33:31 +0800 Message-Id: <20250305033331.2544941-3-even.xu@intel.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20250305033331.2544941-1-even.xu@intel.com> References: <20250305033331.2544941-1-even.xu@intel.com> Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 During S4 retore flow, quickspi device was reset by driver and state was changed to QUICKSPI_RESET. It is needed to be change to QUICKSPI_ENABLED state after S4 re-initialization finished, otherwise, device will run in wrong state and HID input data will be dropped. Signed-off-by: Even Xu Fixes: 6912aaf3fd24 ("HID: intel-thc-hid: intel-quickspi: Add PM implementation") --- drivers/hid/intel-thc-hid/intel-quickspi/pci-quickspi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/hid/intel-thc-hid/intel-quickspi/pci-quickspi.c b/drivers/hid/intel-thc-hid/intel-quickspi/pci-quickspi.c index 59d0b71e6e4f..9170af9be777 100644 --- a/drivers/hid/intel-thc-hid/intel-quickspi/pci-quickspi.c +++ b/drivers/hid/intel-thc-hid/intel-quickspi/pci-quickspi.c @@ -909,6 +909,8 @@ static int quickspi_restore(struct device *device) thc_change_ltr_mode(qsdev->thc_hw, THC_LTR_MODE_ACTIVE); + qsdev->state = QUICKSPI_ENABLED; + return 0; }