Commit f416fe07 authored by Stuart Hayes's avatar Stuart Hayes Committed by Greg Kroah-Hartman

firmware: dell_rbu: Make payload memory uncachable

[ Upstream commit 6aecee6a ]

The dell_rbu driver takes firmware update payloads and puts them in memory so
the system BIOS can find them after a reboot.  This sometimes fails (though
rarely), because the memory containing the payload is in the CPU cache but
never gets written back to main memory before the system is rebooted (CPU
cache contents are lost on reboot).

With this patch, the payload memory will be changed to uncachable to ensure
that the payload is actually in main memory before the system is rebooted.
Signed-off-by: default avatarStuart Hayes <stuart.w.hayes@gmail.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 5d3675e3
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
#include <linux/firmware.h> #include <linux/firmware.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <asm/set_memory.h>
MODULE_AUTHOR("Abhay Salunke <abhay_salunke@dell.com>"); MODULE_AUTHOR("Abhay Salunke <abhay_salunke@dell.com>");
MODULE_DESCRIPTION("Driver for updating BIOS image on DELL systems"); MODULE_DESCRIPTION("Driver for updating BIOS image on DELL systems");
...@@ -181,6 +182,11 @@ static int create_packet(void *data, size_t length) ...@@ -181,6 +182,11 @@ static int create_packet(void *data, size_t length)
packet_data_temp_buf = NULL; packet_data_temp_buf = NULL;
} }
} }
/*
* set to uncachable or it may never get written back before reboot
*/
set_memory_uc((unsigned long)packet_data_temp_buf, 1 << ordernum);
spin_lock(&rbu_data.lock); spin_lock(&rbu_data.lock);
newpacket->data = packet_data_temp_buf; newpacket->data = packet_data_temp_buf;
...@@ -349,6 +355,8 @@ static void packet_empty_list(void) ...@@ -349,6 +355,8 @@ static void packet_empty_list(void)
* to make sure there are no stale RBU packets left in memory * to make sure there are no stale RBU packets left in memory
*/ */
memset(newpacket->data, 0, rbu_data.packetsize); memset(newpacket->data, 0, rbu_data.packetsize);
set_memory_wb((unsigned long)newpacket->data,
1 << newpacket->ordernum);
free_pages((unsigned long) newpacket->data, free_pages((unsigned long) newpacket->data,
newpacket->ordernum); newpacket->ordernum);
kfree(newpacket); kfree(newpacket);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment