From dcdb57fd23ef6a6049d6a6b107db962b56876b0a Mon Sep 17 00:00:00 2001 From: Corentin LABBE Date: Tue, 17 Dec 2019 13:54:46 +0100 Subject: SPEC-3064: handle removal of can_bcm The test removing can module fail on DRA7 due to can_bcm using it. This patchs handle this case. Bug-AGL: SPEC-3064 Change-Id: I272e0ea62786fb43c4ea68601f2fb12864a279b6 Signed-off-by: Corentin LABBE --- common/scripts/test_can_modules.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/common/scripts/test_can_modules.sh b/common/scripts/test_can_modules.sh index 1a46034..bf8ee37 100755 --- a/common/scripts/test_can_modules.sh +++ b/common/scripts/test_can_modules.sh @@ -1,6 +1,7 @@ #!/bin/sh RCAR_CAN=0 +CAN_BCM=1 if [ ! -e /sys/class/net/can1 ];then lava-test-case show_can_modules --result skip @@ -44,6 +45,13 @@ modprobe_module() { remove_module can_raw +# handle "rmmod: ERROR: Module can is in use by: can_bcm" +lsmod | grep -q can_bcm +if [ $? -eq 0 ];then + CAN_BCM=1 + remove_module can_bcm +fi + remove_module can remove_module c_can_platform @@ -84,6 +92,10 @@ if [ $RCAR_CAN -eq 1 ];then modprobe_module rcar_can fi +if [ $CAN_BCM -eq 1 ];then + modprobe_module can_bcm +fi + #Make sure always that the can interface is down before #starting the config step. ip link set can0 down -- cgit 1.2.3-korg