From patchwork Thu Jan 7 23:34:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 358670 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable 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 CBCCCC4332D for ; Thu, 7 Jan 2021 23:35:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A2C66236F9 for ; Thu, 7 Jan 2021 23:35:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729250AbhAGXfa (ORCPT ); Thu, 7 Jan 2021 18:35:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57304 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729071AbhAGXf3 (ORCPT ); Thu, 7 Jan 2021 18:35:29 -0500 Received: from mail-il1-x12a.google.com (mail-il1-x12a.google.com [IPv6:2607:f8b0:4864:20::12a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C9E25C0612FE for ; Thu, 7 Jan 2021 15:34:10 -0800 (PST) Received: by mail-il1-x12a.google.com with SMTP id q1so8472648ilt.6 for ; Thu, 07 Jan 2021 15:34:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xiaTitkw4KzTKWeohNq2UnqJT3ZfYyxC40xKZK6Dfz8=; b=CVTYFTud1QL63XEsmChmsUfOdQmb3nvZYMrbDXMQ/mlq25YO9zpkE/7e3HSxXsfBCN dwiPNAXZwyLkQq2HuV7KsoQathgYnBYPe6l+UBuOQ9zL/GqM5+/0JXIfs9ZRt8DCnLtH J8ZPSiujp/86QMWQksJQQhTa+92moAUXS55Ui/QVkNH5+Lp8dRGzhEmUKM8clgspln67 1YLy9DJwwCBfUdkSwXCCBb4YGApVZ7KXauHAqTrwbHCRCjcovz3O8TshW2JD0VKxpLpG Nodc+RDcnItSz6qQ+oKHReSJHTeE0ZHF4UvxNCYh3phS2903Bqfbprq8CXBawwN9b0hl KAgg== 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:mime-version:content-transfer-encoding; bh=xiaTitkw4KzTKWeohNq2UnqJT3ZfYyxC40xKZK6Dfz8=; b=rWK/q4NUbgBvEu6agwkf4smYJujOgyphYC0plVwYqPiA5zfShS7HSS2IScWDMCAynW QL3l84fTf+Qi6L6pXzAPy4bR5I8pqEGy9ADQAsEFgZdSYwNsIrFs7uJp+nJvet/FU3qN C5dAO5W1PqHeHglRFUQL1lksRGtA9V0wJtSvr7jHVWvnEMiMI7j5ib65JldWqEO3zZQ4 d/g3NkFj1Q4NIAxEYL3Rq+JPks9+v/aR2K973O3kvdjM1WJIC0o8Rd7Gmbp4IEKuV8Lz EJh1nAP/c/n5gSZ0bTCUHVX81M1cLv6t1ylgdj6195YcCY21CZi6qNLiZ0wC5X0cnAB8 djaA== X-Gm-Message-State: AOAM532vCKWx2YDRcHQnqCszznmovzrb+gwMOSyqpD3zihN0ZEmpDM/N yRcugVRfCuINorvmuMkUI3v0xA== X-Google-Smtp-Source: ABdhPJxwf8C24X6AFWpLCk4TfPWDSqqQDj5m686UoGGcUyeMXiDxmCUmQLCrEnBx4fh63BSqTuO76g== X-Received: by 2002:a05:6e02:1605:: with SMTP id t5mr1223825ilu.232.1610062450195; Thu, 07 Jan 2021 15:34:10 -0800 (PST) Received: from beast.localdomain (c-73-185-129-58.hsd1.mn.comcast.net. [73.185.129.58]) by smtp.gmail.com with ESMTPSA id o195sm5648521ila.38.2021.01.07.15.34.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jan 2021 15:34:09 -0800 (PST) From: Alex Elder To: bjorn.andersson@linaro.org, agross@kernel.org Cc: davem@davemloft.net, kuba@kernel.org, ohad@wizery.com, evgreen@chromium.org, cpratapa@codeaurora.org, subashab@codeaurora.org, netdev@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 2/4] soc: qcom: mdt_loader: define stubs for COMPILE_TEST Date: Thu, 7 Jan 2021 17:34:02 -0600 Message-Id: <20210107233404.17030-3-elder@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210107233404.17030-1-elder@linaro.org> References: <20210107233404.17030-1-elder@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Define stub functions for the exposed MDT functions in case QCOM_MDT_LOADER is not configured. This allows users of these functions to link correctly for COMPILE_TEST builds without QCOM_SCM enabled. Reviewed-by: Bjorn Andersson Signed-off-by: Alex Elder --- include/linux/soc/qcom/mdt_loader.h | 35 +++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/include/linux/soc/qcom/mdt_loader.h b/include/linux/soc/qcom/mdt_loader.h index e600baec68253..afd47217996b0 100644 --- a/include/linux/soc/qcom/mdt_loader.h +++ b/include/linux/soc/qcom/mdt_loader.h @@ -11,6 +11,8 @@ struct device; struct firmware; +#if IS_ENABLED(CONFIG_QCOM_MDT_LOADER) + ssize_t qcom_mdt_get_size(const struct firmware *fw); int qcom_mdt_load(struct device *dev, const struct firmware *fw, const char *fw_name, int pas_id, void *mem_region, @@ -23,4 +25,37 @@ int qcom_mdt_load_no_init(struct device *dev, const struct firmware *fw, phys_addr_t *reloc_base); void *qcom_mdt_read_metadata(const struct firmware *fw, size_t *data_len); +#else /* !IS_ENABLED(CONFIG_QCOM_MDT_LOADER) */ + +static inline ssize_t qcom_mdt_get_size(const struct firmware *fw) +{ + return -ENODEV; +} + +static inline int qcom_mdt_load(struct device *dev, const struct firmware *fw, + const char *fw_name, int pas_id, + void *mem_region, phys_addr_t mem_phys, + size_t mem_size, phys_addr_t *reloc_base) +{ + return -ENODEV; +} + +static inline int qcom_mdt_load_no_init(struct device *dev, + const struct firmware *fw, + const char *fw_name, int pas_id, + void *mem_region, phys_addr_t mem_phys, + size_t mem_size, + phys_addr_t *reloc_base) +{ + return -ENODEV; +} + +static inline void *qcom_mdt_read_metadata(const struct firmware *fw, + size_t *data_len) +{ + return ERR_PTR(-ENODEV); +} + +#endif /* !IS_ENABLED(CONFIG_QCOM_MDT_LOADER) */ + #endif From patchwork Thu Jan 7 23:34:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 358309 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp56934jai; Thu, 7 Jan 2021 15:36:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJzQyrp29ODj2A+va8mdTkDABIRI2sW8AAcMR3AzVSvYD1/LuNYF4NP2+NE/boNm7iFBb2+O X-Received: by 2002:a17:906:4e52:: with SMTP id g18mr845868ejw.385.1610062572932; Thu, 07 Jan 2021 15:36:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1610062572; cv=none; d=google.com; s=arc-20160816; b=uACOXa3XwhTwImcoefgAA2Gp8g5Ft/jPYhw1aapqpJXZ1UD6N8kAaJKyRmfvJutKos SvQeKfCM+b72KtQ6ntl69U6RrJ7zgerGK9EzZFW+ThwA7qpWnzz5JIeTDfyswNlMEfSE LGx2U8gfXO5ba06JWfSvfWJ6Wf9PMPuGfFY3HlUNJ0IfnLMf3rQzuFHbyUL5N2K5ntNa idds17Tlnv2SJK07pPBPswGh95pqCPpxY7B/kcbhxSeABPotr0U4M5Dykcqh8YJcq/Vl ZVpPpxm6dVeMP4yGP71zWGcs+1GO0BzPInvAHVFKewQJoPktRFzJInjoMWqF/+dsBGo0 VETw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Jp4jA5VOpxCAdanHFN3bi6TajwKIp0Iz6erEpMOg0cE=; b=GmMz3iZmgBpz/F+IlbwYS5M9hQj8kHhGoBhB5VhdApT/FwOqPCLQ1f9AWly8r6B6hY 2LLx0DbiTJ+r32yS8MtEAn3Dct4UpexPZnoF1uB7qL6zrHNjYiUpI4PqRdXmafPEqPk1 3AvBKIX9nQMObp+n32hmUEVh4OWNRfR4lDMpY+oMLBw0dlYBcsb1uLPbKEWnab01ompw yCrd5AScR5e6YfRQ2yOr7K8HztnaTTGOGusQdSt2Dpm2jQze+7XJ2wIJeCbM7uVWozli EeGW/ryh5AAjPSzFpPy9tjdPPIrHTU2/5FtOrmLgeFRTvk4hMV5wLdxyXVVkOqG1pbT+ K/lA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=G7cxNq+G; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-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. [23.128.96.18]) by mx.google.com with ESMTP id s18si3149010ejd.607.2021.01.07.15.36.12; Thu, 07 Jan 2021 15:36:12 -0800 (PST) Received-SPF: pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=G7cxNq+G; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-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 S1729392AbhAGXfo (ORCPT + 7 others); Thu, 7 Jan 2021 18:35:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57300 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729352AbhAGXfo (ORCPT ); Thu, 7 Jan 2021 18:35:44 -0500 Received: from mail-il1-x135.google.com (mail-il1-x135.google.com [IPv6:2607:f8b0:4864:20::135]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2C679C0612A5 for ; Thu, 7 Jan 2021 15:34:13 -0800 (PST) Received: by mail-il1-x135.google.com with SMTP id q5so8443940ilc.10 for ; Thu, 07 Jan 2021 15:34:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Jp4jA5VOpxCAdanHFN3bi6TajwKIp0Iz6erEpMOg0cE=; b=G7cxNq+GNEp76ltapeUdfzfbwkmXQwvIBuF7CJ5zql10JvmpHwE9AA9/xxGXRqAWi3 9QkFg+MiWsOG/IoQqpkKsSn+Kfb+dyEFbpOuqV1MmnwoC1U2cdiLzZftDmx6e11ienxK vbJkvQ4qhHeEGHfEfXxWmahSmAVXPTcbw1cDHSkt4jrEo8jiht8U5JaBcgVQNEAUCWs7 f0+NwVlTdxO8uEfRDe5zRtVbY30d72Tz37ebFxkZvpKejibIrpKrwvsYkNRoD0fRRi2r EsLygg1b6i+tD1nNQ85Nw7yP9ssMOqIgNdg/cJ6xYa6T6ZrML2qsCdouizqpwsRMOLN5 xhbQ== 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:mime-version:content-transfer-encoding; bh=Jp4jA5VOpxCAdanHFN3bi6TajwKIp0Iz6erEpMOg0cE=; b=k0ziVUChEflkhdPfiHD4nzg8iDkWpKFpxnLxgnQ4Z7chQTbH7IhViUG03Zxb+LGfAv FymbuXlWkTMgQvk2YqJL+sORaCxTT+bncPgzRW+uXASxQqDtRG8JX0/bIHzd+jmLmVRt fMRgncsU80ZeAuCbSuUFaSzkVd3Pt4JRD6oq2AtShmhqecogdHPtuQiHR4USOsnmDv8+ r8DrNFtDXP4saLb9Pa3JRQx3T8N2FdYW82UXQz3p3o+DxU4z8mEuH24T97pmGxEABVHm 7IZC9KfeDAs+Rr5jd8UY2rEc4Q0IvYZSiHxQNJ3LE0UsmTyTq3vSAsontys2siWUOOhV f6dw== X-Gm-Message-State: AOAM530+t6NUuVDl6sFeGQuE9mic+1F65FlGB1XfAT8VGjC1I67AzErf BSIqDKjwQn4jM/t7AFUUog5Ziw== X-Received: by 2002:a92:9e1d:: with SMTP id q29mr1192638ili.289.1610062452573; Thu, 07 Jan 2021 15:34:12 -0800 (PST) Received: from beast.localdomain (c-73-185-129-58.hsd1.mn.comcast.net. [73.185.129.58]) by smtp.gmail.com with ESMTPSA id o195sm5648521ila.38.2021.01.07.15.34.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jan 2021 15:34:12 -0800 (PST) From: Alex Elder To: davem@davemloft.net, kuba@kernel.org Cc: bjorn.andersson@linaro.org, agross@kernel.org, ohad@wizery.com, evgreen@chromium.org, cpratapa@codeaurora.org, subashab@codeaurora.org, netdev@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 4/4] net: ipa: support COMPILE_TEST Date: Thu, 7 Jan 2021 17:34:04 -0600 Message-Id: <20210107233404.17030-5-elder@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210107233404.17030-1-elder@linaro.org> References: <20210107233404.17030-1-elder@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Arrange for the IPA driver to be built when COMPILE_TEST is enabled. Update the help text to reflect that we support two Qualcomm SoCs. Suggested-by: Jakub Kicinski Signed-off-by: Alex Elder --- drivers/net/ipa/Kconfig | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) -- 2.20.1 Reviewed-by: Bjorn Andersson diff --git a/drivers/net/ipa/Kconfig b/drivers/net/ipa/Kconfig index 9f0d2a93379c5..10a0e041ee775 100644 --- a/drivers/net/ipa/Kconfig +++ b/drivers/net/ipa/Kconfig @@ -1,9 +1,10 @@ config QCOM_IPA tristate "Qualcomm IPA support" - depends on ARCH_QCOM && 64BIT && NET - depends on QCOM_Q6V5_MSS + depends on 64BIT && NET + depends on ARCH_QCOM || COMPILE_TEST + depends on QCOM_RPROC_COMMON || (QCOM_RPROC_COMMON=n && COMPILE_TEST) + select QCOM_MDT_LOADER if ARCH_QCOM select QCOM_QMI_HELPERS - select QCOM_MDT_LOADER help Choose Y or M here to include support for the Qualcomm IP Accelerator (IPA), a hardware block present in some @@ -11,7 +12,8 @@ config QCOM_IPA that is capable of generic hardware handling of IP packets, including routing, filtering, and NAT. Currently the IPA driver supports only basic transport of network traffic - between the AP and modem, on the Qualcomm SDM845 SoC. + between the AP and modem, on the Qualcomm SDM845 and SC7180 + SoCs. Note that if selected, the selection type must match that of QCOM_Q6V5_COMMON (Y or M).