Skip to contentSkip to conversation

firmware_class: make firmware caching configurable

PATCH Superseded Mark Salyzyn 3 participants 9 messages Nov 13, 2019 – Nov 14, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 firmware_class: make firmware caching configurable

Because firmware caching generates uevent messages that are sent over a netlink socket, it can prevent suspend on many platforms. It's also not always useful, so make it a configurable option.

Cc Tim Murray <[email protected]>
Cc Venkata Narendra Kumar Gutta <[email protected]>
---
 drivers/base/Kconfig                | 13 +++++++++++++
 drivers/base/firmware_loader/main.c |  6 +++---
 2 files changed, 16 insertions(+), 3 deletions(-)
drivers/base/Kconfig +13 -0
index 28b92e3cc570..36351c3a62b0 100644
@@ -89,6 +89,19 @@ config PREVENT_FIRMWARE_BUILD
 
 source "drivers/base/firmware_loader/Kconfig"
 
+config FW_CACHE
+	bool "Enable firmware caching during suspend"
+	depends on PM_SLEEP
+	default y
+	help
+	  Because firmware caching generates uevent messages that are sent
+	  over a netlink socket, it can prevent suspend on many platforms.
+	  It is also not always useful, so on such platforms we have the
+	  option.
+
+	  If unsure, say Y.
+
+
 config WANT_DEV_COREDUMP
 	bool
 	help
drivers/base/firmware_loader/main.c +3 -3
index bf44c79beae9..1c9f03514a47 100644
@@ -51,7 +51,7 @@ struct firmware_cache {
 	struct list_head head;
 	int state;
 
-#ifdef CONFIG_PM_SLEEP
+#ifdef CONFIG_FW_CACHE
 	/*
 	 * Names of firmware images which have been cached successfully
 	 * will be added into the below list so that device uncache
@@ -556,7 +556,7 @@ static void fw_set_page_data(struct fw_priv *fw_priv, struct firmware *fw)
 		 (unsigned int)fw_priv->size);
 }
 
-#ifdef CONFIG_PM_SLEEP
+#ifdef CONFIG_FW_CACHE
 static void fw_name_devm_release(struct device *dev, void *res)
 {
 	struct fw_name_devm *fwn = res;
@@ -1046,7 +1046,7 @@ request_firmware_nowait(
 }
 EXPORT_SYMBOL(request_firmware_nowait);
 
-#ifdef CONFIG_PM_SLEEP
+#ifdef CONFIG_FW_CACHE
 static ASYNC_DOMAIN_EXCLUSIVE(fw_cache_domain);
 
 /**
Signature · 1 line
2.24.0.rc1.363.gb1bccd3e3d-goog
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 7 lines · Mark Salyzyn

Because firmware caching generates uevent messages that are sent over a netlink socket, it can prevent suspend on many platforms. It's also not always useful, so make it a configurable option.

Cc Tim Murray <[email protected]>
Cc Venkata Narendra Kumar Gutta <[email protected]>

Looks good.

Luis

#2 lore raw
In reply to Mark Salyzyn
Quoted 24 lines · Mark Salyzyn

Because firmware caching generates uevent messages that are sent over a netlink socket, it can prevent suspend on many platforms. It's also not always useful, so make it a configurable option.

Cc Tim Murray <[email protected]>
Cc Venkata Narendra Kumar Gutta <[email protected]>
---
 drivers/base/Kconfig                | 13 +++++++++++++
 drivers/base/firmware_loader/main.c |  6 +++---
 2 files changed, 16 insertions(+), 3 deletions(-)
drivers/base/Kconfig +3 -0
index 28b92e3cc570..36351c3a62b0 100644
@@ -89,6 +89,19 @@ config PREVENT_FIRMWARE_BUILD
 
 source "drivers/base/firmware_loader/Kconfig"
 
+config FW_CACHE
+	bool "Enable firmware caching during suspend"
+	depends on PM_SLEEP

drivers/base/Kconfig config PREVENT_FIRMWARE_BUILD · line 104

Quoted 10 lines
drivers/base/Kconfig +10 -0
+	default y
+	help
+	  Because firmware caching generates uevent messages that are sent
+	  over a netlink socket, it can prevent suspend on many platforms.
+	  It is also not always useful, so on such platforms we have the
+	  option.
+
+	  If unsure, say Y.
+
+

Shouldn't this entry go into drivers/base/firmware_loader/Kconfig instead and depend on FW_LOADER by putting it in the correct location in that file?

Also, no need for two blank lines.

And finally, 'default y' is only a good idea if your machine can not boot without the option. I don't think that's the case here, correct?

thanks,

greg k-h

maintainer
#3 lore raw
Quoted 7 lines · Greg Kroah-Hartman

drivers/base/Kconfig config PREVENT_FIRMWARE_BUILD · line 95

Quoted 4 lines · Mark Salyzyn
drivers/base/Kconfig +4 -0
+config FW_CACHE
+	bool "Enable firmware caching during suspend"
+	depends on PM_SLEEP
+	default y

And finally, 'default y' is only a good idea if your machine can not boot without the option. I don't think that's the case here, correct?

default y if PM_SLEEP

Would try to enable this if PM_SLEEP was disabled. So the depends on will force this on for all systems by default if PM_SLEEP is enabled, which is what how this works today.

We enable this feature today by default if you have PM_SLEEP.

Luis

#4 lore raw
In reply to Greg Kroah-Hartman
Quoted 22 lines · Greg Kroah-Hartman
Quoted 21 lines · Mark Salyzyn

Because firmware caching generates uevent messages that are sent over a netlink socket, it can prevent suspend on many platforms. It's also not always useful, so make it a configurable option.

Cc Tim Murray <[email protected]>
Cc Venkata Narendra Kumar Gutta <[email protected]>
---
  drivers/base/Kconfig                | 13 +++++++++++++
  drivers/base/firmware_loader/main.c |  6 +++---
  2 files changed, 16 insertions(+), 3 deletions(-)
drivers/base/Kconfig +0 -0
index 28b92e3cc570..36351c3a62b0 100644
@@ -89,6 +89,19 @@ config PREVENT_FIRMWARE_BUILD
 
  source "drivers/base/firmware_loader/Kconfig"
 
Quoted 16 lines

drivers/base/Kconfig config PREVENT_FIRMWARE_BUILD · line 104

Quoted 13 lines
drivers/base/Kconfig +13 -0
+config FW_CACHE
+	bool "Enable firmware caching during suspend"
+	depends on PM_SLEEP
+	default y
+	help
+	  Because firmware caching generates uevent messages that are sent
+	  over a netlink socket, it can prevent suspend on many platforms.
+	  It is also not always useful, so on such platforms we have the
+	  option.
+
+	  If unsure, say Y.
+
+

Shouldn't this entry go into drivers/base/firmware_loader/Kconfig instead and depend on FW_LOADER by putting it in the correct location in that file?

Good point, respin on its way.

Quoted 2 lines

Also, no need for two blank lines.

<not sure how the double lines showed up, checkpatch,pl should look for this>

Quoted 7 lines

And finally, 'default y' is only a good idea if your machine can not boot without the option. I don't think that's the case here, correct?

thanks,

greg k-h

I am concerned about the change in user space behavior and to prevent defconfig churn.

#5 lore raw

PATCH v2 1/1 firmware_class: make firmware caching configurable

In reply to Mark Salyzyn

Because firmware caching generates uevent messages that are sent over a netlink socket, it can prevent suspend on many platforms. It's also not always useful, so make it a configurable option.

Cc Tim Murray <[email protected]>
Cc Venkata Narendra Kumar Gutta <[email protected]>
Cc Luis Chamberlain <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Rafael J. Wysocki <[email protected]>

---
v2
- move config from drivers/base/Kconfig to
drivers/base/firmware_loader/Kconfig
- drop blank line
- default yes conditional on PM_SLEEP

---
 drivers/base/firmware_loader/Kconfig | 12 ++++++++++++
 drivers/base/firmware_loader/main.c  |  6 +++---
 2 files changed, 15 insertions(+), 3 deletions(-)
drivers/base/firmware_loader/Kconfig +12 -0
index 3f9e274e2ed3..33e6552ddbb6 100644
@@ -169,5 +169,17 @@ config FW_LOADER_COMPRESS
 	  be compressed with either none or crc32 integrity check type (pass
 	  "-C crc32" option to xz command).
 
+config FW_CACHE
+	bool "Enable firmware caching during suspend"
+	depends on PM_SLEEP
+	default y if PM_SLEEP
+	help
+	  Because firmware caching generates uevent messages that are sent
+	  over a netlink socket, it can prevent suspend on many platforms.
+	  It is also not always useful, so on such platforms we have the
+	  option.
+
+	  If unsure, say Y.
+
 endif # FW_LOADER
 endmenu
drivers/base/firmware_loader/main.c +3 -3
index bf44c79beae9..1c9f03514a47 100644
@@ -51,7 +51,7 @@ struct firmware_cache {
 	struct list_head head;
 	int state;
 
-#ifdef CONFIG_PM_SLEEP
+#ifdef CONFIG_FW_CACHE
 	/*
 	 * Names of firmware images which have been cached successfully
 	 * will be added into the below list so that device uncache
@@ -556,7 +556,7 @@ static void fw_set_page_data(struct fw_priv *fw_priv, struct firmware *fw)
 		 (unsigned int)fw_priv->size);
 }
 
-#ifdef CONFIG_PM_SLEEP
+#ifdef CONFIG_FW_CACHE
 static void fw_name_devm_release(struct device *dev, void *res)
 {
 	struct fw_name_devm *fwn = res;
@@ -1046,7 +1046,7 @@ request_firmware_nowait(
 }
 EXPORT_SYMBOL(request_firmware_nowait);
 
-#ifdef CONFIG_PM_SLEEP
+#ifdef CONFIG_FW_CACHE
 static ASYNC_DOMAIN_EXCLUSIVE(fw_cache_domain);
 
 /**
Signature · 1 line
2.24.0.rc1.363.gb1bccd3e3d-goog
maintainer Acked-by on v2 1/1
#6 lore raw

drivers/base/firmware_loader/Kconfig config FW_LOADER_COMPRESS · line 175

Quoted 4 lines · Mark Salyzyn
drivers/base/firmware_loader/Kconfig +4 -0
+config FW_CACHE
+	bool "Enable firmware caching during suspend"
+	depends on PM_SLEEP
+	default y if PM_SLEEP

I think the default y would suffice given you have depends on PM_SLEEP, however this also works. So, again:

Luis

#7 lore raw
Quoted 11 lines · Luis Chamberlain

drivers/base/firmware_loader/Kconfig config FW_LOADER_COMPRESS · line 175

Quoted 4 lines · Mark Salyzyn
drivers/base/firmware_loader/Kconfig +4 -0
+config FW_CACHE
+	bool "Enable firmware caching during suspend"
+	depends on PM_SLEEP
+	default y if PM_SLEEP

I think the default y would suffice given you have depends on PM_SLEEP, however this also works. So, again:

Luis

Worried about setting FW_CACHE w/o PM_SLEEP, this enforces it.

--Mark

maintainer
#8 lore raw
Quoted 9 lines · Mark Salyzyn
Quoted 8 lines · Luis Chamberlain

drivers/base/firmware_loader/Kconfig config FW_LOADER_COMPRESS · line 175

Quoted 4 lines · Mark Salyzyn
drivers/base/firmware_loader/Kconfig +4 -0
+config FW_CACHE
+	bool "Enable firmware caching during suspend"
+	depends on PM_SLEEP
+	default y if PM_SLEEP

I think the default y would suffice given you have depends on PM_SLEEP, however this also works. So, again:

Quoted 5 lines
Quoted 3 lines

Luis

Worried about setting FW_CACHE w/o PM_SLEEP, this enforces it.

I understand, but its an impossibility to turn on FW_CACHE without PM_SLEEP since it depends on it. How would one do that?

However, since it makes no difference we can leave it.

Luis