From patchwork Mon Mar 16 22:51:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 189946 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D2F0CC0044D for ; Mon, 16 Mar 2020 22:51:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AA90C205ED for ; Mon, 16 Mar 2020 22:51:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="Kckx/+5T" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732845AbgCPWv3 (ORCPT ); Mon, 16 Mar 2020 18:51:29 -0400 Received: from mail-qt1-f174.google.com ([209.85.160.174]:38577 "EHLO mail-qt1-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732837AbgCPWv3 (ORCPT ); Mon, 16 Mar 2020 18:51:29 -0400 Received: by mail-qt1-f174.google.com with SMTP id e20so15846604qto.5 for ; Mon, 16 Mar 2020 15:51:28 -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=wZC7KqQ/+MEL0RDvWDxQg83WbFpNiASJj0i4ST9YezU=; b=Kckx/+5TKFM6oNsXeSsWaGuvP98pQxJb9gmnW77ZG1854D8UFfynC0jAggJwtrhjIF 9alhhG9kfxEQB+YNC40JYxo0vD/uSbjJPYBn3dWOpVSm7Fm7MHa2QxeWQqDgZoCbxq1v Mq1bg9Vqty9S+tTJnVkHE6ndbYTqoiGaKqmrmetM+FQyOYnjm612DFSChlCtm9z1f0dJ bioD/QXFU2jPo3+w520F4CsZnMwAxdi1BqcllQguHryhQeqlK9ZFkb4HF3/LnDnuccc1 47xOdxBbA4eD8ITBbgNUuFQeuonc70oQp8VFos7CbwrwWNB4S4gh/+n1DIBM8tZ3tuRl VQng== 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=wZC7KqQ/+MEL0RDvWDxQg83WbFpNiASJj0i4ST9YezU=; b=LA38BsAg4GcHHRf66APxs1FoALWPEOMyWvfp38hmCKB1CRFEdr8c1THoo4UHcmnqfz D3dmfrAQXbKrLQ0BRm7RY/M5iLzaKSy0Cm/xQFy3jex739vuP/J7ukf26j4N3ag410fs Ah5Mtbb15sZ4OvgsbK4KUTUQ/tbyfqjcm9SBU/mymlK8DmEePJssE0QFhMv1lEEWcjax xaeSE4xwWcuQTGzxB5Bsz/W9jnDKKxGlYl295GkW/QIs05UhiZi5PA1SWAjpNhqhZLlR xq3d4WwDfxjPygaJu15gKs+IJIDbXe90t1vnnkyCghdbIicSbn5CmNT+fcwPYuKKFl6z Ql9w== X-Gm-Message-State: ANhLgQ0bpt/w7OeQwsYaiAQi//EObK+jNPc4aRlhSfdb71vhOhZt+r8F prDAh2vq2hC2sHpFbcEm55d3UA== X-Google-Smtp-Source: ADFU+vtS5ehGLxCEUNEx01AjWQCPaIOivLegew1i/z6iCJOeLXOM4UVmIMp8KMFPiE9hAtmvjmcsOw== X-Received: by 2002:aed:37c3:: with SMTP id j61mr2627756qtb.284.1584399086746; Mon, 16 Mar 2020 15:51:26 -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 31sm838735qta.56.2020.03.16.15.51.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2020 15:51:25 -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 v2] remoteproc: clean up notification config Date: Mon, 16 Mar 2020 17:51:21 -0500 Message-Id: <20200316225121.29905-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 --- v2: - Fix subject line - Incorporate a change I thought I had already squashed 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 | 4 +--- 2 files changed, 2 insertions(+), 4 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 56084635dd63..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,9 +170,6 @@ config QCOM_Q6V5_WCSS config QCOM_Q6V5_IPA_NOTIFY tristate - depends on QCOM_IPA - depends on QCOM_Q6V5_MSS - default QCOM_IPA config QCOM_SYSMON tristate "Qualcomm sysmon driver"