Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit b6a9501658530d8b8374e37f1edb549039a8a260

Authored by Huang Ying
Committed by Len Brown
1 parent 86cd47334b
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

ACPI, APEI, GHES, Support disable GHES at boot time 

Some machine may have broken firmware so that GHES and firmware first
mode should be disabled.  This patch adds support to that.

Signed-off-by: Huang Ying <ying.huang@intel.com>
Reviewed-by: Andi Kleen <ak@linux.intel.com>
Reviewed-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Len Brown <len.brown@intel.com>

Showing 3 changed files with 18 additions and 8 deletions Side-by-side Diff

drivers/acpi/apei/ghes.c
Diff comments   View file @ b6a9501
... ... @@ -77,6 +77,9 @@
77 77 };
78 78 };
79 79  
  80 +int ghes_disable;
  81 +module_param_named(disable, ghes_disable, bool, 0);
  82 +
80 83 static int ghes_panic_timeout __read_mostly = 30;
81 84  
82 85 /*
... ... @@ -662,6 +665,11 @@
662 665  
663 666 if (hest_disable) {
664 667 pr_info(GHES_PFX "HEST is not enabled!\n");
  668 + return -EINVAL;
  669 + }
  670 +
  671 + if (ghes_disable) {
  672 + pr_info(GHES_PFX "GHES is not enabled!\n");
665 673 return -EINVAL;
666 674 }
667 675  
drivers/acpi/apei/hest.c
Diff comments   View file @ b6a9501
... ... @@ -231,16 +231,17 @@
231 231 goto err;
232 232 }
233 233  
234   - rc = apei_hest_parse(hest_parse_ghes_count, &ghes_count);
235   - if (rc)
236   - goto err;
237   -
238   - rc = hest_ghes_dev_register(ghes_count);
239   - if (!rc) {
240   - pr_info(HEST_PFX "Table parsing has been initialized.\n");
241   - return;
  234 + if (!ghes_disable) {
  235 + rc = apei_hest_parse(hest_parse_ghes_count, &ghes_count);
  236 + if (rc)
  237 + goto err;
  238 + rc = hest_ghes_dev_register(ghes_count);
  239 + if (rc)
  240 + goto err;
242 241 }
243 242  
  243 + pr_info(HEST_PFX "Table parsing has been initialized.\n");
  244 + return;
244 245 err:
245 246 hest_disable = 1;
246 247 }
... ... @@ -18,6 +18,7 @@
18 18  
19 19 extern int hest_disable;
20 20 extern int erst_disable;
  21 +extern int ghes_disable;
21 22  
22 23 #ifdef CONFIG_ACPI_APEI
23 24 void __init acpi_hest_init(void);