[PATCH driver-core 1/2] test_firmware: Install all scripts

[PATCH driver-core 1/2] test_firmware: Install all scripts

[Ben Hutchings]

List all the scripts invoked by fw_run_tests.sh, so that
"make TARGETS=firmware install" keeps working.

Fixes: 29a1c00ce1df8 ("test_firmware: add simple firmware firmware test ...")
Fixes: b3cf21fae1fe0 ("test_firmware: test three firmware kernel configs ...")
Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Acked-by: Luis R. Rodriguez <mcgrof@kernel.org>
---
 tools/testing/selftests/firmware/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/testing/selftests/firmware/Makefile b/tools/testing/selftests/firmware/Makefile
index 826f38d5dd19..261c81f08606 100644
--- a/tools/testing/selftests/firmware/Makefile
+++ b/tools/testing/selftests/firmware/Makefile
@@ -4,6 +4,7 @@
 all:
 
 TEST_PROGS := fw_run_tests.sh
+TEST_FILES := fw_fallback.sh fw_filesystem.sh fw_lib.sh
 
 include ../lib.mk
 
-- 
2.16.2

[PATCH driver-core 2/2] test_firmware: fix setting old custom fw path back on exit, second try

[Ben Hutchings]

Commit 65c79230576 tried to clear the custom firmware path on exit by
writing a single space to the firmware_class.path parameter.  This
doesn't work because nothing strips this space from the value stored
and fw_get_filesystem_firmware() only ignores zero-length paths.

Instead, write a null byte.

Fixes: 0a8adf58475 ("test: add firmware_class loader test")
Fixes: 65c79230576 ("test_firmware: fix setting old custom fw path back on exit")
Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Acked-by: Luis R. Rodriguez <mcgrof@kernel.org>
Cc: stable <stable@vger.kernel.org>
---
 tools/testing/selftests/firmware/fw_lib.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tools/testing/selftests/firmware/fw_lib.sh b/tools/testing/selftests/firmware/fw_lib.sh
index 9ea31b57d71a..962d7f4ac627 100755
--- a/tools/testing/selftests/firmware/fw_lib.sh
+++ b/tools/testing/selftests/firmware/fw_lib.sh
@@ -154,11 +154,13 @@ test_finish()
 	if [ "$HAS_FW_LOADER_USER_HELPER" = "yes" ]; then
 		echo "$OLD_TIMEOUT" >/sys/class/firmware/timeout
 	fi
-	if [ "$OLD_FWPATH" = "" ]; then
-		OLD_FWPATH=" "
-	fi
 	if [ "$TEST_REQS_FW_SET_CUSTOM_PATH" = "yes" ]; then
-		echo -n "$OLD_FWPATH" >/sys/module/firmware_class/parameters/path
+		if [ "$OLD_FWPATH" = "" ]; then
+			# A zero-length write won't work; write a null byte
+			printf '\000' >/sys/module/firmware_class/parameters/path
+		else
+			echo -n "$OLD_FWPATH" >/sys/module/firmware_class/parameters/path
+		fi
 	fi
 	if [ -f $FW ]; then
 		rm -f "$FW"
-- 
2.16.2

Re: [PATCH driver-core 1/2] test_firmware: Install all scripts

[Luis R. Rodriguez]

On Wed, Apr 04, 2018 at 10:37:13PM +0200, Ben Hutchings wrote:
> List all the scripts invoked by fw_run_tests.sh, so that
> "make TARGETS=firmware install" keeps working.
> 
> Fixes: 29a1c00ce1df8 ("test_firmware: add simple firmware firmware test ...")
> Fixes: b3cf21fae1fe0 ("test_firmware: test three firmware kernel configs ...")
> Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>

Acked-by: Luis R. Rodriguez <mcgrof@kernel.org>

  Luis

Re: [PATCH driver-core 2/2] test_firmware: fix setting old custom fw path back on exit, second try

[Luis R. Rodriguez]

On Wed, Apr 04, 2018 at 10:38:49PM +0200, Ben Hutchings wrote:
> Commit 65c79230576 tried to clear the custom firmware path on exit by
> writing a single space to the firmware_class.path parameter.  This
> doesn't work because nothing strips this space from the value stored
> and fw_get_filesystem_firmware() only ignores zero-length paths.
> 
> Instead, write a null byte.
> 
> Fixes: 0a8adf58475 ("test: add firmware_class loader test")
> Fixes: 65c79230576 ("test_firmware: fix setting old custom fw path back on exit")
> Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>

Acked-by: Luis R. Rodriguez <mcgrof@kernel.org>

Greg, let me know if you want to take these two in now, or if you want me to
queue them up on my own and then send you what I get in the queue later.

  Luis

Re: [PATCH driver-core 2/2] test_firmware: fix setting old custom fw path back on exit, second try

[Greg Kroah-Hartman]

On Wed, Apr 18, 2018 at 10:38:09PM +0200, Luis R. Rodriguez wrote:
> On Wed, Apr 04, 2018 at 10:38:49PM +0200, Ben Hutchings wrote:
> > Commit 65c79230576 tried to clear the custom firmware path on exit by
> > writing a single space to the firmware_class.path parameter.  This
> > doesn't work because nothing strips this space from the value stored
> > and fw_get_filesystem_firmware() only ignores zero-length paths.
> > 
> > Instead, write a null byte.
> > 
> > Fixes: 0a8adf58475 ("test: add firmware_class loader test")
> > Fixes: 65c79230576 ("test_firmware: fix setting old custom fw path back on exit")
> > Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
> 
> Acked-by: Luis R. Rodriguez <mcgrof@kernel.org>
> 
> Greg, let me know if you want to take these two in now, or if you want me to
> queue them up on my own and then send you what I get in the queue later.

I can take them now, thanks.

greg k-h