Eric Lee / smarc-fsl-linux-kernel

46
Download as
Browse Code »

Commit e67d668e147c3b4fec638c9e0ace04319f5ceccd

Authored by Mingarelli, Thomas
Committed by Wim Van Sebroeck
1 parent bb558dac67
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

watchdog: hpwdt: Changes to handle NX secure bit in 32bit path 

This patch makes use of the set_memory_x() kernel API in order
to make necessary BIOS calls to source NMIs.

This is needed for SLES11 SP2 and the latest upstream kernel as it appears
the NX Execute Disable has grown in its control.

Signed-off by: Thomas Mingarelli <thomas.mingarelli@hp.com>
Signed-off by: Wim Van Sebroeck <wim@iguana.be>
Cc: stable@kernel.org

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

drivers/watchdog/hpwdt.c
Diff comments   View file @ e67d668
... ... @@ -231,6 +231,7 @@
231 231  
232 232 cmn_regs.u1.reax = CRU_BIOS_SIGNATURE_VALUE;
233 233  
  234 + set_memory_x((unsigned long)bios32_entrypoint, (2 * PAGE_SIZE));
234 235 asminline_call(&cmn_regs, bios32_entrypoint);
235 236  
236 237 if (cmn_regs.u1.ral != 0) {
237 238  
... ... @@ -248,8 +249,10 @@
248 249 if ((physical_bios_base + physical_bios_offset)) {
249 250 cru_rom_addr =
250 251 ioremap(cru_physical_address, cru_length);
251   - if (cru_rom_addr)
  252 + if (cru_rom_addr) {
  253 + set_memory_x((unsigned long)cru_rom_addr, cru_length);
252 254 retval = 0;
  255 + }
253 256 }
254 257  
255 258 printk(KERN_DEBUG "hpwdt: CRU Base Address: 0x%lx\n",