From patchwork Mon Mar 16 22:28:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 11441503 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D2CDA14E5 for ; Mon, 16 Mar 2020 22:29:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B1D75206E2 for ; Mon, 16 Mar 2020 22:29:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="xwT/Jf0k" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732749AbgCPW27 (ORCPT ); Mon, 16 Mar 2020 18:28:59 -0400 Received: from mail-qv1-f51.google.com ([209.85.219.51]:40263 "EHLO mail-qv1-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732739AbgCPW27 (ORCPT ); Mon, 16 Mar 2020 18:28:59 -0400 Received: by mail-qv1-f51.google.com with SMTP id cy12so3928382qvb.7 for ; Mon, 16 Mar 2020 15:28:58 -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:mime-version :content-transfer-encoding; bh=74WFqqU8UvNSiPHo/92yGfDiCTDjTz6Bkk/bwSwNsVk=; b=xwT/Jf0k9rLNKVBxgCugI7IPnT9ir8UWZBnqTSy6MkRviKmNrRijLPFwKkaUjprAkY 4AEZAReipahFck33hAag2JBi+4L1b4tChIuFY1Kb8SA9eXWDcPH8hpSOnFIF2k1hoflG pr/EHJysC47s3vrd+hvX0gEcP5UD+9ucwIdP29CJ99HvvWh3lxmUMcGZoweLKJ0aKqd/ tLa3q7pt6q8sM8SZg+2jr+ePJhz65Xm+CABUEV2+dnG8iB3flHSDvfjlO1Pwp3SYVKez ExlAq7sw4mxqEBYxm/PwGQnRYXrWD8R2or+Y4SaPB+rsxUF2LrBLG1MowBWMlvfG2bpU X1Eg== 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:mime-version :content-transfer-encoding; bh=74WFqqU8UvNSiPHo/92yGfDiCTDjTz6Bkk/bwSwNsVk=; b=KumTWYlDvUuAkqXTIHQGTCgyDMtfARO2roc5KLpeMxaSPTwTDNTsgjzGZ8ZYX5w1aE IGHEvq2GH72cvjP0iJWdexz7VWzsWI2o2zM6iumNODX2v2MH3WtNR+ePFySv/K2pa0By pjhpxbqBuLoFZXKxkv3wVagqvhpaJB8fwtDDHAfKn3vwSomYdMCIbj7VREIvpowN1kfp nzLXs06K3vogdErCkEKV51F4lwOwyLVs7vqbDsM4/PWkotZt0A0qHgyvGV4ZNek8wQs7 qugE12uXJv4hqNDc3dZxjdGgbriwLWWc/BBqxIBy/Wlckgibnuirj31Y8Z/W+NR0Tspd xbQg== X-Gm-Message-State: ANhLgQ0C10J9fqQhUds+Gtn8jTqt7vw1WQzLa192Vam2U2E/v0tMY7UK njd6IfDIK2FmagyJI9IVWq2d/g== X-Google-Smtp-Source: ADFU+vvG9KXCD/lBD8mOCSsdqdFWA3+XJ3l4bj66JvKUSZCGk3NDf9aluedyAAyPpw88ZfFq/TSzmw== X-Received: by 2002:a0c:e912:: with SMTP id a18mr2135938qvo.101.1584397737943; Mon, 16 Mar 2020 15:28:57 -0700 (PDT) Received: from localhost.localdomain (c-73-185-129-58.hsd1.mn.comcast.net. [73.185.129.58]) by smtp.gmail.com with ESMTPSA id y127sm715118qkb.76.2020.03.16.15.28.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2020 15:28:57 -0700 (PDT) From: Alex Elder To: "David S . Miller" Cc: Ohad Ben-Cohen , Bjorn Andersson , linux-remoteproc@vger.kernel.org, netdev@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] Subject: [PATCH] remoteproc: clean up notification config Date: Mon, 16 Mar 2020 17:28:53 -0500 Message-Id: <20200316222853.14744-1-elder@linaro.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Rearrange the config files for remoteproc and IPA to fix their interdependencies. First, have CONFIG_QCOM_Q6V5_MSS select QCOM_Q6V5_IPA_NOTIFY so the notification code is built regardless of whether IPA needs it. Next, represent QCOM_IPA as being dependent on QCOM_Q6V5_MSS rather than setting its value to match QCOM_Q6V5_COMMON (which is selected by QCOM_Q6V5_MSS). Drop all dependencies from QCOM_Q6V5_IPA_NOTIFY. The notification code will be built whenever QCOM_Q6V5_MSS is set, and it has no other dependencies. Signed-off-by: Alex Elder --- Dave, I noticed some problems with the interaction between the IPA and remoteproc configs, and after some discussion with Bjorn we came up with this, which simplifies things a bit. Both Kconfig files are in net-next now, so I'm sending this to you. Two other things: - I will *not* be implementing the COMPILE_TEST suggestion until after the next merge window. - I learned of another issue that arises when ARM64 is built with PAGE_SIZE > 4096. I intend to fix that in the next day or so. -Alex drivers/net/ipa/Kconfig | 2 +- drivers/remoteproc/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ipa/Kconfig b/drivers/net/ipa/Kconfig index b8cb7cadbf75..9f0d2a93379c 100644 --- a/drivers/net/ipa/Kconfig +++ b/drivers/net/ipa/Kconfig @@ -1,9 +1,9 @@ config QCOM_IPA tristate "Qualcomm IPA support" depends on ARCH_QCOM && 64BIT && NET + depends on QCOM_Q6V5_MSS select QCOM_QMI_HELPERS select QCOM_MDT_LOADER - default QCOM_Q6V5_COMMON help Choose Y or M here to include support for the Qualcomm IP Accelerator (IPA), a hardware block present in some diff --git a/drivers/remoteproc/Kconfig b/drivers/remoteproc/Kconfig index ba318289df64..ffdb5bc25d6d 100644 --- a/drivers/remoteproc/Kconfig +++ b/drivers/remoteproc/Kconfig @@ -128,6 +128,7 @@ config QCOM_Q6V5_MSS select MFD_SYSCON select QCOM_MDT_LOADER select QCOM_Q6V5_COMMON + select QCOM_Q6V5_IPA_NOTIFY select QCOM_RPROC_COMMON select QCOM_SCM help @@ -169,7 +170,6 @@ config QCOM_Q6V5_WCSS config QCOM_Q6V5_IPA_NOTIFY tristate - depends on QCOM_Q6V5_MSS && QCOM_IPA config QCOM_SYSMON tristate "Qualcomm sysmon driver"