From patchwork Fri Mar 20 23:35:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 1259268 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=ilX201NQ; 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 48kgCB4dhxz9sPk for ; Sat, 21 Mar 2020 10:36:22 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 69AAE2641D; Fri, 20 Mar 2020 23:36:20 +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 oRrk5ccC31FO; Fri, 20 Mar 2020 23:36:17 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id BA081263D6; Fri, 20 Mar 2020 23:36:17 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 824831BF9BD for ; Fri, 20 Mar 2020 23:36:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 7EEE48937E for ; Fri, 20 Mar 2020 23:36:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zq3cLXZxCy10 for ; Fri, 20 Mar 2020 23:36:14 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qt1-f177.google.com (mail-qt1-f177.google.com [209.85.160.177]) by hemlock.osuosl.org (Postfix) with ESMTPS id EBA1089379 for ; Fri, 20 Mar 2020 23:36:13 +0000 (UTC) Received: by mail-qt1-f177.google.com with SMTP id i3so2762976qtv.8 for ; Fri, 20 Mar 2020 16:36:13 -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=ilX201NQYXcx+oCwPaYgXIJcgP3DxDj5FnnSpQcs+pJqV8Oe0trknPwDy29umJd65d bS+Mb4iTG64c4wqmw/iSJ2QQ4wOuJCSElS7Qt8V/p9NeTJM7NGSZL6QRNhKylNpd+D+t co2k8aIe2tXTGCm6+r2DaiP2/1URVX7+f8TDqaq1ym+Q/KQZJbJvoxDfJ7cO8KSw4G9V /iqfsFYERJySKUTeMINntJxruFxfG9qseAAL2nofYUSp8alOC5rndceF0m2ZH+X0v09q LG7s4BsA4+VArTEBfOmRG38QA+LhckGDw9j7QuXP7fEf/Lvsyf+a32cEbmLlFO1qfxIV VoBg== 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=r8SEA9peSklkUXZzhHVNuLon/9xDhhPCtgjuz4dO9xTem6toM4kua36J5hv7ORO3L4 jICljGRyEK9GSstj6zQU2MvxegRweorBbS8m9aU9x6xOV5loh2bAFZCd8czrmRsCIlOo rTAiIWHT73I1swXcghqw7v6Krcy5aubBqW2FeVZv72UCOP9UjOMJHasUAfWC/rDN5AD6 6SEIa6/vFjaH9IS4cS2vm1QuYMPi78rdNlgr6SFULGg/kjHBIt/mOfGh+BgTpk4oSP06 vG6DG4x4psOGuxsvXS7U1ZNPBQMtAnAFxhSAVhPl2NWBcYgvtZaMDoBzXpNQv03YPtrS pBIw== X-Gm-Message-State: ANhLgQ0cLmGmE5vY28VGv9dTtogEsF+3p/pgAQZtpkCw6cEgS7sFPH58 t9cvCiC+nZCkw/TB6bBXT8y8GIjmOSw= X-Google-Smtp-Source: ADFU+vvP8Vh+mRMWPOFFZnpyYx/02GZRID9ZBjCULPGyRLvil2iOGWe5wbuGXQBPh+qSjXoq59yHyA== X-Received: by 2002:ac8:505a:: with SMTP id h26mr10741252qtm.84.1584747372672; Fri, 20 Mar 2020 16:36:12 -0700 (PDT) Received: from casantos.remote.com (177.204.229.175.dynamic.adsl.gvt.net.br. [177.204.229.175]) by smtp.gmail.com with ESMTPSA id p38sm6265257qtf.50.2020.03.20.16.36.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2020 16:36:12 -0700 (PDT) From: unixmania@gmail.com To: buildroot@buildroot.org Date: Fri, 20 Mar 2020 20:35:47 -0300 Message-Id: <20200320233547.28586-7-unixmania@gmail.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200320233547.28586-1-unixmania@gmail.com> References: <20200320233547.28586-1-unixmania@gmail.com> Subject: [Buildroot] [[PATCH RFC] 6/6] 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 , Lothar Felten , Adam Duskett 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