Linux v3.17-2860-gef0625b70dac
- Reenable debugging options. - Temporarily disable aarch64patches
This commit is contained in:
parent
ce8e218a5e
commit
da99f20f02
@ -9,10 +9,10 @@ Patch for disconnect issues with storage attached to a
|
|||||||
1 file changed, 7 insertions(+)
|
1 file changed, 7 insertions(+)
|
||||||
|
|
||||||
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
|
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
|
||||||
index d481c99a20d7..6050143ce7ec 100644
|
index 11e80ac31324..15a1c2783b91 100644
|
||||||
--- a/drivers/usb/core/hub.c
|
--- a/drivers/usb/core/hub.c
|
||||||
+++ b/drivers/usb/core/hub.c
|
+++ b/drivers/usb/core/hub.c
|
||||||
@@ -5036,6 +5036,13 @@ static void hub_events(void)
|
@@ -5023,6 +5023,13 @@ static void hub_event(struct work_struct *work)
|
||||||
(u16) hub->change_bits[0],
|
(u16) hub->change_bits[0],
|
||||||
(u16) hub->event_bits[0]);
|
(u16) hub->event_bits[0]);
|
||||||
|
|
||||||
|
@ -33,10 +33,10 @@ index 199f453cb4de..ec38acf00b40 100644
|
|||||||
290/040 ALL edd_mbr_sig_buffer EDD MBR signatures
|
290/040 ALL edd_mbr_sig_buffer EDD MBR signatures
|
||||||
2D0/A00 ALL e820_map E820 memory map table
|
2D0/A00 ALL e820_map E820 memory map table
|
||||||
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
|
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
|
||||||
index 36327438caf0..61542c282e70 100644
|
index e4b1f431c7ed..e12033b15d25 100644
|
||||||
--- a/arch/x86/Kconfig
|
--- a/arch/x86/Kconfig
|
||||||
+++ b/arch/x86/Kconfig
|
+++ b/arch/x86/Kconfig
|
||||||
@@ -1566,6 +1566,16 @@ config EFI_MIXED
|
@@ -1578,6 +1578,16 @@ config EFI_MIXED
|
||||||
|
|
||||||
If unsure, say N.
|
If unsure, say N.
|
||||||
|
|
||||||
@ -163,7 +163,7 @@ index 341a73ecea2e..cca08ac450e2 100644
|
|||||||
|
|
||||||
extern int modules_disabled; /* for sysctl */
|
extern int modules_disabled; /* for sysctl */
|
||||||
diff --git a/kernel/module.c b/kernel/module.c
|
diff --git a/kernel/module.c b/kernel/module.c
|
||||||
index 1f7b4664300e..866417ecc76a 100644
|
index d9b88208e6eb..96078ffc846a 100644
|
||||||
--- a/kernel/module.c
|
--- a/kernel/module.c
|
||||||
+++ b/kernel/module.c
|
+++ b/kernel/module.c
|
||||||
@@ -3843,6 +3843,13 @@ void module_layout(struct module *mod,
|
@@ -3843,6 +3843,13 @@ void module_layout(struct module *mod,
|
||||||
|
@ -41,7 +41,7 @@ index 71f282a4e307..341a73ecea2e 100644
|
|||||||
|
|
||||||
#ifdef CONFIG_SYSFS
|
#ifdef CONFIG_SYSFS
|
||||||
diff --git a/kernel/module.c b/kernel/module.c
|
diff --git a/kernel/module.c b/kernel/module.c
|
||||||
index 03214bd288e9..1f7b4664300e 100644
|
index 65586ffa0c98..d9b88208e6eb 100644
|
||||||
--- a/kernel/module.c
|
--- a/kernel/module.c
|
||||||
+++ b/kernel/module.c
|
+++ b/kernel/module.c
|
||||||
@@ -3842,3 +3842,13 @@ void module_layout(struct module *mod,
|
@@ -3842,3 +3842,13 @@ void module_layout(struct module *mod,
|
||||||
|
@ -228,7 +228,7 @@ index 379650b984f8..070f29fefdc2 100644
|
|||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
diff --git a/kernel/module.c b/kernel/module.c
|
diff --git a/kernel/module.c b/kernel/module.c
|
||||||
index 866417ecc76a..d7ca95c5a349 100644
|
index 96078ffc846a..965d876de799 100644
|
||||||
--- a/kernel/module.c
|
--- a/kernel/module.c
|
||||||
+++ b/kernel/module.c
|
+++ b/kernel/module.c
|
||||||
@@ -108,9 +108,9 @@ struct list_head *kdb_modules = &modules; /* kdb needs the list of modules */
|
@@ -108,9 +108,9 @@ struct list_head *kdb_modules = &modules; /* kdb needs the list of modules */
|
||||||
|
@ -1,105 +0,0 @@
|
|||||||
From 5b65c2a0296644dd3dbdd590d6f00174d18c96b3 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
|
|
||||||
Date: Wed, 10 Sep 2014 18:02:37 -0700
|
|
||||||
Subject: HID: rmi: check sanity of the incoming report
|
|
||||||
|
|
||||||
In the Dell XPS 13 9333, it appears that sometimes the bus get confused
|
|
||||||
and corrupts the incoming data. It fills the input report with the
|
|
||||||
sentinel value "ff". Synaptics told us that such behavior does not comes
|
|
||||||
from the touchpad itself, so we filter out such reports here.
|
|
||||||
|
|
||||||
Unfortunately, we can not simply discard the incoming data because they
|
|
||||||
may contain useful information. Most of the time, the misbehavior is
|
|
||||||
quite near the end of the report, so we can still use the valid part of
|
|
||||||
it.
|
|
||||||
|
|
||||||
Fixes:
|
|
||||||
https://bugzilla.redhat.com/show_bug.cgi?id=1123584
|
|
||||||
|
|
||||||
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
|
|
||||||
Signed-off-by: Andrew Duggan <aduggan@synaptics.com>
|
|
||||||
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
|
|
||||||
|
|
||||||
diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c
|
|
||||||
index 8389e81..3cccff7 100644
|
|
||||||
--- a/drivers/hid/hid-rmi.c
|
|
||||||
+++ b/drivers/hid/hid-rmi.c
|
|
||||||
@@ -320,10 +320,7 @@ static int rmi_f11_input_event(struct hid_device *hdev, u8 irq, u8 *data,
|
|
||||||
int offset;
|
|
||||||
int i;
|
|
||||||
|
|
||||||
- if (size < hdata->f11.report_size)
|
|
||||||
- return 0;
|
|
||||||
-
|
|
||||||
- if (!(irq & hdata->f11.irq_mask))
|
|
||||||
+ if (!(irq & hdata->f11.irq_mask) || size <= 0)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
offset = (hdata->max_fingers >> 2) + 1;
|
|
||||||
@@ -332,9 +329,19 @@ static int rmi_f11_input_event(struct hid_device *hdev, u8 irq, u8 *data,
|
|
||||||
int fs_bit_position = (i & 0x3) << 1;
|
|
||||||
int finger_state = (data[fs_byte_position] >> fs_bit_position) &
|
|
||||||
0x03;
|
|
||||||
+ int position = offset + 5 * i;
|
|
||||||
+
|
|
||||||
+ if (position + 5 > size) {
|
|
||||||
+ /* partial report, go on with what we received */
|
|
||||||
+ printk_once(KERN_WARNING
|
|
||||||
+ "%s %s: Detected incomplete finger report. Finger reports may occasionally get dropped on this platform.\n",
|
|
||||||
+ dev_driver_string(&hdev->dev),
|
|
||||||
+ dev_name(&hdev->dev));
|
|
||||||
+ hid_dbg(hdev, "Incomplete finger report\n");
|
|
||||||
+ break;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
- rmi_f11_process_touch(hdata, i, finger_state,
|
|
||||||
- &data[offset + 5 * i]);
|
|
||||||
+ rmi_f11_process_touch(hdata, i, finger_state, &data[position]);
|
|
||||||
}
|
|
||||||
input_mt_sync_frame(hdata->input);
|
|
||||||
input_sync(hdata->input);
|
|
||||||
@@ -352,6 +359,11 @@ static int rmi_f30_input_event(struct hid_device *hdev, u8 irq, u8 *data,
|
|
||||||
if (!(irq & hdata->f30.irq_mask))
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
+ if (size < (int)hdata->f30.report_size) {
|
|
||||||
+ hid_warn(hdev, "Click Button pressed, but the click data is missing\n");
|
|
||||||
+ return 0;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
for (i = 0; i < hdata->gpio_led_count; i++) {
|
|
||||||
if (test_bit(i, &hdata->button_mask)) {
|
|
||||||
value = (data[i / 8] >> (i & 0x07)) & BIT(0);
|
|
||||||
@@ -412,9 +424,29 @@ static int rmi_read_data_event(struct hid_device *hdev, u8 *data, int size)
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
+static int rmi_check_sanity(struct hid_device *hdev, u8 *data, int size)
|
|
||||||
+{
|
|
||||||
+ int valid_size = size;
|
|
||||||
+ /*
|
|
||||||
+ * On the Dell XPS 13 9333, the bus sometimes get confused and fills
|
|
||||||
+ * the report with a sentinel value "ff". Synaptics told us that such
|
|
||||||
+ * behavior does not comes from the touchpad itself, so we filter out
|
|
||||||
+ * such reports here.
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+ while ((data[valid_size - 1] == 0xff) && valid_size > 0)
|
|
||||||
+ valid_size--;
|
|
||||||
+
|
|
||||||
+ return valid_size;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
static int rmi_raw_event(struct hid_device *hdev,
|
|
||||||
struct hid_report *report, u8 *data, int size)
|
|
||||||
{
|
|
||||||
+ size = rmi_check_sanity(hdev, data, size);
|
|
||||||
+ if (size < 2)
|
|
||||||
+ return 0;
|
|
||||||
+
|
|
||||||
switch (data[0]) {
|
|
||||||
case RMI_READ_DATA_REPORT_ID:
|
|
||||||
return rmi_read_data_event(hdev, data, size);
|
|
||||||
--
|
|
||||||
cgit v0.10.1
|
|
||||||
|
|
@ -1,46 +0,0 @@
|
|||||||
From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
|
|
||||||
Date: Wed, 3 Sep 2014 15:43:25 -0400
|
|
||||||
Subject: [PATCH] HID: wacom: Add support for the Cintiq Companion
|
|
||||||
|
|
||||||
The Wacom Cintiq Companion shares the same sensor than the Cintiq
|
|
||||||
Companion Hybrid, with the exception of the different PIDs.
|
|
||||||
|
|
||||||
Bugzilla: 1134969
|
|
||||||
Upstream-status: Queued for 3.18
|
|
||||||
|
|
||||||
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
|
|
||||||
---
|
|
||||||
drivers/hid/wacom_wac.c | 10 ++++++++++
|
|
||||||
1 file changed, 10 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
|
|
||||||
index aa6a08eb7ad6..c3cbbfb5811f 100644
|
|
||||||
--- a/drivers/hid/wacom_wac.c
|
|
||||||
+++ b/drivers/hid/wacom_wac.c
|
|
||||||
@@ -2573,6 +2573,14 @@ static const struct wacom_features wacom_features_0x309 =
|
|
||||||
{ "Wacom ISDv5 309", .type = WACOM_24HDT, /* Touch */
|
|
||||||
.oVid = USB_VENDOR_ID_WACOM, .oPid = 0x0307, .touch_max = 10,
|
|
||||||
.check_for_hid_type = true, .hid_type = HID_TYPE_USBNONE };
|
|
||||||
+static const struct wacom_features wacom_features_0x30A =
|
|
||||||
+ { "Wacom ISDv5 30A", 59352, 33648, 2047, 63,
|
|
||||||
+ CINTIQ_HYBRID, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 200, 200,
|
|
||||||
+ .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x30C };
|
|
||||||
+static const struct wacom_features wacom_features_0x30C =
|
|
||||||
+ { "Wacom ISDv5 30C", .type = WACOM_24HDT, /* Touch */
|
|
||||||
+ .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x30A, .touch_max = 10,
|
|
||||||
+ .check_for_hid_type = true, .hid_type = HID_TYPE_USBNONE };
|
|
||||||
|
|
||||||
#define USB_DEVICE_WACOM(prod) \
|
|
||||||
HID_DEVICE(BUS_USB, HID_GROUP_WACOM, USB_VENDOR_ID_WACOM, prod),\
|
|
||||||
@@ -2708,6 +2716,8 @@ const struct hid_device_id wacom_ids[] = {
|
|
||||||
{ USB_DEVICE_WACOM(0x304) },
|
|
||||||
{ USB_DEVICE_WACOM(0x307) },
|
|
||||||
{ USB_DEVICE_WACOM(0x309) },
|
|
||||||
+ { USB_DEVICE_WACOM(0x30A) },
|
|
||||||
+ { USB_DEVICE_WACOM(0x30C) },
|
|
||||||
{ USB_DEVICE_WACOM(0x30E) },
|
|
||||||
{ USB_DEVICE_WACOM(0x314) },
|
|
||||||
{ USB_DEVICE_WACOM(0x315) },
|
|
||||||
--
|
|
||||||
1.9.3
|
|
||||||
|
|
@ -29,10 +29,10 @@ index 72665eb80692..2c7b80d31366 100644
|
|||||||
+
|
+
|
||||||
#endif /* _KEYS_SYSTEM_KEYRING_H */
|
#endif /* _KEYS_SYSTEM_KEYRING_H */
|
||||||
diff --git a/init/Kconfig b/init/Kconfig
|
diff --git a/init/Kconfig b/init/Kconfig
|
||||||
index 80a6907f91c5..dfdd7f738247 100644
|
index e25a82a291a6..2d90498c77d7 100644
|
||||||
--- a/init/Kconfig
|
--- a/init/Kconfig
|
||||||
+++ b/init/Kconfig
|
+++ b/init/Kconfig
|
||||||
@@ -1723,6 +1723,15 @@ config SYSTEM_TRUSTED_KEYRING
|
@@ -1733,6 +1733,15 @@ config SYSTEM_TRUSTED_KEYRING
|
||||||
|
|
||||||
Keys in this keyring are used by module signature checking.
|
Keys in this keyring are used by module signature checking.
|
||||||
|
|
||||||
|
@ -42,10 +42,10 @@ index 41359e548bcb..db9e6118575e 100644
|
|||||||
efi_guid_t guid;
|
efi_guid_t guid;
|
||||||
u64 table;
|
u64 table;
|
||||||
diff --git a/init/Kconfig b/init/Kconfig
|
diff --git a/init/Kconfig b/init/Kconfig
|
||||||
index dfdd7f738247..3c866db603a7 100644
|
index 2d90498c77d7..5e701ec1be55 100644
|
||||||
--- a/init/Kconfig
|
--- a/init/Kconfig
|
||||||
+++ b/init/Kconfig
|
+++ b/init/Kconfig
|
||||||
@@ -1877,6 +1877,15 @@ config MODULE_SIG_ALL
|
@@ -1887,6 +1887,15 @@ config MODULE_SIG_ALL
|
||||||
comment "Do not forget to sign required modules with scripts/sign-file"
|
comment "Do not forget to sign required modules with scripts/sign-file"
|
||||||
depends on MODULE_SIG_FORCE && !MODULE_SIG_ALL
|
depends on MODULE_SIG_FORCE && !MODULE_SIG_ALL
|
||||||
|
|
||||||
|
@ -15,10 +15,10 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
|
|||||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
|
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
|
||||||
index 10d51c2f10d7..5b6ebe8b519e 100644
|
index d9a452e8fb9b..b3400aafe446 100644
|
||||||
--- a/Documentation/kernel-parameters.txt
|
--- a/Documentation/kernel-parameters.txt
|
||||||
+++ b/Documentation/kernel-parameters.txt
|
+++ b/Documentation/kernel-parameters.txt
|
||||||
@@ -3596,7 +3596,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
|
@@ -3618,7 +3618,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
|
||||||
the allocated input device; If set to 0, video driver
|
the allocated input device; If set to 0, video driver
|
||||||
will only send out the event without touching backlight
|
will only send out the event without touching backlight
|
||||||
brightness level.
|
brightness level.
|
||||||
|
@ -103,6 +103,7 @@ CONFIG_EXTCON=m
|
|||||||
CONFIG_EXTCON_GPIO=m
|
CONFIG_EXTCON_GPIO=m
|
||||||
CONFIG_EXTCON_ADC_JACK=m
|
CONFIG_EXTCON_ADC_JACK=m
|
||||||
# CONFIG_EXTCON_SM5502 is not set
|
# CONFIG_EXTCON_SM5502 is not set
|
||||||
|
# CONFIG_EXTCON_RT8973A is not set
|
||||||
|
|
||||||
# MTD
|
# MTD
|
||||||
CONFIG_MTD_BLKDEVS=m
|
CONFIG_MTD_BLKDEVS=m
|
||||||
|
@ -92,6 +92,7 @@ CONFIG_PHY_XGENE=y
|
|||||||
CONFIG_NET_XGENE=y
|
CONFIG_NET_XGENE=y
|
||||||
CONFIG_RTC_DRV_XGENE=m
|
CONFIG_RTC_DRV_XGENE=m
|
||||||
CONFIG_RTC_DRV_EFI=y
|
CONFIG_RTC_DRV_EFI=y
|
||||||
|
CONFIG_HW_RANDOM_XGENE=m
|
||||||
|
|
||||||
# not arm64
|
# not arm64
|
||||||
# CONFIG_GPIO_ADNP is not set
|
# CONFIG_GPIO_ADNP is not set
|
||||||
@ -133,6 +134,8 @@ CONFIG_ACPI_CONTAINER=y
|
|||||||
CONFIG_ACPI_HED=m
|
CONFIG_ACPI_HED=m
|
||||||
CONFIG_ACPI_CUSTOM_METHOD=m
|
CONFIG_ACPI_CUSTOM_METHOD=m
|
||||||
|
|
||||||
|
CONFIG_BPF_JIT=y
|
||||||
|
|
||||||
CONFIG_AMD_XGBE=y
|
CONFIG_AMD_XGBE=y
|
||||||
CONFIG_AMD_XGBE_PHY=y
|
CONFIG_AMD_XGBE_PHY=y
|
||||||
# CONFIG_AMD_XGBE_DCB is not set
|
# CONFIG_AMD_XGBE_DCB is not set
|
||||||
|
@ -164,6 +164,7 @@ CONFIG_RTC_DRV_PALMAS=m
|
|||||||
CONFIG_OMAP5_DSS_HDMI=y
|
CONFIG_OMAP5_DSS_HDMI=y
|
||||||
CONFIG_OMAP5_DSS_HDMI_AUDIO=y
|
CONFIG_OMAP5_DSS_HDMI_AUDIO=y
|
||||||
CONFIG_COMMON_CLK_PALMAS=m
|
CONFIG_COMMON_CLK_PALMAS=m
|
||||||
|
CONFIG_INPUT_PALMAS_PWRBUTTON=m
|
||||||
|
|
||||||
CONFIG_WL_TI=y
|
CONFIG_WL_TI=y
|
||||||
CONFIG_WLCORE_SDIO=m
|
CONFIG_WLCORE_SDIO=m
|
||||||
@ -486,6 +487,7 @@ CONFIG_I2C_RK3X=m
|
|||||||
CONFIG_SPI_ROCKCHIP=m
|
CONFIG_SPI_ROCKCHIP=m
|
||||||
CONFIG_SND_SOC_ROCKCHIP=m
|
CONFIG_SND_SOC_ROCKCHIP=m
|
||||||
CONFIG_PWM_ROCKCHIP=m
|
CONFIG_PWM_ROCKCHIP=m
|
||||||
|
CONFIG_ROCKCHIP_SARADC=m
|
||||||
|
|
||||||
# ST Ericsson
|
# ST Ericsson
|
||||||
CONFIG_MACH_HREFV60=y
|
CONFIG_MACH_HREFV60=y
|
||||||
|
@ -273,6 +273,7 @@ CONFIG_SND_SOC_ODROIDX2=m
|
|||||||
# CONFIG_EXYNOS_IOMMU_DEBUG is not set
|
# CONFIG_EXYNOS_IOMMU_DEBUG is not set
|
||||||
# CONFIG_SAMSUNG_PM_DEBUG is not set
|
# CONFIG_SAMSUNG_PM_DEBUG is not set
|
||||||
# CONFIG_SAMSUNG_PM_CHECK is not set
|
# CONFIG_SAMSUNG_PM_CHECK is not set
|
||||||
|
# CONFIG_ARM_EXYNOS5_BUS_DEVFREQ is not set
|
||||||
|
|
||||||
# Arndale/Origen
|
# Arndale/Origen
|
||||||
CONFIG_MFD_MAX8997=y
|
CONFIG_MFD_MAX8997=y
|
||||||
@ -356,7 +357,6 @@ CONFIG_GENERIC_CPUFREQ_CPU0=m
|
|||||||
# usb
|
# usb
|
||||||
CONFIG_USB_OHCI_HCD_PLATFORM=m
|
CONFIG_USB_OHCI_HCD_PLATFORM=m
|
||||||
CONFIG_USB_EHCI_HCD_PLATFORM=m
|
CONFIG_USB_EHCI_HCD_PLATFORM=m
|
||||||
# CONFIG_USB_OTG_WHITELIST is not set
|
|
||||||
# CONFIG_USB_OTG_BLACKLIST_HUB is not set
|
# CONFIG_USB_OTG_BLACKLIST_HUB is not set
|
||||||
CONFIG_USB_ULPI=y
|
CONFIG_USB_ULPI=y
|
||||||
CONFIG_AX88796=m
|
CONFIG_AX88796=m
|
||||||
@ -367,6 +367,7 @@ CONFIG_USB_OTG=y
|
|||||||
CONFIG_USB_GADGET=m
|
CONFIG_USB_GADGET=m
|
||||||
CONFIG_USB_GADGET_VBUS_DRAW=100
|
CONFIG_USB_GADGET_VBUS_DRAW=100
|
||||||
CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
|
CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
|
||||||
|
# CONFIG_USB_GADGET_XILINX is not set
|
||||||
CONFIG_USB_MUSB_HDRC=m
|
CONFIG_USB_MUSB_HDRC=m
|
||||||
CONFIG_USB_MUSB_DUAL_ROLE=y
|
CONFIG_USB_MUSB_DUAL_ROLE=y
|
||||||
CONFIG_USB_MUSB_DSPS=m
|
CONFIG_USB_MUSB_DSPS=m
|
||||||
@ -436,6 +437,7 @@ CONFIG_GENERIC_PINCONF=y
|
|||||||
# CONFIG_PINCTRL_MSM8X74 is not set
|
# CONFIG_PINCTRL_MSM8X74 is not set
|
||||||
# CONFIG_PINCTRL_BCM281XX is not set
|
# CONFIG_PINCTRL_BCM281XX is not set
|
||||||
# CONFIG_PINCTRL_APQ8064 is not set
|
# CONFIG_PINCTRL_APQ8064 is not set
|
||||||
|
# CONFIG_PINCTRL_APQ8084 is not set
|
||||||
# CONFIG_PINCTRL_IPQ8064 is not set
|
# CONFIG_PINCTRL_IPQ8064 is not set
|
||||||
# CONFIG_PINCTRL_MSM8960 is not set
|
# CONFIG_PINCTRL_MSM8960 is not set
|
||||||
|
|
||||||
@ -562,6 +564,7 @@ CONFIG_USB_DWC3_OMAP=m
|
|||||||
CONFIG_USB_DWC3_PCI=m
|
CONFIG_USB_DWC3_PCI=m
|
||||||
# CONFIG_USB_DWC3_DEBUG is not set
|
# CONFIG_USB_DWC3_DEBUG is not set
|
||||||
# CONFIG_USB_DWC3_KEYSTONE is not set
|
# CONFIG_USB_DWC3_KEYSTONE is not set
|
||||||
|
# CONFIG_USB_DWC3_QCOM is not set
|
||||||
# CONFIG_DWC3_HOST_USB3_LPM_ENABLE is not set
|
# CONFIG_DWC3_HOST_USB3_LPM_ENABLE is not set
|
||||||
CONFIG_DW_WATCHDOG=m
|
CONFIG_DW_WATCHDOG=m
|
||||||
CONFIG_PCIE_DW=y
|
CONFIG_PCIE_DW=y
|
||||||
@ -688,6 +691,9 @@ CONFIG_REGULATOR_TPS80031=m
|
|||||||
CONFIG_REGULATOR_LTC3589=m
|
CONFIG_REGULATOR_LTC3589=m
|
||||||
CONFIG_REGULATOR_ANATOP=m
|
CONFIG_REGULATOR_ANATOP=m
|
||||||
CONFIG_REGULATOR_DA9211=m
|
CONFIG_REGULATOR_DA9211=m
|
||||||
|
CONFIG_REGULATOR_ISL9305=m
|
||||||
|
CONFIG_REGULATOR_MAX77802=m
|
||||||
|
CONFIG_REGULATOR_PWM=m
|
||||||
|
|
||||||
CONFIG_CHARGER_MANAGER=y
|
CONFIG_CHARGER_MANAGER=y
|
||||||
CONFIG_CHARGER_BQ2415X=m
|
CONFIG_CHARGER_BQ2415X=m
|
||||||
|
@ -391,6 +391,7 @@ CONFIG_VHOST_SCSI=m
|
|||||||
# SCSI device support
|
# SCSI device support
|
||||||
#
|
#
|
||||||
CONFIG_SCSI=y
|
CONFIG_SCSI=y
|
||||||
|
# CONFIG_SCSI_MQ_DEFAULT is not set
|
||||||
|
|
||||||
CONFIG_SCSI_ENCLOSURE=m
|
CONFIG_SCSI_ENCLOSURE=m
|
||||||
CONFIG_SCSI_PROC_FS=y
|
CONFIG_SCSI_PROC_FS=y
|
||||||
@ -1676,13 +1677,13 @@ CONFIG_B43_PCMCIA=y
|
|||||||
CONFIG_B43_SDIO=y
|
CONFIG_B43_SDIO=y
|
||||||
CONFIG_B43_BCMA=y
|
CONFIG_B43_BCMA=y
|
||||||
CONFIG_B43_BCMA_PIO=y
|
CONFIG_B43_BCMA_PIO=y
|
||||||
# CONFIG_B43_DEBUG is not set
|
CONFIG_B43_DEBUG=y
|
||||||
CONFIG_B43_PHY_LP=y
|
CONFIG_B43_PHY_LP=y
|
||||||
CONFIG_B43_PHY_N=y
|
CONFIG_B43_PHY_N=y
|
||||||
CONFIG_B43_PHY_HT=y
|
CONFIG_B43_PHY_HT=y
|
||||||
# CONFIG_B43_PHY_G is not set
|
# CONFIG_B43_PHY_G is not set
|
||||||
CONFIG_B43LEGACY=m
|
CONFIG_B43LEGACY=m
|
||||||
# CONFIG_B43LEGACY_DEBUG is not set
|
CONFIG_B43LEGACY_DEBUG=y
|
||||||
CONFIG_B43LEGACY_DMA=y
|
CONFIG_B43LEGACY_DMA=y
|
||||||
CONFIG_B43LEGACY_PIO=y
|
CONFIG_B43LEGACY_PIO=y
|
||||||
CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
|
CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
|
||||||
@ -2118,6 +2119,8 @@ CONFIG_INPUT_SPARSEKMAP=m
|
|||||||
CONFIG_INPUT_CMA3000=m
|
CONFIG_INPUT_CMA3000=m
|
||||||
CONFIG_INPUT_CMA3000_I2C=m
|
CONFIG_INPUT_CMA3000_I2C=m
|
||||||
CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
|
CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
|
||||||
|
# CONFIG_INPUT_DRV260X_HAPTICS is not set
|
||||||
|
# CONFIG_INPUT_DRV2667_HAPTICS is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
# Input I/O drivers
|
# Input I/O drivers
|
||||||
@ -2617,8 +2620,10 @@ CONFIG_HID_SENSOR_IIO_TRIGGER=m
|
|||||||
# CONFIG_AD5380 is not set
|
# CONFIG_AD5380 is not set
|
||||||
# CONFIG_AD5064 is not set
|
# CONFIG_AD5064 is not set
|
||||||
# CONFIG_BMA180 is not set
|
# CONFIG_BMA180 is not set
|
||||||
|
# CONFIG_BMC150_ACCEL is not set
|
||||||
# CONFIG_MAX1363 is not set
|
# CONFIG_MAX1363 is not set
|
||||||
# CONFIG_MAX517 is not set
|
# CONFIG_MAX517 is not set
|
||||||
|
# CONFIG_MAX5821 is not set
|
||||||
# CONFIG_MCP4725 is not set
|
# CONFIG_MCP4725 is not set
|
||||||
# CONFIG_ITG3200 is not set
|
# CONFIG_ITG3200 is not set
|
||||||
# CONFIG_APDS9300 is not set
|
# CONFIG_APDS9300 is not set
|
||||||
@ -2632,6 +2637,7 @@ CONFIG_HID_SENSOR_IIO_TRIGGER=m
|
|||||||
# CONFIG_TSL4531 is not set
|
# CONFIG_TSL4531 is not set
|
||||||
# CONFIG_NAU7802 is not set
|
# CONFIG_NAU7802 is not set
|
||||||
# CONFIG_TI_ADC081C is not set
|
# CONFIG_TI_ADC081C is not set
|
||||||
|
# CONFIG_TI_ADC128S052 is not set
|
||||||
# CONFIG_EXYNOS_ADC is not set
|
# CONFIG_EXYNOS_ADC is not set
|
||||||
# CONFIG_VIPERBOARD_ADC is not set
|
# CONFIG_VIPERBOARD_ADC is not set
|
||||||
# CONFIG_VF610_ADC is not set
|
# CONFIG_VF610_ADC is not set
|
||||||
@ -2643,6 +2649,7 @@ CONFIG_IIO_ST_ACCEL_3AXIS=m
|
|||||||
CONFIG_HID_SENSOR_INCLINOMETER_3D=m
|
CONFIG_HID_SENSOR_INCLINOMETER_3D=m
|
||||||
CONFIG_HID_SENSOR_DEVICE_ROTATION=m
|
CONFIG_HID_SENSOR_DEVICE_ROTATION=m
|
||||||
# CONFIG_ADJD_S311 is not set
|
# CONFIG_ADJD_S311 is not set
|
||||||
|
# CONFIG_AL3320A is not set
|
||||||
# CONFIG_SENSORS_TSL2563 is not set
|
# CONFIG_SENSORS_TSL2563 is not set
|
||||||
# CONFIG_SENSORS_HMC5843_I2C is not set
|
# CONFIG_SENSORS_HMC5843_I2C is not set
|
||||||
# CONFIG_VCNL4000 is not set
|
# CONFIG_VCNL4000 is not set
|
||||||
@ -2681,6 +2688,7 @@ CONFIG_HID_SENSOR_DEVICE_ROTATION=m
|
|||||||
# CONFIG_ADIS16136 is not set
|
# CONFIG_ADIS16136 is not set
|
||||||
# CONFIG_ADIS16260 is not set
|
# CONFIG_ADIS16260 is not set
|
||||||
# CONFIG_ADXRS450 is not set
|
# CONFIG_ADXRS450 is not set
|
||||||
|
# CONFIG_BMG160 is not set
|
||||||
# CONFIG_ADIS16400 is not set
|
# CONFIG_ADIS16400 is not set
|
||||||
# CONFIG_ADIS16480 is not set
|
# CONFIG_ADIS16480 is not set
|
||||||
# CONFIG_DHT11 is not set
|
# CONFIG_DHT11 is not set
|
||||||
@ -3619,6 +3627,7 @@ CONFIG_HID_ICADE=m
|
|||||||
CONFIG_HID_TWINHAN=m
|
CONFIG_HID_TWINHAN=m
|
||||||
CONFIG_HID_ORTEK=m
|
CONFIG_HID_ORTEK=m
|
||||||
CONFIG_HID_PANTHERLORD=m
|
CONFIG_HID_PANTHERLORD=m
|
||||||
|
CONFIG_HID_PENMOUNT=m
|
||||||
CONFIG_HID_PETALYNX=m
|
CONFIG_HID_PETALYNX=m
|
||||||
CONFIG_HID_PICOLCD=m
|
CONFIG_HID_PICOLCD=m
|
||||||
CONFIG_HID_RMI=m
|
CONFIG_HID_RMI=m
|
||||||
@ -3936,6 +3945,8 @@ CONFIG_USB_XUSBATM=m
|
|||||||
# CONFIG_USB_DWC2 is not set
|
# CONFIG_USB_DWC2 is not set
|
||||||
# CONFIG_USB_ISP1301 is not set
|
# CONFIG_USB_ISP1301 is not set
|
||||||
# CONFIG_USB_OTG is not set
|
# CONFIG_USB_OTG is not set
|
||||||
|
# CONFIG_USB_OTG_WHITELIST is not set
|
||||||
|
CONFIG_USB_LED_TRIG=y
|
||||||
|
|
||||||
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
|
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
|
||||||
|
|
||||||
@ -4446,6 +4457,7 @@ CONFIG_CRYPTO_MANAGER=y
|
|||||||
CONFIG_CRYPTO_HW=y
|
CONFIG_CRYPTO_HW=y
|
||||||
CONFIG_CRYPTO_BLKCIPHER=y
|
CONFIG_CRYPTO_BLKCIPHER=y
|
||||||
# CONFIG_CRYPTO_CRYPTD is not set
|
# CONFIG_CRYPTO_CRYPTD is not set
|
||||||
|
# CONFIG_CRYPTO_MCRYPTD is not set
|
||||||
CONFIG_CRYPTO_AES=y
|
CONFIG_CRYPTO_AES=y
|
||||||
CONFIG_CRYPTO_ARC4=m
|
CONFIG_CRYPTO_ARC4=m
|
||||||
CONFIG_CRYPTO_ANUBIS=m
|
CONFIG_CRYPTO_ANUBIS=m
|
||||||
@ -4645,7 +4657,7 @@ CONFIG_PM_DEBUG=y
|
|||||||
# CONFIG_DPM_WATCHDOG is not set # revisit this in debug
|
# CONFIG_DPM_WATCHDOG is not set # revisit this in debug
|
||||||
CONFIG_PM_TRACE=y
|
CONFIG_PM_TRACE=y
|
||||||
CONFIG_PM_TRACE_RTC=y
|
CONFIG_PM_TRACE_RTC=y
|
||||||
# CONFIG_PM_TEST_SUSPEND is not set
|
CONFIG_PM_TEST_SUSPEND=y
|
||||||
CONFIG_PM_RUNTIME=y
|
CONFIG_PM_RUNTIME=y
|
||||||
# CONFIG_PM_OPP is not set
|
# CONFIG_PM_OPP is not set
|
||||||
# CONFIG_PM_AUTOSLEEP is not set
|
# CONFIG_PM_AUTOSLEEP is not set
|
||||||
@ -4930,6 +4942,7 @@ CONFIG_NET_DSA_MV88E6123_61_65=m
|
|||||||
CONFIG_WM8350_POWER=m
|
CONFIG_WM8350_POWER=m
|
||||||
|
|
||||||
# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
|
# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
|
||||||
|
# CONFIG_VIDEO_PCI_SKELETON is not set
|
||||||
|
|
||||||
CONFIG_USB_WUSB=m
|
CONFIG_USB_WUSB=m
|
||||||
CONFIG_USB_WUSB_CBAF=m
|
CONFIG_USB_WUSB_CBAF=m
|
||||||
@ -5193,7 +5206,14 @@ CONFIG_FMC_CHARDEV=m
|
|||||||
# CONFIG_ARM_ARCH_TIMER_EVTSTREAM is not set
|
# CONFIG_ARM_ARCH_TIMER_EVTSTREAM is not set
|
||||||
|
|
||||||
# CONFIG_PM_DEVFREQ is not set
|
# CONFIG_PM_DEVFREQ is not set
|
||||||
|
# CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND is not set
|
||||||
|
# CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
|
||||||
|
# CONFIG_DEVFREQ_GOV_POWERSAVE is not set
|
||||||
|
# CONFIG_DEVFREQ_GOV_USERSPACE is not set
|
||||||
|
|
||||||
# CONFIG_MODULE_SIG is not set
|
# CONFIG_MODULE_SIG is not set
|
||||||
|
# FIXME: Revisit this to see if we can use it instead of the spec file stuff
|
||||||
|
# CONFIG_MODULE_COMPRESS is not set
|
||||||
# CONFIG_SYSTEM_TRUSTED_KEYRING is not set
|
# CONFIG_SYSTEM_TRUSTED_KEYRING is not set
|
||||||
# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
|
# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
|
||||||
|
|
||||||
|
112
config-nodebug
112
config-nodebug
@ -2,115 +2,115 @@ CONFIG_SND_VERBOSE_PRINTK=y
|
|||||||
CONFIG_SND_DEBUG=y
|
CONFIG_SND_DEBUG=y
|
||||||
CONFIG_SND_PCM_XRUN_DEBUG=y
|
CONFIG_SND_PCM_XRUN_DEBUG=y
|
||||||
|
|
||||||
# CONFIG_DEBUG_ATOMIC_SLEEP is not set
|
CONFIG_DEBUG_ATOMIC_SLEEP=y
|
||||||
|
|
||||||
# CONFIG_DEBUG_MUTEXES is not set
|
CONFIG_DEBUG_MUTEXES=y
|
||||||
# CONFIG_DEBUG_RT_MUTEXES is not set
|
CONFIG_DEBUG_RT_MUTEXES=y
|
||||||
# CONFIG_DEBUG_LOCK_ALLOC is not set
|
CONFIG_DEBUG_LOCK_ALLOC=y
|
||||||
# CONFIG_LOCK_TORTURE_TEST is not set
|
CONFIG_LOCK_TORTURE_TEST=m
|
||||||
# CONFIG_PROVE_LOCKING is not set
|
CONFIG_PROVE_LOCKING=y
|
||||||
# CONFIG_DEBUG_SPINLOCK is not set
|
CONFIG_DEBUG_SPINLOCK=y
|
||||||
# CONFIG_PROVE_RCU is not set
|
CONFIG_PROVE_RCU=y
|
||||||
# CONFIG_PROVE_RCU_REPEATEDLY is not set
|
# CONFIG_PROVE_RCU_REPEATEDLY is not set
|
||||||
# CONFIG_DEBUG_PER_CPU_MAPS is not set
|
CONFIG_DEBUG_PER_CPU_MAPS=y
|
||||||
CONFIG_CPUMASK_OFFSTACK=y
|
CONFIG_CPUMASK_OFFSTACK=y
|
||||||
|
|
||||||
# CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set
|
CONFIG_CPU_NOTIFIER_ERROR_INJECT=m
|
||||||
|
|
||||||
# CONFIG_FAULT_INJECTION is not set
|
CONFIG_FAULT_INJECTION=y
|
||||||
# CONFIG_FAILSLAB is not set
|
CONFIG_FAILSLAB=y
|
||||||
# CONFIG_FAIL_PAGE_ALLOC is not set
|
CONFIG_FAIL_PAGE_ALLOC=y
|
||||||
# CONFIG_FAIL_MAKE_REQUEST is not set
|
CONFIG_FAIL_MAKE_REQUEST=y
|
||||||
# CONFIG_FAULT_INJECTION_DEBUG_FS is not set
|
CONFIG_FAULT_INJECTION_DEBUG_FS=y
|
||||||
# CONFIG_FAULT_INJECTION_STACKTRACE_FILTER is not set
|
CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
|
||||||
# CONFIG_FAIL_IO_TIMEOUT is not set
|
CONFIG_FAIL_IO_TIMEOUT=y
|
||||||
# CONFIG_FAIL_MMC_REQUEST is not set
|
CONFIG_FAIL_MMC_REQUEST=y
|
||||||
|
|
||||||
# CONFIG_LOCK_STAT is not set
|
CONFIG_LOCK_STAT=y
|
||||||
|
|
||||||
# CONFIG_DEBUG_STACK_USAGE is not set
|
CONFIG_DEBUG_STACK_USAGE=y
|
||||||
|
|
||||||
# CONFIG_ACPI_DEBUG is not set
|
CONFIG_ACPI_DEBUG=y
|
||||||
|
|
||||||
# CONFIG_DEBUG_SG is not set
|
CONFIG_DEBUG_SG=y
|
||||||
# CONFIG_DEBUG_PI_LIST is not set
|
CONFIG_DEBUG_PI_LIST=y
|
||||||
|
|
||||||
# CONFIG_DEBUG_PAGEALLOC is not set
|
# CONFIG_DEBUG_PAGEALLOC is not set
|
||||||
|
|
||||||
# CONFIG_DEBUG_OBJECTS is not set
|
CONFIG_DEBUG_OBJECTS=y
|
||||||
# CONFIG_DEBUG_OBJECTS_SELFTEST is not set
|
# CONFIG_DEBUG_OBJECTS_SELFTEST is not set
|
||||||
# CONFIG_DEBUG_OBJECTS_FREE is not set
|
CONFIG_DEBUG_OBJECTS_FREE=y
|
||||||
# CONFIG_DEBUG_OBJECTS_TIMERS is not set
|
CONFIG_DEBUG_OBJECTS_TIMERS=y
|
||||||
# CONFIG_DEBUG_OBJECTS_RCU_HEAD is not set
|
CONFIG_DEBUG_OBJECTS_RCU_HEAD=y
|
||||||
CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
|
CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
|
||||||
|
|
||||||
# CONFIG_X86_PTDUMP is not set
|
CONFIG_X86_PTDUMP=y
|
||||||
# CONFIG_EFI_PGT_DUMP is not set
|
CONFIG_EFI_PGT_DUMP=y
|
||||||
|
|
||||||
# CONFIG_CAN_DEBUG_DEVICES is not set
|
CONFIG_CAN_DEBUG_DEVICES=y
|
||||||
|
|
||||||
# CONFIG_MODULE_FORCE_UNLOAD is not set
|
CONFIG_MODULE_FORCE_UNLOAD=y
|
||||||
|
|
||||||
|
|
||||||
# CONFIG_DEBUG_NOTIFIERS is not set
|
CONFIG_DEBUG_NOTIFIERS=y
|
||||||
|
|
||||||
# CONFIG_DMA_API_DEBUG is not set
|
CONFIG_DMA_API_DEBUG=y
|
||||||
|
|
||||||
# CONFIG_MMIOTRACE is not set
|
CONFIG_MMIOTRACE=y
|
||||||
|
|
||||||
# CONFIG_DEBUG_CREDENTIALS is not set
|
CONFIG_DEBUG_CREDENTIALS=y
|
||||||
|
|
||||||
# off in both production debug and nodebug builds,
|
# off in both production debug and nodebug builds,
|
||||||
# on in rawhide nodebug builds
|
# on in rawhide nodebug builds
|
||||||
# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
|
CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
|
||||||
|
|
||||||
# CONFIG_EXT4_DEBUG is not set
|
CONFIG_EXT4_DEBUG=y
|
||||||
|
|
||||||
# CONFIG_XFS_WARN is not set
|
# CONFIG_XFS_WARN is not set
|
||||||
|
|
||||||
# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
|
CONFIG_DEBUG_PERF_USE_VMALLOC=y
|
||||||
|
|
||||||
# CONFIG_JBD2_DEBUG is not set
|
CONFIG_JBD2_DEBUG=y
|
||||||
|
|
||||||
# CONFIG_NFSD_FAULT_INJECTION is not set
|
CONFIG_NFSD_FAULT_INJECTION=y
|
||||||
|
|
||||||
# CONFIG_DEBUG_BLK_CGROUP is not set
|
CONFIG_DEBUG_BLK_CGROUP=y
|
||||||
|
|
||||||
# CONFIG_DRBD_FAULT_INJECTION is not set
|
CONFIG_DRBD_FAULT_INJECTION=y
|
||||||
|
|
||||||
# CONFIG_ATH_DEBUG is not set
|
CONFIG_ATH_DEBUG=y
|
||||||
# CONFIG_CARL9170_DEBUGFS is not set
|
CONFIG_CARL9170_DEBUGFS=y
|
||||||
# CONFIG_IWLWIFI_DEVICE_TRACING is not set
|
CONFIG_IWLWIFI_DEVICE_TRACING=y
|
||||||
|
|
||||||
# CONFIG_RTLWIFI_DEBUG is not set
|
# CONFIG_RTLWIFI_DEBUG is not set
|
||||||
|
|
||||||
# CONFIG_DEBUG_OBJECTS_WORK is not set
|
CONFIG_DEBUG_OBJECTS_WORK=y
|
||||||
|
|
||||||
# CONFIG_DMADEVICES_DEBUG is not set
|
CONFIG_DMADEVICES_DEBUG=y
|
||||||
# CONFIG_DMADEVICES_VDEBUG is not set
|
CONFIG_DMADEVICES_VDEBUG=y
|
||||||
|
|
||||||
CONFIG_PM_ADVANCED_DEBUG=y
|
CONFIG_PM_ADVANCED_DEBUG=y
|
||||||
|
|
||||||
# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
|
CONFIG_CEPH_LIB_PRETTYDEBUG=y
|
||||||
# CONFIG_QUOTA_DEBUG is not set
|
CONFIG_QUOTA_DEBUG=y
|
||||||
|
|
||||||
|
|
||||||
CONFIG_KGDB_KDB=y
|
CONFIG_KGDB_KDB=y
|
||||||
CONFIG_KDB_KEYBOARD=y
|
CONFIG_KDB_KEYBOARD=y
|
||||||
CONFIG_KDB_CONTINUE_CATASTROPHIC=0
|
CONFIG_KDB_CONTINUE_CATASTROPHIC=0
|
||||||
|
|
||||||
# CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER is not set
|
CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y
|
||||||
# CONFIG_PERCPU_TEST is not set
|
# CONFIG_PERCPU_TEST is not set
|
||||||
# CONFIG_TEST_LIST_SORT is not set
|
CONFIG_TEST_LIST_SORT=y
|
||||||
# CONFIG_TEST_STRING_HELPERS is not set
|
# CONFIG_TEST_STRING_HELPERS is not set
|
||||||
|
|
||||||
# CONFIG_DETECT_HUNG_TASK is not set
|
CONFIG_DETECT_HUNG_TASK=y
|
||||||
CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
|
CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
|
||||||
# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
|
# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
|
||||||
|
|
||||||
# CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set
|
CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
|
||||||
|
|
||||||
# CONFIG_DEBUG_KMEMLEAK is not set
|
CONFIG_DEBUG_KMEMLEAK=y
|
||||||
CONFIG_DEBUG_KMEMLEAK_EARLY_LOG_SIZE=1024
|
CONFIG_DEBUG_KMEMLEAK_EARLY_LOG_SIZE=1024
|
||||||
# CONFIG_DEBUG_KMEMLEAK_TEST is not set
|
# CONFIG_DEBUG_KMEMLEAK_TEST is not set
|
||||||
CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
|
CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
|
||||||
@ -121,7 +121,7 @@ CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
|
|||||||
|
|
||||||
# CONFIG_SPI_DEBUG is not set
|
# CONFIG_SPI_DEBUG is not set
|
||||||
|
|
||||||
# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set
|
CONFIG_X86_DEBUG_STATIC_CPU_HAS=y
|
||||||
|
|
||||||
# CONFIG_SCHEDSTATS is not set
|
# CONFIG_SCHEDSTATS is not set
|
||||||
# CONFIG_LATENCYTOP is not set
|
# CONFIG_LATENCYTOP is not set
|
||||||
|
@ -335,7 +335,7 @@ CONFIG_SP5100_TCO=m
|
|||||||
|
|
||||||
# CONFIG_MEMTEST is not set
|
# CONFIG_MEMTEST is not set
|
||||||
# CONFIG_DEBUG_TLBFLUSH is not set
|
# CONFIG_DEBUG_TLBFLUSH is not set
|
||||||
# CONFIG_MAXSMP is not set
|
CONFIG_MAXSMP=y
|
||||||
|
|
||||||
|
|
||||||
CONFIG_HP_ILO=m
|
CONFIG_HP_ILO=m
|
||||||
@ -406,6 +406,7 @@ CONFIG_GPIO_ICH=m
|
|||||||
# CONFIG_TWL4030_CORE is not set
|
# CONFIG_TWL4030_CORE is not set
|
||||||
# CONFIG_TWL6040_CORE is not set
|
# CONFIG_TWL6040_CORE is not set
|
||||||
|
|
||||||
|
# CONFIG_SERIAL_8250_FINTEK is not set
|
||||||
|
|
||||||
CONFIG_PCI_CNB20LE_QUIRK=y
|
CONFIG_PCI_CNB20LE_QUIRK=y
|
||||||
|
|
||||||
|
@ -57,6 +57,7 @@ CONFIG_INTEL_MIC_X100_DMA=m
|
|||||||
# SHPC has half-arsed PCI probing, which makes it load on too many systems
|
# SHPC has half-arsed PCI probing, which makes it load on too many systems
|
||||||
CONFIG_HOTPLUG_PCI_SHPC=m
|
CONFIG_HOTPLUG_PCI_SHPC=m
|
||||||
|
|
||||||
|
# CONFIG_CRYPTO_SHA1_MB is not set
|
||||||
CONFIG_CRYPTO_AES_X86_64=y
|
CONFIG_CRYPTO_AES_X86_64=y
|
||||||
CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
|
CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
|
||||||
CONFIG_CRYPTO_TWOFISH_X86_64=m
|
CONFIG_CRYPTO_TWOFISH_X86_64=m
|
||||||
|
@ -269,7 +269,7 @@ index 000000000000..fd4736ec99f5
|
|||||||
+
|
+
|
||||||
+#endif /* _X86_CRASH_H */
|
+#endif /* _X86_CRASH_H */
|
||||||
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
|
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
|
||||||
index 6e9f74a5c095..ee6bae16b04c 100644
|
index efefd12a0f7b..6a318132b7ee 100644
|
||||||
--- a/drivers/char/Kconfig
|
--- a/drivers/char/Kconfig
|
||||||
+++ b/drivers/char/Kconfig
|
+++ b/drivers/char/Kconfig
|
||||||
@@ -4,6 +4,9 @@
|
@@ -4,6 +4,9 @@
|
||||||
@ -283,13 +283,13 @@ index 6e9f74a5c095..ee6bae16b04c 100644
|
|||||||
|
|
||||||
config DEVKMEM
|
config DEVKMEM
|
||||||
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
|
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
|
||||||
index a324f9303e36..33ce2fb1d0a3 100644
|
index d06cde26031b..0832636fd9bc 100644
|
||||||
--- a/drivers/char/Makefile
|
--- a/drivers/char/Makefile
|
||||||
+++ b/drivers/char/Makefile
|
+++ b/drivers/char/Makefile
|
||||||
@@ -61,3 +61,5 @@ obj-$(CONFIG_JS_RTC) += js-rtc.o
|
@@ -62,3 +62,5 @@ js-rtc-y = rtc.o
|
||||||
js-rtc-y = rtc.o
|
|
||||||
|
|
||||||
obj-$(CONFIG_TILE_SROM) += tile-srom.o
|
obj-$(CONFIG_TILE_SROM) += tile-srom.o
|
||||||
|
obj-$(CONFIG_XILLYBUS) += xillybus/
|
||||||
+
|
+
|
||||||
+obj-$(CONFIG_CRASH) += crash.o
|
+obj-$(CONFIG_CRASH) += crash.o
|
||||||
diff --git a/drivers/char/crash.c b/drivers/char/crash.c
|
diff --git a/drivers/char/crash.c b/drivers/char/crash.c
|
||||||
|
@ -9,7 +9,7 @@ Upstream-status: Fedora mustard
|
|||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
diff --git a/init/Kconfig b/init/Kconfig
|
diff --git a/init/Kconfig b/init/Kconfig
|
||||||
index 3c866db603a7..bfb3c54d5286 100644
|
index 5e701ec1be55..abb2fc8f1b7a 100644
|
||||||
--- a/init/Kconfig
|
--- a/init/Kconfig
|
||||||
+++ b/init/Kconfig
|
+++ b/init/Kconfig
|
||||||
@@ -1149,7 +1149,7 @@ config DEBUG_BLK_CGROUP
|
@@ -1149,7 +1149,7 @@ config DEBUG_BLK_CGROUP
|
||||||
|
@ -11,10 +11,10 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
|
|||||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
|
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
|
||||||
index 61542c282e70..e5ee669e87b6 100644
|
index e12033b15d25..05a5303d1857 100644
|
||||||
--- a/arch/x86/Kconfig
|
--- a/arch/x86/Kconfig
|
||||||
+++ b/arch/x86/Kconfig
|
+++ b/arch/x86/Kconfig
|
||||||
@@ -1567,7 +1567,8 @@ config EFI_MIXED
|
@@ -1579,7 +1579,8 @@ config EFI_MIXED
|
||||||
If unsure, say N.
|
If unsure, say N.
|
||||||
|
|
||||||
config EFI_SECURE_BOOT_SIG_ENFORCE
|
config EFI_SECURE_BOOT_SIG_ENFORCE
|
||||||
|
35
kernel.spec
35
kernel.spec
@ -6,9 +6,9 @@ Summary: The Linux kernel
|
|||||||
# For a stable, released kernel, released_kernel should be 1. For rawhide
|
# For a stable, released kernel, released_kernel should be 1. For rawhide
|
||||||
# and/or a kernel built from an rc or git snapshot, released_kernel should
|
# and/or a kernel built from an rc or git snapshot, released_kernel should
|
||||||
# be 0.
|
# be 0.
|
||||||
%global released_kernel 1
|
%global released_kernel 0
|
||||||
|
|
||||||
%global aarch64patches 1
|
%global aarch64patches 0
|
||||||
|
|
||||||
# Sign modules on x86. Make sure the config files match this setting if more
|
# Sign modules on x86. Make sure the config files match this setting if more
|
||||||
# architectures are added.
|
# architectures are added.
|
||||||
@ -42,7 +42,7 @@ Summary: The Linux kernel
|
|||||||
# For non-released -rc kernels, this will be appended after the rcX and
|
# For non-released -rc kernels, this will be appended after the rcX and
|
||||||
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
|
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
|
||||||
#
|
#
|
||||||
%global baserelease 2
|
%global baserelease 1
|
||||||
%global fedora_build %{baserelease}
|
%global fedora_build %{baserelease}
|
||||||
|
|
||||||
# base_sublevel is the kernel version we're starting with and patching
|
# base_sublevel is the kernel version we're starting with and patching
|
||||||
@ -69,7 +69,7 @@ Summary: The Linux kernel
|
|||||||
# The rc snapshot level
|
# The rc snapshot level
|
||||||
%define rcrev 0
|
%define rcrev 0
|
||||||
# The git snapshot level
|
# The git snapshot level
|
||||||
%define gitrev 0
|
%define gitrev 1
|
||||||
# Set rpm version accordingly
|
# Set rpm version accordingly
|
||||||
%define rpmversion 3.%{upstream_sublevel}.0
|
%define rpmversion 3.%{upstream_sublevel}.0
|
||||||
%endif
|
%endif
|
||||||
@ -124,7 +124,7 @@ Summary: The Linux kernel
|
|||||||
# Set debugbuildsenabled to 1 for production (build separate debug kernels)
|
# Set debugbuildsenabled to 1 for production (build separate debug kernels)
|
||||||
# and 0 for rawhide (all kernels are debug kernels).
|
# and 0 for rawhide (all kernels are debug kernels).
|
||||||
# See also 'make debug' and 'make release'.
|
# See also 'make debug' and 'make release'.
|
||||||
%define debugbuildsenabled 1
|
%define debugbuildsenabled 0
|
||||||
|
|
||||||
# Want to build a vanilla kernel build without any non-upstream patches?
|
# Want to build a vanilla kernel build without any non-upstream patches?
|
||||||
%define with_vanilla %{?_with_vanilla: 1} %{?!_with_vanilla: 0}
|
%define with_vanilla %{?_with_vanilla: 1} %{?!_with_vanilla: 0}
|
||||||
@ -609,19 +609,9 @@ Patch26002: samsung-laptop-Add-broken-acpi-video-quirk-for-NC210.patch
|
|||||||
Patch26013: acpi-video-Add-use-native-backlight-quirk-for-the-Th.patch
|
Patch26013: acpi-video-Add-use-native-backlight-quirk-for-the-Th.patch
|
||||||
Patch26014: acpi-video-Add-use_native_backlight-quirk-for-HP-Pro.patch
|
Patch26014: acpi-video-Add-use_native_backlight-quirk-for-HP-Pro.patch
|
||||||
|
|
||||||
#rhbz 1134969
|
|
||||||
Patch26016: HID-wacom-Add-support-for-the-Cintiq-Companion.patch
|
|
||||||
|
|
||||||
#rhbz 1110011
|
|
||||||
Patch26019: psmouse-Add-psmouse_matches_pnp_id-helper-function.patch
|
|
||||||
Patch26020: psmouse-Add-support-for-detecting-FocalTech-PS-2-tou.patch
|
|
||||||
|
|
||||||
#rhbz 1138759
|
#rhbz 1138759
|
||||||
Patch26021: drm-vmwgfx-Fix-drm.h-include.patch
|
Patch26021: drm-vmwgfx-Fix-drm.h-include.patch
|
||||||
|
|
||||||
#rhbz 1123584
|
|
||||||
Patch26028: HID-rmi-check-sanity-of-incoming-report.patch
|
|
||||||
|
|
||||||
#rhbz 1145318
|
#rhbz 1145318
|
||||||
Patch26029: KEYS-Reinstate-EPERM-for-a-key-type-name-beginning-w.patch
|
Patch26029: KEYS-Reinstate-EPERM-for-a-key-type-name-beginning-w.patch
|
||||||
|
|
||||||
@ -1348,19 +1338,9 @@ ApplyPatch samsung-laptop-Add-broken-acpi-video-quirk-for-NC210.patch
|
|||||||
ApplyPatch acpi-video-Add-use-native-backlight-quirk-for-the-Th.patch
|
ApplyPatch acpi-video-Add-use-native-backlight-quirk-for-the-Th.patch
|
||||||
ApplyPatch acpi-video-Add-use_native_backlight-quirk-for-HP-Pro.patch
|
ApplyPatch acpi-video-Add-use_native_backlight-quirk-for-HP-Pro.patch
|
||||||
|
|
||||||
#rhbz 1134969
|
|
||||||
ApplyPatch HID-wacom-Add-support-for-the-Cintiq-Companion.patch
|
|
||||||
|
|
||||||
#rhbz 1110011
|
|
||||||
ApplyPatch psmouse-Add-psmouse_matches_pnp_id-helper-function.patch
|
|
||||||
ApplyPatch psmouse-Add-support-for-detecting-FocalTech-PS-2-tou.patch
|
|
||||||
|
|
||||||
#rhbz 1138759
|
#rhbz 1138759
|
||||||
ApplyPatch drm-vmwgfx-Fix-drm.h-include.patch
|
ApplyPatch drm-vmwgfx-Fix-drm.h-include.patch
|
||||||
|
|
||||||
#rhbz 1123584
|
|
||||||
ApplyPatch HID-rmi-check-sanity-of-incoming-report.patch
|
|
||||||
|
|
||||||
#rhbz 1145318
|
#rhbz 1145318
|
||||||
ApplyPatch KEYS-Reinstate-EPERM-for-a-key-type-name-beginning-w.patch
|
ApplyPatch KEYS-Reinstate-EPERM-for-a-key-type-name-beginning-w.patch
|
||||||
|
|
||||||
@ -2234,6 +2214,11 @@ fi
|
|||||||
# ||----w |
|
# ||----w |
|
||||||
# || ||
|
# || ||
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Oct 08 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc0.git1.1
|
||||||
|
- Linux v3.17-2860-gef0625b70dac
|
||||||
|
- Reenable debugging options.
|
||||||
|
- Temporarily disable aarch64patches
|
||||||
|
|
||||||
* Tue Oct 07 2014 Josh Boyer <jwboyer@fedoraproject.org>
|
* Tue Oct 07 2014 Josh Boyer <jwboyer@fedoraproject.org>
|
||||||
- Add patch to fix GFS2 regression (from Bob Peterson)
|
- Add patch to fix GFS2 regression (from Bob Peterson)
|
||||||
|
|
||||||
|
@ -10,10 +10,10 @@ exercise left to the reader.
|
|||||||
1 file changed, 11 insertions(+), 1 deletion(-)
|
1 file changed, 11 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c
|
diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c
|
||||||
index 95dd9cf55cb3..800fc34d7ea9 100644
|
index fb94b772ad62..99668ad01b54 100644
|
||||||
--- a/drivers/pinctrl/pinctrl-single.c
|
--- a/drivers/pinctrl/pinctrl-single.c
|
||||||
+++ b/drivers/pinctrl/pinctrl-single.c
|
+++ b/drivers/pinctrl/pinctrl-single.c
|
||||||
@@ -2012,7 +2012,17 @@ static struct platform_driver pcs_driver = {
|
@@ -2026,7 +2026,17 @@ static struct platform_driver pcs_driver = {
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1,99 +0,0 @@
|
|||||||
From: Hans de Goede <hdegoede@redhat.com>
|
|
||||||
Date: Fri, 27 Jun 2014 18:46:42 +0200
|
|
||||||
Subject: [PATCH] psmouse: Add psmouse_matches_pnp_id helper function
|
|
||||||
|
|
||||||
The matches_pnp_id function from the synaptics driver is useful for other
|
|
||||||
drivers too. Make it a generic psmouse helper function.
|
|
||||||
|
|
||||||
Bugzilla: 1110011
|
|
||||||
Upstream-status: sent for 3.17/3.18
|
|
||||||
|
|
||||||
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
||||||
---
|
|
||||||
drivers/input/mouse/psmouse-base.c | 14 ++++++++++++++
|
|
||||||
drivers/input/mouse/psmouse.h | 1 +
|
|
||||||
drivers/input/mouse/synaptics.c | 17 +++--------------
|
|
||||||
3 files changed, 18 insertions(+), 14 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
|
|
||||||
index b4e1f014ddc2..02e68c3008a3 100644
|
|
||||||
--- a/drivers/input/mouse/psmouse-base.c
|
|
||||||
+++ b/drivers/input/mouse/psmouse-base.c
|
|
||||||
@@ -462,6 +462,20 @@ static int psmouse_poll(struct psmouse *psmouse)
|
|
||||||
PSMOUSE_CMD_POLL | (psmouse->pktsize << 8));
|
|
||||||
}
|
|
||||||
|
|
||||||
+/*
|
|
||||||
+ * psmouse_matches_pnp_id - check if psmouse matches one of the passed in ids.
|
|
||||||
+ */
|
|
||||||
+bool psmouse_matches_pnp_id(struct psmouse *psmouse, const char * const ids[])
|
|
||||||
+{
|
|
||||||
+ int i;
|
|
||||||
+
|
|
||||||
+ if (!strncmp(psmouse->ps2dev.serio->firmware_id, "PNP:", 4))
|
|
||||||
+ for (i = 0; ids[i]; i++)
|
|
||||||
+ if (strstr(psmouse->ps2dev.serio->firmware_id, ids[i]))
|
|
||||||
+ return true;
|
|
||||||
+
|
|
||||||
+ return false;
|
|
||||||
+}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Genius NetMouse magic init.
|
|
||||||
diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
|
|
||||||
index 2f0b39d59a9b..f4cf664c7db3 100644
|
|
||||||
--- a/drivers/input/mouse/psmouse.h
|
|
||||||
+++ b/drivers/input/mouse/psmouse.h
|
|
||||||
@@ -108,6 +108,7 @@ void psmouse_set_resolution(struct psmouse *psmouse, unsigned int resolution);
|
|
||||||
psmouse_ret_t psmouse_process_byte(struct psmouse *psmouse);
|
|
||||||
int psmouse_activate(struct psmouse *psmouse);
|
|
||||||
int psmouse_deactivate(struct psmouse *psmouse);
|
|
||||||
+bool psmouse_matches_pnp_id(struct psmouse *psmouse, const char * const ids[]);
|
|
||||||
|
|
||||||
struct psmouse_attribute {
|
|
||||||
struct device_attribute dattr;
|
|
||||||
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
|
|
||||||
index fd23181c1fb7..6394d9b5bfd3 100644
|
|
||||||
--- a/drivers/input/mouse/synaptics.c
|
|
||||||
+++ b/drivers/input/mouse/synaptics.c
|
|
||||||
@@ -185,18 +185,6 @@ static const char * const topbuttonpad_pnp_ids[] = {
|
|
||||||
NULL
|
|
||||||
};
|
|
||||||
|
|
||||||
-static bool matches_pnp_id(struct psmouse *psmouse, const char * const ids[])
|
|
||||||
-{
|
|
||||||
- int i;
|
|
||||||
-
|
|
||||||
- if (!strncmp(psmouse->ps2dev.serio->firmware_id, "PNP:", 4))
|
|
||||||
- for (i = 0; ids[i]; i++)
|
|
||||||
- if (strstr(psmouse->ps2dev.serio->firmware_id, ids[i]))
|
|
||||||
- return true;
|
|
||||||
-
|
|
||||||
- return false;
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
/*****************************************************************************
|
|
||||||
* Synaptics communications functions
|
|
||||||
****************************************************************************/
|
|
||||||
@@ -362,7 +350,8 @@ static int synaptics_resolution(struct psmouse *psmouse)
|
|
||||||
}
|
|
||||||
|
|
||||||
for (i = 0; min_max_pnpid_table[i].pnp_ids; i++) {
|
|
||||||
- if (matches_pnp_id(psmouse, min_max_pnpid_table[i].pnp_ids)) {
|
|
||||||
+ if (psmouse_matches_pnp_id(psmouse,
|
|
||||||
+ min_max_pnpid_table[i].pnp_ids)) {
|
|
||||||
priv->x_min = min_max_pnpid_table[i].x_min;
|
|
||||||
priv->x_max = min_max_pnpid_table[i].x_max;
|
|
||||||
priv->y_min = min_max_pnpid_table[i].y_min;
|
|
||||||
@@ -1492,7 +1481,7 @@ static void set_input_params(struct psmouse *psmouse,
|
|
||||||
|
|
||||||
if (SYN_CAP_CLICKPAD(priv->ext_cap_0c)) {
|
|
||||||
__set_bit(INPUT_PROP_BUTTONPAD, dev->propbit);
|
|
||||||
- if (matches_pnp_id(psmouse, topbuttonpad_pnp_ids))
|
|
||||||
+ if (psmouse_matches_pnp_id(psmouse, topbuttonpad_pnp_ids))
|
|
||||||
__set_bit(INPUT_PROP_TOPBUTTONPAD, dev->propbit);
|
|
||||||
/* Clickpads report only left button */
|
|
||||||
__clear_bit(BTN_RIGHT, dev->keybit);
|
|
||||||
--
|
|
||||||
1.9.3
|
|
||||||
|
|
@ -1,157 +0,0 @@
|
|||||||
From: Hans de Goede <hdegoede@redhat.com>
|
|
||||||
Date: Fri, 27 Jun 2014 18:50:33 +0200
|
|
||||||
Subject: [PATCH] psmouse: Add support for detecting FocalTech PS/2 touchpads
|
|
||||||
|
|
||||||
The Asus X450 and X550 laptops use a PS/2 touchpad from a new manufacturer
|
|
||||||
called FocalTech:
|
|
||||||
|
|
||||||
https://bugzilla.kernel.org/show_bug.cgi?id=77391
|
|
||||||
https://bugzilla.redhat.com/show_bug.cgi?id=1110011
|
|
||||||
|
|
||||||
The protocol for these devices is not known at this time, but even without
|
|
||||||
knowing the protocol they need some special handling. They get upset by some
|
|
||||||
of our other PS/2 device probing, and once upset generate random mouse events
|
|
||||||
making things unusable even with an external mouse.
|
|
||||||
|
|
||||||
This patch adds detection of these devices based on their pnp ids, and when
|
|
||||||
they are detected, treats them as a bare ps/2 mouse. Doing things this way
|
|
||||||
they at least work in their ps/2 mouse emulation mode.
|
|
||||||
|
|
||||||
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
||||||
---
|
|
||||||
drivers/input/mouse/Makefile | 2 +-
|
|
||||||
drivers/input/mouse/focaltech.c | 44 ++++++++++++++++++++++++++++++++++++++
|
|
||||||
drivers/input/mouse/focaltech.h | 21 ++++++++++++++++++
|
|
||||||
drivers/input/mouse/psmouse-base.c | 10 +++++++++
|
|
||||||
4 files changed, 76 insertions(+), 1 deletion(-)
|
|
||||||
create mode 100644 drivers/input/mouse/focaltech.c
|
|
||||||
create mode 100644 drivers/input/mouse/focaltech.h
|
|
||||||
|
|
||||||
diff --git a/drivers/input/mouse/Makefile b/drivers/input/mouse/Makefile
|
|
||||||
index c25efdb3f288..dda507f8b3a2 100644
|
|
||||||
--- a/drivers/input/mouse/Makefile
|
|
||||||
+++ b/drivers/input/mouse/Makefile
|
|
||||||
@@ -23,7 +23,7 @@ obj-$(CONFIG_MOUSE_SYNAPTICS_I2C) += synaptics_i2c.o
|
|
||||||
obj-$(CONFIG_MOUSE_SYNAPTICS_USB) += synaptics_usb.o
|
|
||||||
obj-$(CONFIG_MOUSE_VSXXXAA) += vsxxxaa.o
|
|
||||||
|
|
||||||
-psmouse-objs := psmouse-base.o synaptics.o
|
|
||||||
+psmouse-objs := psmouse-base.o synaptics.o focaltech.o
|
|
||||||
|
|
||||||
psmouse-$(CONFIG_MOUSE_PS2_ALPS) += alps.o
|
|
||||||
psmouse-$(CONFIG_MOUSE_PS2_ELANTECH) += elantech.o
|
|
||||||
diff --git a/drivers/input/mouse/focaltech.c b/drivers/input/mouse/focaltech.c
|
|
||||||
new file mode 100644
|
|
||||||
index 000000000000..d83a23554d63
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/drivers/input/mouse/focaltech.c
|
|
||||||
@@ -0,0 +1,44 @@
|
|
||||||
+/*
|
|
||||||
+ * Focaltech TouchPad PS/2 mouse driver
|
|
||||||
+ *
|
|
||||||
+ * Copyright (c) 2014 Red Hat Inc.
|
|
||||||
+ *
|
|
||||||
+ * This program is free software; you can redistribute it and/or modify
|
|
||||||
+ * it under the terms of the GNU General Public License as published by
|
|
||||||
+ * the Free Software Foundation; either version 2 of the License, or
|
|
||||||
+ * (at your option) any later version.
|
|
||||||
+ *
|
|
||||||
+ * Red Hat authors:
|
|
||||||
+ *
|
|
||||||
+ * Hans de Goede <hdegoede@redhat.com>
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+/*
|
|
||||||
+ * The Focaltech PS/2 touchpad protocol is unknown. This drivers deals with
|
|
||||||
+ * detection only, to avoid further detection attempts confusing the touchpad
|
|
||||||
+ * this way it at least works in PS/2 mouse compatibility mode.
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+#include <linux/device.h>
|
|
||||||
+#include <linux/libps2.h>
|
|
||||||
+#include "psmouse.h"
|
|
||||||
+
|
|
||||||
+static const char * const focaltech_pnp_ids[] = {
|
|
||||||
+ "FLT0101",
|
|
||||||
+ "FLT0102",
|
|
||||||
+ "FLT0103",
|
|
||||||
+ NULL
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+int focaltech_detect(struct psmouse *psmouse, bool set_properties)
|
|
||||||
+{
|
|
||||||
+ if (!psmouse_matches_pnp_id(psmouse, focaltech_pnp_ids))
|
|
||||||
+ return -ENODEV;
|
|
||||||
+
|
|
||||||
+ if (set_properties) {
|
|
||||||
+ psmouse->vendor = "FocalTech";
|
|
||||||
+ psmouse->name = "FocalTech Touchpad in mouse emulation mode";
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
diff --git a/drivers/input/mouse/focaltech.h b/drivers/input/mouse/focaltech.h
|
|
||||||
new file mode 100644
|
|
||||||
index 000000000000..0d0fc49451fe
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/drivers/input/mouse/focaltech.h
|
|
||||||
@@ -0,0 +1,21 @@
|
|
||||||
+/*
|
|
||||||
+ * Focaltech TouchPad PS/2 mouse driver
|
|
||||||
+ *
|
|
||||||
+ * Copyright (c) 2014 Red Hat Inc.
|
|
||||||
+ *
|
|
||||||
+ * This program is free software; you can redistribute it and/or modify
|
|
||||||
+ * it under the terms of the GNU General Public License as published by
|
|
||||||
+ * the Free Software Foundation; either version 2 of the License, or
|
|
||||||
+ * (at your option) any later version.
|
|
||||||
+ *
|
|
||||||
+ * Red Hat authors:
|
|
||||||
+ *
|
|
||||||
+ * Hans de Goede <hdegoede@redhat.com>
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+#ifndef _FOCALTECH_H
|
|
||||||
+#define _FOCALTECH_H
|
|
||||||
+
|
|
||||||
+int focaltech_detect(struct psmouse *psmouse, bool set_properties);
|
|
||||||
+
|
|
||||||
+#endif
|
|
||||||
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
|
|
||||||
index 02e68c3008a3..2c8c8e2172a2 100644
|
|
||||||
--- a/drivers/input/mouse/psmouse-base.c
|
|
||||||
+++ b/drivers/input/mouse/psmouse-base.c
|
|
||||||
@@ -35,6 +35,7 @@
|
|
||||||
#include "elantech.h"
|
|
||||||
#include "sentelic.h"
|
|
||||||
#include "cypress_ps2.h"
|
|
||||||
+#include "focaltech.h"
|
|
||||||
|
|
||||||
#define DRIVER_DESC "PS/2 mouse driver"
|
|
||||||
|
|
||||||
@@ -722,6 +723,13 @@ static int psmouse_extensions(struct psmouse *psmouse,
|
|
||||||
{
|
|
||||||
bool synaptics_hardware = false;
|
|
||||||
|
|
||||||
+/* Always check for focaltech, this is safe as it uses pnp-id matching */
|
|
||||||
+ if (psmouse_do_detect(focaltech_detect, psmouse, set_properties) == 0) {
|
|
||||||
+ /* Not supported yet, use bare protocol */
|
|
||||||
+ psmouse_max_proto = max_proto = PSMOUSE_PS2;
|
|
||||||
+ goto reset_to_defaults;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
/*
|
|
||||||
* We always check for lifebook because it does not disturb mouse
|
|
||||||
* (it only checks DMI information).
|
|
||||||
@@ -873,6 +881,8 @@ static int psmouse_extensions(struct psmouse *psmouse,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
+reset_to_defaults:
|
|
||||||
+
|
|
||||||
/*
|
|
||||||
* Reset to defaults in case the device got confused by extended
|
|
||||||
* protocol probes. Note that we follow up with full reset because
|
|
||||||
--
|
|
||||||
1.9.3
|
|
||||||
|
|
@ -9,10 +9,10 @@ Upstream-status: Fedora mustard (might be worth dropping...)
|
|||||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
|
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
|
||||||
index 2c2041ca4b70..e10812d985af 100644
|
index 0cb5c9f0c743..286b6e67d11d 100644
|
||||||
--- a/drivers/scsi/sd.c
|
--- a/drivers/scsi/sd.c
|
||||||
+++ b/drivers/scsi/sd.c
|
+++ b/drivers/scsi/sd.c
|
||||||
@@ -2749,13 +2749,18 @@ static int sd_try_extended_inquiry(struct scsi_device *sdp)
|
@@ -2753,13 +2753,18 @@ static int sd_try_extended_inquiry(struct scsi_device *sdp)
|
||||||
static int sd_revalidate_disk(struct gendisk *disk)
|
static int sd_revalidate_disk(struct gendisk *disk)
|
||||||
{
|
{
|
||||||
struct scsi_disk *sdkp = scsi_disk(disk);
|
struct scsi_disk *sdkp = scsi_disk(disk);
|
||||||
|
Loading…
Reference in New Issue
Block a user