From patchwork Sat Apr 18 22:14:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 1272742 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=eY11W0nf; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 494S1V6hK4z9sP7 for ; Sun, 19 Apr 2020 08:14:38 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 02DC020385; Sat, 18 Apr 2020 22:14:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KN3osLiZYJIn; Sat, 18 Apr 2020 22:14:35 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id E6D5020108; Sat, 18 Apr 2020 22:14:34 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 9FD4D1BF577 for ; Sat, 18 Apr 2020 22:14:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 906BB20108 for ; Sat, 18 Apr 2020 22:14:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NOnmqPLvOb68 for ; Sat, 18 Apr 2020 22:14:31 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qv1-f54.google.com (mail-qv1-f54.google.com [209.85.219.54]) by silver.osuosl.org (Postfix) with ESMTPS id 97DB220035 for ; Sat, 18 Apr 2020 22:14:31 +0000 (UTC) Received: by mail-qv1-f54.google.com with SMTP id v18so2834270qvx.9 for ; Sat, 18 Apr 2020 15:14:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=N17tKKsG7TiaBXeMsShfaD90PNb1zOZNceefkeBbecY=; b=eY11W0nf6LoKNHsDJp3Poz8obj6l1b6VH6v1usOejfHoy3XlqFaLopNnE4VRkyy7AF xq38azYNni2TfY6otaM2LbjqEmoGHLec/NVnv8GLdfSSzv5k16fNsYTUmuklVWKKa52o 0NDD1C57vX3aijjvriADB6U6R7/kxcmRFFXc2vteCxgclztCHn5OA1IVMBx0UfvhB3u8 VvOo2B3WiddQYKo+mNnvRVMY2oy3rqa5mS52kAomER8DwLH1q7dfvy70V4JPbaZZvdxD UpGizCyCY8662Qg62IpNRUrXoFR1l9JeA6UiPCSfdQLorEG6p6uvk7Hn5VWsMW7QPbOe 1JJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=N17tKKsG7TiaBXeMsShfaD90PNb1zOZNceefkeBbecY=; b=scBulYZxYyxlaiX4Guym3yf+XfbznI8+YDffwdZl91f2cvsWCA4JhqRhLV9jW0mS7s WQyUmsrU2cJ7MFlEJTdwjEWZozimGP5PzaglETXQCQIJZPoTkdoeLiR6kCqbJ89faU6H kMTWjPb3ZmrYRakc39W0mbJ2pvjTykyEbVWf7YAVwmNFfs7sEhiHHOc2BVQ/Xm/FWY5w XDvt6Wj4Sak1k83xES1e3CrSUOE8Gbwu8J9OV1L+AylkN0Zg8GldQXrF7lJwlg+iI8bm OkZLGbZRRi2XvXRPbdwGZxtn7dpAcmwnhNEEef5hjfPTvPcKKHgfHQVWv1lr3rM5QTrv L3eA== X-Gm-Message-State: AGi0Pub5l5C9YYYI6TffJ4MKSFXQqzhqgsyovZMswEPjOtFxzJyEewep Ius/QOWeoGH2oHxdCQ1AOxPd6YqzsRw= X-Google-Smtp-Source: APiQypIeyojUZrMoN0q5+zXd1XoS8ArHRS2ubIH5rbe0A5h8wmrGCH0aWq008ARCWKheJ1Oz//FAAg== X-Received: by 2002:a0c:9b89:: with SMTP id o9mr8550939qve.131.1587248070315; Sat, 18 Apr 2020 15:14:30 -0700 (PDT) Received: from casantos.remote.csb.com (189.27.141.225.dynamic.adsl.gvt.net.br. [189.27.141.225]) by smtp.gmail.com with ESMTPSA id h3sm5335252qkf.15.2020.04.18.15.14.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Apr 2020 15:14:29 -0700 (PDT) From: unixmania@gmail.com To: buildroot@buildroot.org Date: Sat, 18 Apr 2020 19:14:11 -0300 Message-Id: <20200418221411.1549783-6-unixmania@gmail.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200418221411.1549783-1-unixmania@gmail.com> References: <20200418221411.1549783-1-unixmania@gmail.com> Subject: [Buildroot] [PATCH v2 5/5] package/ti-sgx-km: use modules-load to load the kernel module X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Carlos Santos , Adam Duskett , Lothar Felten MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Carlos Santos This is compatible with BusyBox/sysvinit (via S02modules-load), OpenRC and systemd. It also prevents trying to load the module each time the init script is executed. Remove the insmod command from the ti-sgx-um init script. Signed-off-by: Carlos Santos --- Tested on a BeagleBone Black card using beaglebone_qt5_defconfig. --- package/ti-sgx-km/ti-sgx-km.mk | 10 ++++++++++ package/ti-sgx-um/S80ti-sgx | 19 ++----------------- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/package/ti-sgx-km/ti-sgx-km.mk b/package/ti-sgx-km/ti-sgx-km.mk index ae294c300a..7f627f276b 100644 --- a/package/ti-sgx-km/ti-sgx-km.mk +++ b/package/ti-sgx-km/ti-sgx-km.mk @@ -33,4 +33,14 @@ define TI_SGX_KM_INSTALL_TARGET_CMDS kbuild_install -C $(@D)/$(TI_SGX_KM_SUBDIR) endef +define TI_SGX_KM_GEN_MODULES_CONF + $(INSTALL) -d -m 755 $(TARGET_DIR)/etc/modules-load.d + { \ + find $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/extra -name 'pvrsrvkm.ko*'; \ + } 2> /dev/null | { \ + sed 's:^.*/::; s:\.ko[^ ]*::'; \ + } > $(TARGET_DIR)/etc/modules-load.d/50-ti-sgx-km.conf +endef +TI_SGX_KM_TARGET_FINALIZE_HOOKS += TI_SGX_KM_GEN_MODULES_CONF + $(eval $(generic-package)) diff --git a/package/ti-sgx-um/S80ti-sgx b/package/ti-sgx-um/S80ti-sgx index 2630a0576a..0f183b6fc5 100644 --- a/package/ti-sgx-um/S80ti-sgx +++ b/package/ti-sgx-um/S80ti-sgx @@ -1,24 +1,9 @@ #!/bin/sh -pvrsrvkm_ko="/lib/modules/$(/bin/uname -r)/extra/pvrsrvkm.ko" - -pvr_loaded() { - /sbin/lsmod | /bin/grep -q '^\' -} - -pvr_load() { - /sbin/insmod "$pvrsrvkm_ko" > /dev/null 2>&1 -} - start() { - printf 'Loading pvrsrvkm module: ' - pvr_loaded || pvr_load + printf 'Starting PowerVR services: ' + /usr/bin/pvrsrvctl --start --no-module > /dev/null 2>&1 status=$? - if [ "$status" -eq 0 ]; then - printf 'Starting PowerVR services: ' - /usr/bin/pvrsrvctl --start --no-module > /dev/null 2>&1 - status=$? - fi if [ "$status" -eq 0 ]; then echo "OK" else