Merge "firmware_class: make firmware caching configurable"
This commit is contained in:
commit
40484060af
2 changed files with 8 additions and 3 deletions
|
@ -90,6 +90,11 @@ config PREVENT_FIRMWARE_BUILD
|
||||||
|
|
||||||
source "drivers/base/firmware_loader/Kconfig"
|
source "drivers/base/firmware_loader/Kconfig"
|
||||||
|
|
||||||
|
config FW_CACHE
|
||||||
|
bool "Enable firmware caching during suspend"
|
||||||
|
depends on PM_SLEEP
|
||||||
|
default n
|
||||||
|
|
||||||
config WANT_DEV_COREDUMP
|
config WANT_DEV_COREDUMP
|
||||||
bool
|
bool
|
||||||
help
|
help
|
||||||
|
|
|
@ -50,7 +50,7 @@ struct firmware_cache {
|
||||||
struct list_head head;
|
struct list_head head;
|
||||||
int state;
|
int state;
|
||||||
|
|
||||||
#ifdef CONFIG_PM_SLEEP
|
#ifdef CONFIG_FW_CACHE
|
||||||
/*
|
/*
|
||||||
* Names of firmware images which have been cached successfully
|
* Names of firmware images which have been cached successfully
|
||||||
* will be added into the below list so that device uncache
|
* will be added into the below list so that device uncache
|
||||||
|
@ -377,7 +377,7 @@ static void fw_set_page_data(struct fw_priv *fw_priv, struct firmware *fw)
|
||||||
(unsigned int)fw_priv->size);
|
(unsigned int)fw_priv->size);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_PM_SLEEP
|
#ifdef CONFIG_FW_CACHE
|
||||||
static void fw_name_devm_release(struct device *dev, void *res)
|
static void fw_name_devm_release(struct device *dev, void *res)
|
||||||
{
|
{
|
||||||
struct fw_name_devm *fwn = res;
|
struct fw_name_devm *fwn = res;
|
||||||
|
@ -861,7 +861,7 @@ request_firmware_nowait(
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(request_firmware_nowait);
|
EXPORT_SYMBOL(request_firmware_nowait);
|
||||||
|
|
||||||
#ifdef CONFIG_PM_SLEEP
|
#ifdef CONFIG_FW_CACHE
|
||||||
static ASYNC_DOMAIN_EXCLUSIVE(fw_cache_domain);
|
static ASYNC_DOMAIN_EXCLUSIVE(fw_cache_domain);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in a new issue