mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Kamal Mostafa <kamal@canonical.com>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org,
	kernel-team@lists.ubuntu.com
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>,
	Kamal Mostafa <kamal@canonical.com>
Subject: [PATCH 3.13 090/105] Input: synaptics - gate forcepad support by DMI check
Date: Mon, 27 Oct 2014 11:57:05 -0700	[thread overview]
Message-ID: <1414436240-13879-91-git-send-email-kamal@canonical.com> (raw)
In-Reply-To: <1414436240-13879-1-git-send-email-kamal@canonical.com>

3.13.11.10 -stable review patch.  If anyone has any objections, please let me know.

------------------

From: Dmitry Torokhov <dmitry.torokhov@gmail.com>

commit aa972409951e0675e07918620427517cad5090e0 upstream.

Unfortunately, ForcePad capability is not actually exported over PS/2, so
we have to resort to DMI checks.

Reported-by: Nicole Faerber <nicole.faerber@kernelconcepts.de>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
---
 drivers/input/mouse/synaptics.c | 22 +++++++++++++++++++++-
 drivers/input/mouse/synaptics.h |  8 ++------
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
index 4b7996e..925e46c 100644
--- a/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
@@ -538,6 +538,8 @@ static void synaptics_parse_agm(const unsigned char buf[],
 	priv->agm_pending = true;
 }
 
+static bool is_forcepad;
+
 static int synaptics_parse_hw_state(const unsigned char buf[],
 				    struct synaptics_data *priv,
 				    struct synaptics_hw_state *hw)
@@ -567,7 +569,7 @@ static int synaptics_parse_hw_state(const unsigned char buf[],
 		hw->left  = (buf[0] & 0x01) ? 1 : 0;
 		hw->right = (buf[0] & 0x02) ? 1 : 0;
 
-		if (SYN_CAP_FORCEPAD(priv->ext_cap_0c)) {
+		if (is_forcepad) {
 			/*
 			 * ForcePads, like Clickpads, use middle button
 			 * bits to report primary button clicks.
@@ -1628,6 +1630,18 @@ static const struct dmi_system_id min_max_dmi_table[] __initconst = {
 	{ }
 };
 
+static const struct dmi_system_id forcepad_dmi_table[] __initconst = {
+#if defined(CONFIG_DMI) && defined(CONFIG_X86)
+	{
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "HP EliteBook Folio 1040 G1"),
+		},
+	},
+#endif
+	{ }
+};
+
 void __init synaptics_module_init(void)
 {
 	const struct dmi_system_id *min_max_dmi;
@@ -1638,6 +1652,12 @@ void __init synaptics_module_init(void)
 	min_max_dmi = dmi_first_match(min_max_dmi_table);
 	if (min_max_dmi)
 		quirk_min_max = min_max_dmi->driver_data;
+
+	/*
+	 * Unfortunately ForcePad capability is not exported over PS/2,
+	 * so we have to resort to checking DMI.
+	 */
+	is_forcepad = dmi_check_system(forcepad_dmi_table);
 }
 
 static int __synaptics_init(struct psmouse *psmouse, bool absolute_mode)
diff --git a/drivers/input/mouse/synaptics.h b/drivers/input/mouse/synaptics.h
index fb2e076..1bd01f2 100644
--- a/drivers/input/mouse/synaptics.h
+++ b/drivers/input/mouse/synaptics.h
@@ -77,12 +77,9 @@
  *					for noise.
  * 2	0x08	image sensor		image sensor tracks 5 fingers, but only
  *					reports 2.
+ * 2	0x01	uniform clickpad	whole clickpad moves instead of being
+ *					hinged at the top.
  * 2	0x20	report min		query 0x0f gives min coord reported
- * 2	0x80	forcepad		forcepad is a variant of clickpad that
- *					does not have physical buttons but rather
- *					uses pressure above certain threshold to
- *					report primary clicks. Forcepads also have
- *					clickpad bit set.
  */
 #define SYN_CAP_CLICKPAD(ex0c)		((ex0c) & 0x100000) /* 1-button ClickPad */
 #define SYN_CAP_CLICKPAD2BTN(ex0c)	((ex0c) & 0x000100) /* 2-button ClickPad */
@@ -91,7 +88,6 @@
 #define SYN_CAP_ADV_GESTURE(ex0c)	((ex0c) & 0x080000)
 #define SYN_CAP_REDUCED_FILTERING(ex0c)	((ex0c) & 0x000400)
 #define SYN_CAP_IMAGE_SENSOR(ex0c)	((ex0c) & 0x000800)
-#define SYN_CAP_FORCEPAD(ex0c)		((ex0c) & 0x008000)
 
 /* synaptics modes query bits */
 #define SYN_MODE_ABSOLUTE(m)		((m) & (1 << 7))
-- 
1.9.1


  parent reply	other threads:[~2014-10-27 19:13 UTC|newest]

Thread overview: 110+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-27 18:55 [3.13.y.z extended stable] Linux 3.13.11.10 stable review Kamal Mostafa
2014-10-27 18:55 ` [PATCH 3.13 001/105] Bluetooth: Fix HCI H5 corrupted ack value Kamal Mostafa
2014-10-27 18:55 ` [PATCH 3.13 002/105] dmaengine: fix xor sources continuation Kamal Mostafa
2014-10-27 18:55 ` [PATCH 3.13 003/105] [media] siano: add support for PCTV 77e Kamal Mostafa
2014-10-27 18:55 ` [PATCH 3.13 004/105] [media] em28xx-v4l: give back all active video buffers to the vb2 core properly on streaming stop Kamal Mostafa
2014-10-27 18:55 ` [PATCH 3.13 005/105] [media] em28xx-v4l: fix video buffer field order reporting in progressive mode Kamal Mostafa
2014-10-27 18:55 ` [PATCH 3.13 006/105] crypto: caam - fix addressing of struct member Kamal Mostafa
2014-10-27 18:55 ` [PATCH 3.13 007/105] x86, fpu: shift drop_init_fpu() from save_xstate_sig() to handle_signal() Kamal Mostafa
2014-10-27 18:55 ` [PATCH 3.13 008/105] x86, fpu: __restore_xstate_sig()->math_state_restore() needs preempt_disable() Kamal Mostafa
2014-10-27 18:55 ` [PATCH 3.13 009/105] KVM: do not bias the generation number in kvm_current_mmio_generation Kamal Mostafa
2014-10-27 18:55 ` [PATCH 3.13 010/105] kvm: fix potentially corrupt mmio cache Kamal Mostafa
2014-10-27 18:55 ` [PATCH 3.13 011/105] kvm: x86: fix stale mmio cache bug Kamal Mostafa
2014-10-27 18:55 ` [PATCH 3.13 012/105] UBIFS: fix free log space calculation Kamal Mostafa
2014-10-27 18:55 ` [PATCH 3.13 013/105] Bluetooth: Fix issue with USB suspend in btusb driver Kamal Mostafa
2014-10-27 18:55 ` [PATCH 3.13 014/105] mmc: rtsx_pci_sdmmc: fix incorrect last byte in R2 response Kamal Mostafa
2014-10-27 18:55 ` [PATCH 3.13 015/105] KVM: s390: unintended fallthrough for external call Kamal Mostafa
2014-10-27 18:55 ` [PATCH 3.13 016/105] UBI: add missing kmem_cache_free() in process_pool_aeb error path Kamal Mostafa
2014-10-27 18:55 ` [PATCH 3.13 017/105] PCI: Increase IBM ipr SAS Crocodile BARs to at least system page size Kamal Mostafa
2014-10-27 18:55 ` [PATCH 3.13 018/105] drbd: compute the end before rb_insert_augmented() Kamal Mostafa
2014-10-27 18:55 ` [PATCH 3.13 019/105] Bluetooth: Fix setting correct security level when initiating SMP Kamal Mostafa
2014-10-27 18:55 ` [PATCH 3.13 020/105] mmc: tmio: prevent endless loop in tmio_mmc_set_clock() Kamal Mostafa
2014-10-27 18:55 ` [PATCH 3.13 021/105] iwlwifi: Add missing PCI IDs for the 7260 series Kamal Mostafa
2014-10-27 18:55 ` [PATCH 3.13 022/105] [media] media: usb: uvc: add a quirk for Dell XPS M1330 webcam Kamal Mostafa
2014-10-27 18:55 ` [PATCH 3.13 023/105] Revert "percpu: free percpu allocation info for uniprocessor system" Kamal Mostafa
2014-10-27 18:55 ` [PATCH 3.13 024/105] USB: serial: cp210x: added Ketra N1 wireless interface support Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 025/105] USB: cp210x: add support for Seluxit USB dongle Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 026/105] PCI: Generate uppercase hex for modalias interface class Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 027/105] PCI: mvebu: Fix uninitialized variable in mvebu_get_tgt_attr() Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 028/105] xfs: ensure WB_SYNC_ALL writeback handles partial pages correctly Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 029/105] [media] v4l2-common: fix overflow in v4l_bound_align_image() Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 030/105] USB: Add device quirk for ASUS T100 Base Station keyboard Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 031/105] mei: bus: fix possible boundaries violation Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 032/105] firmware_class: make sure fw requests contain a name Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 033/105] Drivers: hv: vmbus: Cleanup vmbus_post_msg() Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 034/105] Drivers: hv: vmbus: Cleanup vmbus_teardown_gpadl() Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 035/105] Drivers: hv: vmbus: Cleanup vmbus_establish_gpadl() Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 036/105] Drivers: hv: vmbus: Fix a bug in vmbus_open() Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 037/105] Drivers: hv: vmbus: Cleanup vmbus_close_internal() Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 038/105] Drivers: hv: vmbus: Cleanup hv_post_message() Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 039/105] spi: dw-mid: respect 8 bit mode Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 040/105] spi: dw-mid: terminate ongoing transfers at exit Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 041/105] kvm: don't take vcpu mutex for obviously invalid vcpu ioctls Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 042/105] x86/intel/quark: Switch off CR4.PGE so TLB flush uses CR3 instead Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 043/105] ARM: at91: fix at91sam9263ek DT mmc pinmuxing settings Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 044/105] ARM: at91/PMC: don't forget to write PMC_PCDR register to disable clocks Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 045/105] nfs: fix duplicate proc entries Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 046/105] Fixing lease renewal Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 047/105] lockd: Try to reconnect if statd has moved Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 048/105] mptfusion: enable no_write_same for vmware scsi disks Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 049/105] qla2xxx: Use correct offset to req-q-out for reserve calculation Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 050/105] mfd: rtsx_pcr: Fix MSI enable error handling Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 051/105] power: charger-manager: Fix NULL pointer exception with missing cm-fuel-gauge Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 052/105] rt2800: correct BBP1_TX_POWER_CTRL mask Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 053/105] regmap: fix NULL pointer dereference in _regmap_write/read Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 054/105] Documentation: lzo: document part of the encoding Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 055/105] Revert "lzo: properly check for overruns" Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 056/105] lzo: check for length overrun in variable length encoding Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 057/105] regmap: debugfs: fix possbile NULL pointer dereference Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 058/105] regmap: fix possible ZERO_SIZE_PTR pointer dereferencing error Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 059/105] net_dma: simple removal Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 060/105] libata-sff: Fix controllers with no ctl port Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 061/105] NFSv4: Fix lock recovery when CREATE_SESSION/SETCLIENTID_CONFIRM fails Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 062/105] NFSv4: fix open/lock state recovery error handling Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 063/105] tty: omap-serial: fix division by zero Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 064/105] serial: 8250: Add Quark X1000 to 8250_pci.c Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 065/105] missing data dependency barrier in prepend_name() Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 066/105] be2iscsi: check ip buffer before copying Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 067/105] framebuffer: fix border color Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 068/105] framebuffer: fix screen corruption when copying Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 069/105] mpc85xx_edac: Make L2 interrupt shared too Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 070/105] NFSv4.1: Fix an NFSv4.1 state renewal regression Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 071/105] xen-blkback: fix leak on grant map error path Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 072/105] m68k: Disable/restore interrupts in hwreg_present()/hwreg_write() Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 073/105] ASoC: tlv320aic3x: fix PLL D configuration Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 074/105] dm bufio: update last_accessed when relinking a buffer Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 075/105] dm bufio: when done scanning return from __scan immediately Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 076/105] dm log userspace: fix memory leak in dm_ulog_tfr_init failure path Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 077/105] ecryptfs: avoid to access NULL pointer when write metadata in xattr Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 078/105] x86_64, entry: Filter RFLAGS.NT on entry from userspace Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 079/105] ASoC: soc-dapm: fix use after free Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 080/105] pata_serverworks: disable 64-KB DMA transfers on Broadcom OSB4 IDE Controller Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 081/105] drm/ast: Fix HW cursor image Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 082/105] x86: Reject x32 executables if x32 ABI not supported Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 083/105] [jffs2] kill wbuf_queued/wbuf_dwork_lock Kamal Mostafa
2014-10-27 18:56 ` [PATCH 3.13 084/105] fs: Fix theoretical division by 0 in super_cache_scan() Kamal Mostafa
2014-10-27 18:57 ` [PATCH 3.13 085/105] fs: make cont_expand_zero interruptible Kamal Mostafa
2014-10-27 18:57 ` [PATCH 3.13 086/105] fix misuses of f_count() in ppp and netlink Kamal Mostafa
2014-10-27 18:57 ` [PATCH 3.13 087/105] block: fix alignment_offset math that assumes io_min is a power-of-2 Kamal Mostafa
2014-10-27 18:57 ` [PATCH 3.13 088/105] fanotify: enable close-on-exec on events' fd when requested in fanotify_init() Kamal Mostafa
2014-10-27 18:57 ` [PATCH 3.13 089/105] mm: clear __GFP_FS when PF_MEMALLOC_NOIO is set Kamal Mostafa
2014-10-27 18:57 ` Kamal Mostafa [this message]
2014-10-27 18:57 ` [PATCH 3.13 091/105] Input: i8042 - add noloop quirk for Asus X750LN Kamal Mostafa
2014-10-27 18:57 ` [PATCH 3.13 092/105] um: ubd: Fix for processes stuck in D state forever Kamal Mostafa
2014-10-27 18:57 ` [PATCH 3.13 093/105] kernel: add support for gcc 5 Kamal Mostafa
2014-10-27 18:57 ` [PATCH 3.13 094/105] ALSA: emu10k1: Fix deadlock in synth voice lookup Kamal Mostafa
2014-10-27 18:57 ` [PATCH 3.13 095/105] libceph: ceph-msgr workqueue needs a resque worker Kamal Mostafa
2014-10-27 18:57 ` [PATCH 3.13 096/105] mnt: Prevent pivot_root from creating a loop in the mount tree Kamal Mostafa
2014-10-27 18:57 ` [PATCH 3.13 097/105] modules, lock around setting of MODULE_STATE_UNFORMED Kamal Mostafa
2014-10-27 18:57 ` [PATCH 3.13 098/105] virtio_pci: fix virtio spec compliance on restore Kamal Mostafa
2014-10-27 18:57 ` [PATCH 3.13 099/105] dmaengine: pl330: Fix NULL pointer dereference on probe failure Kamal Mostafa
2014-10-28  7:58   ` Krzysztof Kozlowski
2014-10-28 17:10     ` Kamal Mostafa
2014-10-27 18:57 ` [PATCH 3.13 100/105] dmaengine: pl330: Fix NULL pointer dereference on driver unbind Kamal Mostafa
2014-10-28  7:58   ` Krzysztof Kozlowski
2014-10-28 17:10     ` Kamal Mostafa
2014-10-27 18:57 ` [PATCH 3.13 101/105] selinux: fix inode security list corruption Kamal Mostafa
2014-10-27 18:57 ` [PATCH 3.13 102/105] pstore: Fix duplicate {console,ftrace}-efi entries Kamal Mostafa
2014-10-27 18:57 ` [PATCH 3.13 103/105] futex: Ensure get_futex_key_refs() always implies a barrier Kamal Mostafa
2014-10-27 18:57 ` [PATCH 3.13 104/105] x86,kvm,vmx: Preserve CR4 across VM entry Kamal Mostafa
2014-10-27 18:57 ` [PATCH 3.13 105/105] crypto: caam - remove duplicated sg copy functions Kamal Mostafa

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1414436240-13879-91-git-send-email-kamal@canonical.com \
    --to=kamal@canonical.com \
    --cc=dmitry.torokhov@gmail.com \
    --cc=kernel-team@lists.ubuntu.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®