Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit b7c2aecc0747f5c86a1959bce6a7ce8170a556b0

Authored by Ursula Braun
Committed by David S. Miller
1 parent 2c1409a0a2
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

iucv: add work_queue cleanup for suspend 

If iucv_work_queue is not empty during kernel freeze, a kernel panic
occurs. This suspend-patch adds flushing of the work queue for
pending connection requests and severing of remaining pending
connections.

Signed-off-by: Ursula Braun <ursula.braun@de.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 13 additions and 3 deletions Side-by-side Diff

... ... @@ -1768,7 +1768,6 @@
1768 1768 */
1769 1769 static void iucv_work_fn(struct work_struct *work)
1770 1770 {
1771   - typedef void iucv_irq_fn(struct iucv_irq_data *);
1772 1771 LIST_HEAD(work_queue);
1773 1772 struct iucv_irq_list *p, *n;
1774 1773  
1775 1774  
1776 1775  
... ... @@ -1878,14 +1877,25 @@
1878 1877 static int iucv_pm_freeze(struct device *dev)
1879 1878 {
1880 1879 int cpu;
  1880 + struct iucv_irq_list *p, *n;
1881 1881 int rc = 0;
1882 1882  
1883 1883 #ifdef CONFIG_PM_DEBUG
1884 1884 printk(KERN_WARNING "iucv_pm_freeze\n");
1885 1885 #endif
  1886 + if (iucv_pm_state != IUCV_PM_FREEZING) {
  1887 + for_each_cpu_mask_nr(cpu, iucv_irq_cpumask)
  1888 + smp_call_function_single(cpu, iucv_block_cpu_almost,
  1889 + NULL, 1);
  1890 + cancel_work_sync(&iucv_work);
  1891 + list_for_each_entry_safe(p, n, &iucv_work_queue, list) {
  1892 + list_del_init(&p->list);
  1893 + iucv_sever_pathid(p->data.ippathid,
  1894 + iucv_error_no_listener);
  1895 + kfree(p);
  1896 + }
  1897 + }
1886 1898 iucv_pm_state = IUCV_PM_FREEZING;
1887   - for_each_cpu_mask_nr(cpu, iucv_irq_cpumask)
1888   - smp_call_function_single(cpu, iucv_block_cpu_almost, NULL, 1);
1889 1899 if (dev->driver && dev->driver->pm && dev->driver->pm->freeze)
1890 1900 rc = dev->driver->pm->freeze(dev);
1891 1901 if (iucv_path_table_empty())