diff options
| -rw-r--r-- | gitrev | 2 | ||||
| -rw-r--r-- | input-rmi4-remove-the-need-for-artifical-IRQ.patch | 105 | ||||
| -rw-r--r-- | kernel.spec | 5 | ||||
| -rw-r--r-- | sources | 2 |
4 files changed, 58 insertions, 56 deletions
@@ -1 +1 @@ -813835028e9ae1f18cd11bb0ec591d0f0577d96a +f57494321cbf5b1e7769b6135407d2995a369e28 diff --git a/input-rmi4-remove-the-need-for-artifical-IRQ.patch b/input-rmi4-remove-the-need-for-artifical-IRQ.patch index 75e45dcb9..9a1794558 100644 --- a/input-rmi4-remove-the-need-for-artifical-IRQ.patch +++ b/input-rmi4-remove-the-need-for-artifical-IRQ.patch @@ -1,4 +1,4 @@ -From 47c84357d95eccd77c1320b4bca74bbec649ef3c Mon Sep 17 00:00:00 2001 +From 0a74d0f27e8d60e427b447a041bc061917d85fac Mon Sep 17 00:00:00 2001 From: Benjamin Tissoires <benjamin.tissoires@redhat.com> Date: Mon, 3 Apr 2017 18:18:21 +0200 Subject: [PATCH] Input: rmi4 - remove the need for artificial IRQ in case of @@ -16,13 +16,13 @@ Tested-by: Andrew Duggan <aduggan@synaptics.com> Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Signed-off-by: Lyude <lyude@redhat.com> --- - drivers/hid/hid-rmi.c | 64 --------------------- - drivers/input/rmi4/rmi_driver.c | 122 ++++++++++++++++++++++++---------------- + drivers/hid/hid-rmi.c | 64 ----------------- + drivers/input/rmi4/rmi_driver.c | 124 +++++++++++++++++++------------- include/linux/rmi.h | 1 + - 3 files changed, 75 insertions(+), 112 deletions(-) + 3 files changed, 75 insertions(+), 114 deletions(-) diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c -index 0f43c42..3f38872 100644 +index 9e33165250a3..e7e33a160b47 100644 --- a/drivers/hid/hid-rmi.c +++ b/drivers/hid/hid-rmi.c @@ -316,19 +316,12 @@ static int rmi_input_event(struct hid_device *hdev, u8 *data, int size) @@ -30,25 +30,25 @@ index 0f43c42..3f38872 100644 struct rmi_data *hdata = hid_get_drvdata(hdev); struct rmi_device *rmi_dev = hdata->xport.rmi_dev; - unsigned long flags; - + if (!(test_bit(RMI_STARTED, &hdata->flags))) return 0; - + - local_irq_save(flags); - rmi_set_attn_data(rmi_dev, data[1], &data[2], size - 2); - + - generic_handle_irq(hdata->rmi_irq); - - local_irq_restore(flags); - return 1; } - -@@ -568,56 +561,6 @@ static const struct rmi_transport_ops hid_rmi_ops = { + +@@ -586,56 +579,6 @@ static const struct rmi_transport_ops hid_rmi_ops = { .reset = rmi_hid_reset, }; - + -static void rmi_irq_teardown(void *data) -{ - struct rmi_data *hdata = data; @@ -102,10 +102,10 @@ index 0f43c42..3f38872 100644 static int rmi_probe(struct hid_device *hdev, const struct hid_device_id *id) { struct rmi_data *data = NULL; -@@ -689,18 +632,11 @@ static int rmi_probe(struct hid_device *hdev, const struct hid_device_id *id) - +@@ -708,18 +651,11 @@ static int rmi_probe(struct hid_device *hdev, const struct hid_device_id *id) + mutex_init(&data->page_mutex); - + - ret = rmi_setup_irq_domain(hdev); - if (ret) { - hid_err(hdev, "failed to allocate IRQ domain\n"); @@ -114,26 +114,26 @@ index 0f43c42..3f38872 100644 - if (data->device_flags & RMI_DEVICE_HAS_PHYS_BUTTONS) rmi_hid_pdata.f30_data.disable = true; - + data->xport.dev = hdev->dev.parent; data->xport.pdata = rmi_hid_pdata; - data->xport.pdata.irq = data->rmi_irq; data->xport.proto_name = "hid"; data->xport.ops = &hid_rmi_ops; - + diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c -index 141ea22..15b22db 100644 +index fc3ab93b7aea..35bc90141db8 100644 --- a/drivers/input/rmi4/rmi_driver.c +++ b/drivers/input/rmi4/rmi_driver.c -@@ -209,34 +209,47 @@ void rmi_set_attn_data(struct rmi_device *rmi_dev, unsigned long irq_status, +@@ -185,34 +185,47 @@ void rmi_set_attn_data(struct rmi_device *rmi_dev, unsigned long irq_status, attn_data.data = fifo_data; - + kfifo_put(&drvdata->attn_fifo, attn_data); + + schedule_work(&drvdata->attn_work); } EXPORT_SYMBOL_GPL(rmi_set_attn_data); - + -static irqreturn_t rmi_irq_fn(int irq, void *dev_id) +static void attn_callback(struct work_struct *work) { @@ -144,7 +144,7 @@ index 141ea22..15b22db 100644 + attn_work); struct rmi4_attn_data attn_data = {0}; int ret, count; - + count = kfifo_get(&drvdata->attn_fifo, &attn_data); - if (count) { - *(drvdata->irq_status) = attn_data.irq_status; @@ -152,7 +152,7 @@ index 141ea22..15b22db 100644 - } + if (!count) + return; - + - ret = rmi_process_interrupt_requests(rmi_dev); + *(drvdata->irq_status) = attn_data.irq_status; + drvdata->attn_data = attn_data; @@ -162,14 +162,14 @@ index 141ea22..15b22db 100644 - rmi_dbg(RMI_DEBUG_CORE, &rmi_dev->dev, + rmi_dbg(RMI_DEBUG_CORE, &drvdata->rmi_dev->dev, "Failed to process interrupt request: %d\n", ret); - + - if (count) { - kfree(attn_data.data); - attn_data.data = NULL; - } + kfree(attn_data.data); + attn_data.data = NULL; - + if (!kfifo_is_empty(&drvdata->attn_fifo)) - return rmi_irq_fn(irq, dev_id); + schedule_work(&drvdata->attn_work); @@ -184,30 +184,30 @@ index 141ea22..15b22db 100644 + if (ret) + rmi_dbg(RMI_DEBUG_CORE, &rmi_dev->dev, + "Failed to process interrupt request: %d\n", ret); - + return IRQ_HANDLED; } -@@ -244,7 +257,6 @@ static irqreturn_t rmi_irq_fn(int irq, void *dev_id) +@@ -220,7 +233,6 @@ static irqreturn_t rmi_irq_fn(int irq, void *dev_id) static int rmi_irq_init(struct rmi_device *rmi_dev) { struct rmi_device_platform_data *pdata = rmi_get_platform_data(rmi_dev); - struct rmi_driver_data *data = dev_get_drvdata(&rmi_dev->dev); int irq_flags = irq_get_trigger_type(pdata->irq); int ret; - -@@ -262,8 +274,6 @@ static int rmi_irq_init(struct rmi_device *rmi_dev) + +@@ -238,8 +250,6 @@ static int rmi_irq_init(struct rmi_device *rmi_dev) return ret; } - + - data->enabled = true; - return 0; } - -@@ -912,23 +922,27 @@ void rmi_enable_irq(struct rmi_device *rmi_dev, bool clear_wake) + +@@ -889,23 +899,27 @@ void rmi_enable_irq(struct rmi_device *rmi_dev, bool clear_wake) if (data->enabled) goto out; - + - enable_irq(irq); - data->enabled = true; - if (clear_wake && device_may_wakeup(rmi_dev->xport->dev)) { @@ -227,7 +227,7 @@ index 141ea22..15b22db 100644 + "Failed to disable irq for wake: %d\n", + retval); + } - + - /* - * Call rmi_process_interrupt_requests() after enabling irq, - * otherwise we may lose interrupt on edge-triggered systems. @@ -245,12 +245,12 @@ index 141ea22..15b22db 100644 + } else { + data->enabled = true; + } - + out: mutex_unlock(&data->enabled_mutex); -@@ -948,20 +962,22 @@ void rmi_disable_irq(struct rmi_device *rmi_dev, bool enable_wake) +@@ -925,20 +939,22 @@ void rmi_disable_irq(struct rmi_device *rmi_dev, bool enable_wake) goto out; - + data->enabled = false; - disable_irq(irq); - if (enable_wake && device_may_wakeup(rmi_dev->xport->dev)) { @@ -283,25 +283,21 @@ index 141ea22..15b22db 100644 + kfree(attn_data.data); + } } - + out: -@@ -1000,9 +1016,12 @@ EXPORT_SYMBOL_GPL(rmi_driver_resume); - static int rmi_driver_remove(struct device *dev) - { - struct rmi_device *rmi_dev = to_rmi_device(dev); -+ struct rmi_driver_data *data = dev_get_drvdata(&rmi_dev->dev); - - rmi_disable_irq(rmi_dev, false); - +@@ -984,6 +1000,8 @@ static int rmi_driver_remove(struct device *dev) + irq_domain_remove(data->irqdomain); + data->irqdomain = NULL; + + cancel_work_sync(&data->attn_work); + rmi_f34_remove_sysfs(rmi_dev); rmi_free_function_list(rmi_dev); - -@@ -1232,9 +1251,15 @@ static int rmi_driver_probe(struct device *dev) + +@@ -1221,9 +1239,15 @@ static int rmi_driver_probe(struct device *dev) } } - + - retval = rmi_irq_init(rmi_dev); - if (retval < 0) - goto err_destroy_functions; @@ -314,18 +310,21 @@ index 141ea22..15b22db 100644 + data->enabled = true; + + INIT_WORK(&data->attn_work, attn_callback); - + if (data->f01_container->dev.driver) { /* Driver already bound, so enable ATTN now. */ diff --git a/include/linux/rmi.h b/include/linux/rmi.h -index 6412544..dc90178 100644 +index 5ef5c7c412a7..21f48f2807de 100644 --- a/include/linux/rmi.h +++ b/include/linux/rmi.h -@@ -364,6 +364,7 @@ struct rmi_driver_data { - +@@ -366,6 +366,7 @@ struct rmi_driver_data { + struct rmi4_attn_data attn_data; DECLARE_KFIFO(attn_fifo, struct rmi4_attn_data, 16); + struct work_struct attn_work; }; - + int rmi_register_transport_device(struct rmi_transport_dev *xport); +-- +2.17.1 + diff --git a/kernel.spec b/kernel.spec index 0c4fd0e34..d8a8d322f 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 2 # The git snapshot level -%define gitrev 2 +%define gitrev 3 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -1843,6 +1843,9 @@ fi # # %changelog +* Thu Jun 28 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc2.git3.1 +- Linux v4.18-rc2-132-gf57494321cbf + * Tue Jun 26 2018 Laura Abbott <labbott@redhat.com> - Enable leds-pca9532 module (rhbz 1595163) @@ -1,3 +1,3 @@ SHA512 (linux-4.17.tar.xz) = 4d9de340a26155a89ea8773131c76220cc2057f2b5d031b467b60e8b14c1842518e2d60a863d8c695f0f7640f3f18d43826201984a238dade857b6cef79837db SHA512 (patch-4.18-rc2.xz) = d9723a202e43f3e68895fc8463e15b0723f6ecff947805ca501fdf12aa74e87915bc42d1c021d14168814c2178574f3f6f0c2bd770af9653c9e0867ebfaaebe0 -SHA512 (patch-4.18-rc2-git2.xz) = fed0e7857a6f3dbdf84c4ed38034f29b2a71dba4c934a38ed1e2e12920aa034e46ab7918df163e78547aa412139c079056ee25d7b67b5b485d5d3dcdd1bd8f6b +SHA512 (patch-4.18-rc2-git3.xz) = ebae03bef3c7753f07258316a03795a00b661b0b51269b3f7f1451380fc1b523704fddf66f219531d84548d2c6164e794573dc22229c84ab28f55119b1595c5e |