From patchwork Tue Jun 27 06:43:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 106386 Delivered-To: patch@linaro.org Received: by 10.140.101.48 with SMTP id t45csp874544qge; Mon, 26 Jun 2017 23:43:19 -0700 (PDT) X-Received: by 10.84.210.106 with SMTP id z97mr4227495plh.6.1498545798978; Mon, 26 Jun 2017 23:43:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498545798; cv=none; d=google.com; s=arc-20160816; b=CtPcdc72HjNoLG071ViDPbg1NFGecl+jzXWu0VuAm7/ldG3dkDa7UptiOgGCGt2Pwn XHvhHVUom1/pfMRXWFfb2bNKYBG4JFl3ucGgHTKXa1rHZiNLrITmC9cdheReSaTguoVl olbbjVtlnnTcPEN/MkavM1422B6INHBPtTFXVbcINMZXwSBNqfcl74jZUFi372iGH3LY XxnYf1pET+Qqshl75H/lMkVrIetfsog46yf2kHL5PFgYXynAe27nKfDqivrCvfepJkrW OsPvIIUePrjLJf1ZWdH2488XI4j/vdYkVEVEv+Nxkec2GSWMk3sFkf7E6s2//sU1LY7n xOqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=9ZG2RcWlY2weltNK5/MzOn+BSs1H+BwMuHTql4RJ5Rw=; b=YGB2wUehSz7SxKnnl3rGy45F1WRf6J19HyV+6P5ClkUSngNGIH0rCiEX0BcKCsYWjW MlGPziZwe3+0jdcrEE9sI9AKXjytuTvRoFmmS9H6sYl8OjyoQ5F3SMNkRDcIEpYZtuqF ZQU1eyzo1cO13OkJnEbykO999+k0XaZwJUqDXkJSf2swGsprauMPKV0x5J3aM635KICT pmz/dUnCsOnpkUABve3+3fHsOxj0BCot3/JUpqjqZ6lz3E2StKGwCIyuj6xhQAzGxfju eYqhQzhUdANjTEKCZdZss4WS7IzGMKF1aw3zBBEEsROj6i0qqVNXxT8emF+q/KNcSxBz 3tqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=LfPvpQ/t; spf=pass (google.com: best guess record for domain of linux-media-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-media-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f6si1605926pln.84.2017.06.26.23.43.18; Mon, 26 Jun 2017 23:43:18 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-media-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.b=LfPvpQ/t; spf=pass (google.com: best guess record for domain of linux-media-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-media-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751498AbdF0GnP (ORCPT + 4 others); Tue, 27 Jun 2017 02:43:15 -0400 Received: from mail-pg0-f48.google.com ([74.125.83.48]:32953 "EHLO mail-pg0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751510AbdF0GnO (ORCPT ); Tue, 27 Jun 2017 02:43:14 -0400 Received: by mail-pg0-f48.google.com with SMTP id f127so11199860pgc.0 for ; Mon, 26 Jun 2017 23:43:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=9ZG2RcWlY2weltNK5/MzOn+BSs1H+BwMuHTql4RJ5Rw=; b=LfPvpQ/tCnVg3vs2TddIahJcX4J33XpOmdROg0rp2C8at59UscrluRrng/RyTyhwO+ kiAokq1N/KojAfFRPv8ppj1m+rr2jrAXnUrLiqzl7wCWaqB2hfPS9axPUJvBV3lzINKq xDFnINFNeEvVviu++Gfj8NHUcy0ty8j6aLGcM= 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; bh=9ZG2RcWlY2weltNK5/MzOn+BSs1H+BwMuHTql4RJ5Rw=; b=fyV8Me1fhSTwhvasWvCi0e2s3lId9Ux5OcNMC9xXQaU2YDWwEwzbnIRoOCk4GCS01S qhQqWSwEmOtRLDoIua36pM6VxOl6j6UdNCH9UMfql7mu/HEQAwPJ/BVP7+JMa0urkrfc GKPJ9WKm25Q0WimQtgOOGfC54/SdUAnNh4KUE+s9m2Zn9SRZpwJO3PtRyiD7Hn+cT9vG nXm1p8DMktQV8dnGgzeuxfZllIdQgAntGfbCP3go5CzMhOYYIdQp9ALtPig3fZwMEA+x dbAaKZFQL//9SLPnDgYzdx3P0rCJTUyPf9cH+74TxbnTONKMcpxETyYR5L7S2hZJn8cV juRw== X-Gm-Message-State: AKS2vOzraD4xWU1qu3tgxvIhkCtIIimQ6BEOpBkhmlVO2Lz8cVdOB0pS 2OTJ2EoLWCRtGKWL X-Received: by 10.84.129.97 with SMTP id 88mr4219519plb.111.1498545793174; Mon, 26 Jun 2017 23:43:13 -0700 (PDT) Received: from localhost.localdomain (ip68-111-217-79.sd.sd.cox.net. [68.111.217.79]) by smtp.gmail.com with ESMTPSA id e189sm3648615pfe.100.2017.06.26.23.43.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Jun 2017 23:43:12 -0700 (PDT) From: Bjorn Andersson To: Ohad Ben-Cohen , Bjorn Andersson , Peter Griffin , Mauro Carvalho Chehab , Hugues Fruchet , Loic Pallardy Cc: Arnd Bergmann , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-remoteproc@vger.kernel.org Subject: [PATCH] rpmsg: Solve circular dependencies involving RPMSG_VIRTIO Date: Mon, 26 Jun 2017 23:43:09 -0700 Message-Id: <20170627064309.16507-1-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.12.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org While it's very common to use RPMSG for communicating with firmware running on these remoteprocs there is no functional dependency on RPMSG. As such RPMSG should be selected by the system integrator and not automatically by the remoteproc drivers. This does solve problems reported with circular Kconfig dependencies for Davinci and Keystone remoteproc drivers. Signed-off-by: Bjorn Andersson --- drivers/media/platform/Kconfig | 2 +- drivers/remoteproc/Kconfig | 4 ---- drivers/rpmsg/Kconfig | 20 +++++++++----------- 3 files changed, 10 insertions(+), 16 deletions(-) -- 2.12.0 diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 1313cd533436..cb2f31cd0088 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -382,10 +382,10 @@ config VIDEO_STI_DELTA_DRIVER tristate depends on VIDEO_STI_DELTA depends on VIDEO_STI_DELTA_MJPEG + depends on RPMSG default VIDEO_STI_DELTA_MJPEG select VIDEOBUF2_DMA_CONTIG select V4L2_MEM2MEM_DEV - select RPMSG endif # VIDEO_STI_DELTA diff --git a/drivers/remoteproc/Kconfig b/drivers/remoteproc/Kconfig index b950e6cd4ba2..3b16f422d30c 100644 --- a/drivers/remoteproc/Kconfig +++ b/drivers/remoteproc/Kconfig @@ -21,7 +21,6 @@ config OMAP_REMOTEPROC depends on REMOTEPROC select MAILBOX select OMAP2PLUS_MBOX - select RPMSG_VIRTIO help Say y here to support OMAP's remote processors (dual M3 and DSP on OMAP4) via the remote processor framework. @@ -53,7 +52,6 @@ config DA8XX_REMOTEPROC depends on ARCH_DAVINCI_DA8XX depends on REMOTEPROC depends on DMA_CMA - select RPMSG_VIRTIO help Say y here to support DA8xx/OMAP-L13x remote processors via the remote processor framework. @@ -76,7 +74,6 @@ config KEYSTONE_REMOTEPROC depends on ARCH_KEYSTONE depends on RESET_CONTROLLER depends on REMOTEPROC - select RPMSG_VIRTIO help Say Y here here to support Keystone remote processors (DSP) via the remote processor framework. @@ -133,7 +130,6 @@ config ST_REMOTEPROC depends on REMOTEPROC select MAILBOX select STI_MBOX - select RPMSG_VIRTIO help Say y here to support ST's adjunct processors via the remote processor framework. diff --git a/drivers/rpmsg/Kconfig b/drivers/rpmsg/Kconfig index 2a5d2b446de2..46f3f2431d68 100644 --- a/drivers/rpmsg/Kconfig +++ b/drivers/rpmsg/Kconfig @@ -1,8 +1,5 @@ -menu "Rpmsg drivers" - -# RPMSG always gets selected by whoever wants it -config RPMSG - tristate +menuconfig RPMSG + tristate "Rpmsg drivers" config RPMSG_CHAR tristate "RPMSG device interface" @@ -15,7 +12,7 @@ config RPMSG_CHAR config RPMSG_QCOM_GLINK_RPM tristate "Qualcomm RPM Glink driver" - select RPMSG + depends on RPMSG depends on HAS_IOMEM depends on MAILBOX help @@ -26,16 +23,17 @@ config RPMSG_QCOM_GLINK_RPM config RPMSG_QCOM_SMD tristate "Qualcomm Shared Memory Driver (SMD)" depends on QCOM_SMEM - select RPMSG + depends on RPMSG help Say y here to enable support for the Qualcomm Shared Memory Driver providing communication channels to remote processors in Qualcomm platforms. config RPMSG_VIRTIO - tristate - select RPMSG + tristate "Virtio remote processor messaging driver (RPMSG)" + depends on RPMSG select VIRTIO select VIRTUALIZATION - -endmenu + help + Say y here to enable support for the Virtio remote processor + messaging protocol (RPMSG).