Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 5beab99100335936f4d845f9ae2f0e25796f2584

Authored by Martin Schwidefsky
1 parent 89c9b66b10
Exists in master and in 38 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.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

[S390] iucv cr0 enablement bit 

Do not set the cr0 enablement bit for iucv by default in head[31|64].S,
move the enablement to iucv_init in the iucv base layer.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

Showing 3 changed files with 7 additions and 4 deletions Side-by-side Diff

arch/s390/kernel/head31.S
Diff comments   View file @ 5beab99
... ... @@ -45,7 +45,7 @@
45 45 # virtual and never return ...
46 46 .align 8
47 47 .Lentry:.long 0x00080000,0x80000000 + _stext
48   -.Lctl: .long 0x04b50002 # cr0: various things
  48 +.Lctl: .long 0x04b50000 # cr0: various things
49 49 .long 0 # cr1: primary space segment table
50 50 .long .Lduct # cr2: dispatchable unit control table
51 51 .long 0 # cr3: instruction authorization
arch/s390/kernel/head64.S
Diff comments   View file @ 5beab99
... ... @@ -46,7 +46,7 @@
46 46 .align 16
47 47 .LPG1:
48 48 .Lentry:.quad 0x0000000180000000,_stext
49   -.Lctl: .quad 0x04350002 # cr0: various things
  49 +.Lctl: .quad 0x04350000 # cr0: various things
50 50 .quad 0 # cr1: primary space segment table
51 51 .quad .Lduct # cr2: dispatchable unit control table
52 52 .quad 0 # cr3: instruction authorization
... ... @@ -1988,12 +1988,13 @@
1988 1988 rc = -EPROTONOSUPPORT;
1989 1989 goto out;
1990 1990 }
  1991 + ctl_set_bit(0, 1);
1991 1992 rc = iucv_query_maxconn();
1992 1993 if (rc)
1993   - goto out;
  1994 + goto out_ctl;
1994 1995 rc = register_external_interrupt(0x4000, iucv_external_interrupt);
1995 1996 if (rc)
1996   - goto out;
  1997 + goto out_ctl;
1997 1998 iucv_root = root_device_register("iucv");
1998 1999 if (IS_ERR(iucv_root)) {
1999 2000 rc = PTR_ERR(iucv_root);
... ... @@ -2055,6 +2056,8 @@
2055 2056 root_device_unregister(iucv_root);
2056 2057 out_int:
2057 2058 unregister_external_interrupt(0x4000, iucv_external_interrupt);
  2059 +out_ctl:
  2060 + ctl_clear_bit(0, 1);
2058 2061 out:
2059 2062 return rc;
2060 2063 }