From 24e7e1f1001ebe071c48d77d4b6dcdcf401eb8aa Mon Sep 17 00:00:00 2001
From: hermanlin <herman.lin@emc.com.tw>
Date: Thu, 30 Jun 2022 15:52:46 +0800
Subject: [PATCH] elanmoc: Make sure sensor in the right mode at identity

Signed-off-by: hermanlin <herman.lin@emc.com.tw>
---
 libfprint/drivers/elanmoc/elanmoc.c |   8 ++
 tests/elanmoc/custom.pcapng         | Bin 19368 -> 17540 bytes
 tests/elanmoc/device                | 136 +++++++++++++++-------------
 3 files changed, 80 insertions(+), 64 deletions(-)

diff --git a/libfprint/drivers/elanmoc/elanmoc.c b/libfprint/drivers/elanmoc/elanmoc.c
index ad23e93e..5bcfce27 100644
--- a/libfprint/drivers/elanmoc/elanmoc.c
+++ b/libfprint/drivers/elanmoc/elanmoc.c
@@ -759,6 +759,7 @@ identify_status_report (FpiDeviceElanmoc *self, int verify_status_id,
 }
 
 enum identify_states {
+  IDENTIFY_SET_MODE,
   IDENTIFY_WAIT_FINGER,
   IDENTIFY_NUM_STATES,
 };
@@ -794,6 +795,13 @@ elan_identify_run_state (FpiSsm *ssm, FpDevice *dev)
   fp_info ("elanmoc %s ", __func__);
   switch (fpi_ssm_get_cur_state (ssm))
     {
+    case IDENTIFY_SET_MODE:
+      fp_info ("elanmoc %s IDENTIFY_SET_MODE", __func__);
+      cmd_buf = elanmoc_compose_cmd (&elanmoc_set_mod_cmd);
+      cmd_buf[3] = 0x03;
+      elanmoc_get_cmd (dev, cmd_buf, elanmoc_set_mod_cmd.cmd_len, elanmoc_set_mod_cmd.resp_len, 0, elanmoc_cmd_ack_cb);
+      break;
+
     case IDENTIFY_WAIT_FINGER:
       fp_info ("elanmoc %s VERIFY_WAIT_FINGER", __func__);
       cmd_buf = elanmoc_compose_cmd (&elanmoc_verify_cmd);
diff --git a/tests/elanmoc/custom.pcapng b/tests/elanmoc/custom.pcapng
index a41ac1626fe77062bf0bbfe81773715dd8a9a222..c839c37e922c91f8834f24fc326307a377ff36a9 100644
GIT binary patch
literal 17540
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

literal 19368
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
QnE!q=SN$Uy0ZttM1Ehp|k^lez

diff --git a/tests/elanmoc/device b/tests/elanmoc/device
index ef3400dd..34751f2d 100644
--- a/tests/elanmoc/device
+++ b/tests/elanmoc/device
@@ -1,63 +1,67 @@
-P: /devices/pci0000:00/0000:00:14.0/usb1/1-1
-N: bus/usb/001/010=1201000200000040F3047E0C05030102000109025300010103A0320904000008FF0000000921100100012215000705810240000107050102400001070582024000010705020240000107058302400001070503024000010705840240000107050402400001
-E: DEVNAME=/dev/bus/usb/001/010
+P: /devices/pci0000:00/0000:00:14.0/usb1/1-9
+N: bus/usb/001/003=1201000200000008F304880C04800102000109025300010100A0320904000008FF0000000921100100012215000705810240000107050102400001070582024000010705020240000107058302400001070503024000010705840240000107050402400001
+E: DEVNAME=/dev/bus/usb/001/003
 E: DEVTYPE=usb_device
 E: DRIVER=usb
-E: PRODUCT=4f3/c7e/305
+E: PRODUCT=4f3/c88/8004
 E: TYPE=0/0/0
 E: BUSNUM=001
-E: DEVNUM=010
+E: DEVNUM=003
 E: MAJOR=189
-E: MINOR=9
+E: MINOR=2
 E: SUBSYSTEM=usb
 E: ID_VENDOR=ELAN
 E: ID_VENDOR_ENC=ELAN
 E: ID_VENDOR_ID=04f3
 E: ID_MODEL=ELAN:ARM-M4
 E: ID_MODEL_ENC=ELAN:ARM-M4
-E: ID_MODEL_ID=0c7e
-E: ID_REVISION=0305
+E: ID_MODEL_ID=0c88
+E: ID_REVISION=8004
 E: ID_SERIAL=ELAN_ELAN:ARM-M4
 E: ID_BUS=usb
 E: ID_USB_INTERFACES=:ff0000:
 E: ID_VENDOR_FROM_DATABASE=Elan Microelectronics Corp.
-E: ID_PATH=pci-0000:00:14.0-usb-0:1
-E: ID_PATH_TAG=pci-0000_00_14_0-usb-0_1
+E: ID_PATH=pci-0000:00:14.0-usb-0:9
+E: ID_PATH_TAG=pci-0000_00_14_0-usb-0_9
+E: ID_FOR_SEAT=usb-pci-0000_00_14_0-usb-0_9
+E: TAGS=:seat:
+E: CURRENT_TAGS=:seat:
 A: authorized=1\n
 A: avoid_reset_quirk=0\n
 A: bConfigurationValue=1\n
 A: bDeviceClass=00\n
 A: bDeviceProtocol=00\n
 A: bDeviceSubClass=00\n
-A: bMaxPacketSize0=64\n
+A: bMaxPacketSize0=8\n
 A: bMaxPower=100mA\n
 A: bNumConfigurations=1\n
 A: bNumInterfaces= 1\n
-A: bcdDevice=0305\n
+A: bcdDevice=8004\n
 A: bmAttributes=a0\n
 A: busnum=1\n
-A: configuration=add909c9-e67e-4126-a6f7-1e31179e27d9\n
-H: descriptors=1201000200000040F3047E0C05030102000109025300010103A0320904000008FF0000000921100100012215000705810240000107050102400001070582024000010705020240000107058302400001070503024000010705840240000107050402400001
-A: dev=189:9\n
-A: devnum=10\n
-A: devpath=1\n
+A: configuration=
+H: descriptors=1201000200000008F304880C04800102000109025300010100A0320904000008FF0000000921100100012215000705810240000107050102400001070582024000010705020240000107058302400001070503024000010705840240000107050402400001
+A: dev=189:2\n
+A: devnum=3\n
+A: devpath=9\n
 L: driver=../../../../../bus/usb/drivers/usb
-A: idProduct=0c7e\n
+L: firmware_node=../../../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:3d/device:3e/device:47
+A: idProduct=0c88\n
 A: idVendor=04f3\n
 A: ltm_capable=no\n
 A: manufacturer=ELAN\n
 A: maxchild=0\n
-L: port=../1-0:1.0/usb1-port1
-A: power/active_duration=94712\n
+L: port=../1-0:1.0/usb1-port9
+A: power/active_duration=35269124\n
 A: power/async=enabled\n
 A: power/autosuspend=2\n
 A: power/autosuspend_delay_ms=2000\n
-A: power/connected_duration=94712\n
+A: power/connected_duration=35283788\n
 A: power/control=on\n
 A: power/level=on\n
-A: power/persist=1\n
+A: power/persist=0\n
 A: power/runtime_active_kids=0\n
-A: power/runtime_active_time=94436\n
+A: power/runtime_active_time=35276624\n
 A: power/runtime_enabled=forbidden\n
 A: power/runtime_status=active\n
 A: power/runtime_suspended_time=0\n
@@ -77,38 +81,40 @@ A: removable=removable\n
 A: rx_lanes=1\n
 A: speed=12\n
 A: tx_lanes=1\n
-A: urbnum=12\n
+A: urbnum=2773\n
 A: version= 2.00\n
 
 P: /devices/pci0000:00/0000:00:14.0/usb1
-N: bus/usb/001/001=12010002090001406B1D020004050302010109021900010100E0000904000001090000000705810304000C
+N: bus/usb/001/001=12010002090001406B1D020015050302010109021900010100E0000904000001090000000705810304000C
 E: DEVNAME=/dev/bus/usb/001/001
 E: DEVTYPE=usb_device
 E: DRIVER=usb
-E: PRODUCT=1d6b/2/504
+E: PRODUCT=1d6b/2/515
 E: TYPE=9/0/1
 E: BUSNUM=001
 E: DEVNUM=001
 E: MAJOR=189
 E: MINOR=0
 E: SUBSYSTEM=usb
-E: ID_VENDOR=Linux_5.4.0-42-generic_xhci-hcd
-E: ID_VENDOR_ENC=Linux\x205.4.0-42-generic\x20xhci-hcd
+E: ID_VENDOR=Linux_5.15.0-39-generic_xhci-hcd
+E: ID_VENDOR_ENC=Linux\x205.15.0-39-generic\x20xhci-hcd
 E: ID_VENDOR_ID=1d6b
 E: ID_MODEL=xHCI_Host_Controller
 E: ID_MODEL_ENC=xHCI\x20Host\x20Controller
 E: ID_MODEL_ID=0002
-E: ID_REVISION=0504
-E: ID_SERIAL=Linux_5.4.0-42-generic_xhci-hcd_xHCI_Host_Controller_0000:00:14.0
+E: ID_REVISION=0515
+E: ID_SERIAL=Linux_5.15.0-39-generic_xhci-hcd_xHCI_Host_Controller_0000:00:14.0
 E: ID_SERIAL_SHORT=0000:00:14.0
 E: ID_BUS=usb
 E: ID_USB_INTERFACES=:090000:
 E: ID_VENDOR_FROM_DATABASE=Linux Foundation
+E: ID_AUTOSUSPEND=1
 E: ID_MODEL_FROM_DATABASE=2.0 root hub
 E: ID_PATH=pci-0000:00:14.0
 E: ID_PATH_TAG=pci-0000_00_14_0
 E: ID_FOR_SEAT=usb-pci-0000_00_14_0
 E: TAGS=:seat:
+E: CURRENT_TAGS=:seat:
 A: authorized=1\n
 A: authorized_default=1\n
 A: avoid_reset_quirk=0\n
@@ -120,30 +126,31 @@ A: bMaxPacketSize0=64\n
 A: bMaxPower=0mA\n
 A: bNumConfigurations=1\n
 A: bNumInterfaces= 1\n
-A: bcdDevice=0504\n
+A: bcdDevice=0515\n
 A: bmAttributes=e0\n
 A: busnum=1\n
-A: configuration=\n
-H: descriptors=12010002090001406B1D020004050302010109021900010100E0000904000001090000000705810304000C
+A: configuration=
+H: descriptors=12010002090001406B1D020015050302010109021900010100E0000904000001090000000705810304000C
 A: dev=189:0\n
 A: devnum=1\n
 A: devpath=0\n
 L: driver=../../../../bus/usb/drivers/usb
+L: firmware_node=../../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:3d/device:3e
 A: idProduct=0002\n
 A: idVendor=1d6b\n
 A: interface_authorized_default=1\n
 A: ltm_capable=no\n
-A: manufacturer=Linux 5.4.0-42-generic xhci-hcd\n
-A: maxchild=12\n
-A: power/active_duration=74604360\n
+A: manufacturer=Linux 5.15.0-39-generic xhci-hcd\n
+A: maxchild=14\n
+A: power/active_duration=35270364\n
 A: power/async=enabled\n
 A: power/autosuspend=0\n
 A: power/autosuspend_delay_ms=0\n
-A: power/connected_duration=74606456\n
+A: power/connected_duration=35284300\n
 A: power/control=auto\n
 A: power/level=auto\n
-A: power/runtime_active_kids=4\n
-A: power/runtime_active_time=74605838\n
+A: power/runtime_active_kids=2\n
+A: power/runtime_active_time=35277420\n
 A: power/runtime_enabled=enabled\n
 A: power/runtime_status=active\n
 A: power/runtime_suspended_time=0\n
@@ -164,62 +171,63 @@ A: rx_lanes=1\n
 A: serial=0000:00:14.0\n
 A: speed=480\n
 A: tx_lanes=1\n
-A: urbnum=490\n
+A: urbnum=549\n
 A: version= 2.00\n
 
 P: /devices/pci0000:00/0000:00:14.0
 E: DRIVER=xhci_hcd
 E: PCI_CLASS=C0330
-E: PCI_ID=8086:9DED
-E: PCI_SUBSYS_ID=103C:85EF
+E: PCI_ID=8086:8C31
+E: PCI_SUBSYS_ID=1043:201F
 E: PCI_SLOT_NAME=0000:00:14.0
-E: MODALIAS=pci:v00008086d00009DEDsv0000103Csd000085EFbc0Csc03i30
+E: MODALIAS=pci:v00008086d00008C31sv00001043sd0000201Fbc0Csc03i30
 E: SUBSYSTEM=pci
 E: ID_PCI_CLASS_FROM_DATABASE=Serial bus controller
 E: ID_PCI_SUBCLASS_FROM_DATABASE=USB controller
 E: ID_PCI_INTERFACE_FROM_DATABASE=XHCI
 E: ID_VENDOR_FROM_DATABASE=Intel Corporation
-E: ID_MODEL_FROM_DATABASE=Cannon Point-LP USB 3.1 xHCI Controller
+E: ID_MODEL_FROM_DATABASE=8 Series/C220 Series Chipset Family USB xHCI
 A: ari_enabled=0\n
 A: broken_parity_status=0\n
 A: class=0x0c0330\n
-H: config=8680ED9D060490023030030C00008000040030A10000000000000000000000000000000000000000000000003C10EF85000000007000000000000000FF010000FD0134808FC6FF8300000000000000007F6DDC0F00000000181C030400000000316000000000000000000000000000000180C2C1080000000000000000000000059087007802E0FE0000000000000000090014F01000400100000000C10A080000080E00001800008F40020000010000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000B50F300112000000
+H: config=8680318C060490020530030C000000000400A0F700000000000000000000000000000000000000000000000043101F200000000070000000000000000B010000FD01368089C60F8000000000000000009F6E8807000000000000000000000000302000000000000000000000000000000180C2C1080000000000000000000000050087000410E0FE000000002F00000000000000000000000000000000000000400100000000000000000000000000000F000100000000000000000000000000030420C0030C3000030C300000000000FF1A0000FF1A00003F0000003F000000A00000000000000000000000D8D8D8080000000000000000B10F060800000000
 A: consistent_dma_mask_bits=64\n
 A: d3cold_allowed=1\n
-A: dbc=disabled\n
-A: device=0x9ded\n
+A: device=0x8c31\n
 A: dma_mask_bits=64\n
 L: driver=../../../bus/pci/drivers/xhci_hcd
 A: driver_override=(null)\n
 A: enable=1\n
-A: irq=124\n
+L: firmware_node=../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:3d
+A: irq=31\n
 A: local_cpulist=0-3\n
 A: local_cpus=f\n
-A: modalias=pci:v00008086d00009DEDsv0000103Csd000085EFbc0Csc03i30\n
+A: modalias=pci:v00008086d00008C31sv00001043sd0000201Fbc0Csc03i30\n
 A: msi_bus=1\n
-A: msi_irqs/124=msi\n
+A: msi_irqs/31=msi\n
 A: numa_node=-1\n
-A: pools=poolinfo - 0.1\nbuffer-2048         0    0 2048  0\nbuffer-512          0    0  512  0\nbuffer-128          0   32  128  1\nbuffer-32           0    0   32  0\nxHCI 1KB stream ctx arrays    0    0 1024  0\nxHCI 256 byte stream ctx arrays    0    0  256  0\nxHCI input/output contexts   11   12 2112 12\nxHCI ring segments   54   54 4096 54\nbuffer-2048         0    0 2048  0\nbuffer-512          0    0  512  0\nbuffer-128          9   32  128  1\nbuffer-32           0    0   32  0\n
+A: pools=poolinfo - 0.1\nbuffer-2048         0    0 2048  0\nbuffer-512          0    0  512  0\nbuffer-128          0    0  128  0\nbuffer-32           0    0   32  0\nxHCI 1KB stream ctx arrays    0    0 1024  0\nxHCI 256 byte stream ctx arrays    0    0  256  0\nxHCI input/output contexts    5    6 2112  6\nxHCI ring segments   24   24 4096 24\nbuffer-2048         0    0 2048  0\nbuffer-512          0    0  512  0\nbuffer-128          3   32  128  1\nbuffer-32           0    0   32  0\n
 A: power/async=enabled\n
-A: power/control=auto\n
+A: power/control=on\n
 A: power/runtime_active_kids=1\n
-A: power/runtime_active_time=74606194\n
-A: power/runtime_enabled=enabled\n
+A: power/runtime_active_time=35278060\n
+A: power/runtime_enabled=forbidden\n
 A: power/runtime_status=active\n
 A: power/runtime_suspended_time=0\n
-A: power/runtime_usage=0\n
+A: power/runtime_usage=1\n
 A: power/wakeup=enabled\n
 A: power/wakeup_abort_count=0\n
 A: power/wakeup_active=0\n
-A: power/wakeup_active_count=0\n
+A: power/wakeup_active_count=5\n
 A: power/wakeup_count=0\n
-A: power/wakeup_expire_count=0\n
-A: power/wakeup_last_time_ms=0\n
-A: power/wakeup_max_time_ms=0\n
-A: power/wakeup_total_time_ms=0\n
-A: resource=0x00000000a1300000 0x00000000a130ffff 0x0000000000140204\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n
-A: revision=0x30\n
-A: subsystem_device=0x85ef\n
-A: subsystem_vendor=0x103c\n
+A: power/wakeup_expire_count=5\n
+A: power/wakeup_last_time_ms=12694896\n
+A: power/wakeup_max_time_ms=103\n
+A: power/wakeup_total_time_ms=518\n
+A: power_state=D0\n
+A: resource=0x00000000f7a00000 0x00000000f7a0ffff 0x0000000000140204\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n
+A: revision=0x05\n
+A: subsystem_device=0x201f\n
+A: subsystem_vendor=0x1043\n
 A: vendor=0x8086\n