Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp3759110rwb; Sat, 12 Nov 2022 12:12:33 -0800 (PST) X-Google-Smtp-Source: AA0mqf4RcohX1yEkXAapNdKsZsyMV5f1mQyY6dR9zD7rHnq9JB0Ydaw6fP88GuT3Q0V11OFkfMTD X-Received: by 2002:a17:90a:f0d4:b0:212:510b:5851 with SMTP id fa20-20020a17090af0d400b00212510b5851mr7372757pjb.57.1668283952889; Sat, 12 Nov 2022 12:12:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668283952; cv=none; d=google.com; s=arc-20160816; b=ANnHV+ptesC66iAU2EgghZuRG6I17c9Fcs0o0+U5G7NFcVIxFbxlZeA4taOdXO2iht VPCtbiwZWNZv2mxJ0SdPlamZbeG4pZGvd4W7OYDJWvdSN/gEgx2yDGGEf8ehawK+0G5u EJWbR43i9TewUXHXGE+DzrqWWD/ayKSCGmM/eq+ZaaKOvuWrFCE8+/5zWZmtpr788arq yfQF5jR112kWvAMROn44iimPKpoPOUJ2O+Yvw3TskDqeObl+hc0loCsU3LSW/pH5DDK5 x/ECddSgh38KekBg0OrW31jfu+jnkiJYke4NUimqgiMe7MpHPZ1UYNNyhnPsZWIcwpEI ycOw== 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=umpLk1dbP5jy5ZPV4Q21UM7cr1nZKFjsXDStFsdzpxA=; b=XIBLwnYm/RDHcrbyxwZq8pWygsDFRyEQbl1RJKco5RF7GcysMJCgkVFFxH6GWsJEB2 0oTeCqIdSKjusQS4BwM6HM+hsGlzQ+aNLBx/A4OJryTrA+2Qa3kwu2wEM3vtYBzL2TOU XjZKhUZeGbZiggHXvNrtc5MZNJe+G54owwPr/LBEEh2VPB47rpOtktZnaySj+6E2Y/DI 7V6vvQ79LaAlzMvP1slLIyHo2tLeO/EKav/URRXBg0Mk8CriIksTJMrH8+JDRleX4+ma C1DOQGW5y14NrPpx6sC/BJdv1fUy4e2QLUIbo3qS8WBGIs/UPUb+E3AJX0nB96fIOVzQ /L5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Ut/gqy52"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ob17-20020a17090b391100b00205ef38b646si6554495pjb.80.2022.11.12.12.12.21; Sat, 12 Nov 2022 12:12:32 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Ut/gqy52"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-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 S235120AbiKLUHy (ORCPT + 90 others); Sat, 12 Nov 2022 15:07:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35842 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235016AbiKLUHb (ORCPT ); Sat, 12 Nov 2022 15:07:31 -0500 Received: from mail-il1-x129.google.com (mail-il1-x129.google.com [IPv6:2607:f8b0:4864:20::129]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 801F1165B9 for ; Sat, 12 Nov 2022 12:07:30 -0800 (PST) Received: by mail-il1-x129.google.com with SMTP id m15so4030208ilq.2 for ; Sat, 12 Nov 2022 12:07:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=umpLk1dbP5jy5ZPV4Q21UM7cr1nZKFjsXDStFsdzpxA=; b=Ut/gqy52LOxFagWry8zJuDnyu69bte+omzwmYqNJjdvDmQX60UlPpo692bej4Zhl9C tiH32C6p562bFsgNQA8qY2bXfS9xVCJDURVWy9Axdoe4EDtoH3XEqI0TZ2T7qjHfcFJB PaY2LK/FfpGEuv0LrqIoWWh6tWDsbtR+x8kK1rs4TBR9zzW2uRrVBikuYPEPu/LI/3vX BRKu2HCJ9gP608jB7pEpv+zCebScrj1VyC87MTS0v8ueM5/5I6Ilt3hRJUlw1su3zUAf wkjT+etQqpiHzS1wCY+eYesaBbyEXYjEPwEMwYfygSVfg68S6NMNma9zaalqmkK3WA77 QdPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=umpLk1dbP5jy5ZPV4Q21UM7cr1nZKFjsXDStFsdzpxA=; b=CednvVMvaHvsMsd4F0ERgSt3MXP+YDx8borQm+1bVukfHT33RIVndxmLkfqK2cWXc3 JgCd0a7Ckvjf0ZzPZ6WyN1gZWoKLY3j83vlX74QJzNdm+NbZpkpyoOe5cUeDC8eBx9Yw XjEjB5cuyMkqRzzFmuJahm+CfOwOCLqNfCJc5oykkINiWIa21FVNTmf+d5bfI9nDYhzb Q+t7n3pYSDCMLk6KwStI2i9r3Vgni9EvV0sicmHvGEA2iQs1siIuDeN1uEdVB4YgwMv/ UZeuUqYcryhc9gZV/arQHG+zTh/aaw4PkHIeE6ABoBrpnOui0B41jy0Rz++5BayPSB91 38CQ== X-Gm-Message-State: ANoB5pm1+iSJSHzWUq1kuqEj9XrA26fYXNHiZVZ4H8sbPbc/UZOtJfYR D9ITsJaHyZTET/yqRDuV99pDdg== X-Received: by 2002:a92:da45:0:b0:302:568e:b493 with SMTP id p5-20020a92da45000000b00302568eb493mr210216ilq.183.1668283649429; Sat, 12 Nov 2022 12:07:29 -0800 (PST) Received: from presto.localdomain ([98.61.227.136]) by smtp.gmail.com with ESMTPSA id j28-20020a02cb1c000000b00363dee286edsm2036870jap.60.2022.11.12.12.07.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Nov 2022 12:07:28 -0800 (PST) From: Alex Elder To: robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: andersson@kernel.org, konrad.dybcio@linaro.org, agross@kernel.org, elder@kernel.org, linux-arm-msm@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 5/5] net: ipa: permit GSI firmware loading to be skipped Date: Sat, 12 Nov 2022 14:07:17 -0600 Message-Id: <20221112200717.1533622-6-elder@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221112200717.1533622-1-elder@linaro.org> References: <20221112200717.1533622-1-elder@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Define a new value "skip" for the "qcom,gsi-loader" Device Tree property. If used, it indicates that neither the AP nor the modem need to load GSI firmware (because it has already been loaded--for example by the boot loader). Signed-off-by: Alex Elder --- drivers/net/ipa/ipa_main.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/net/ipa/ipa_main.c b/drivers/net/ipa/ipa_main.c index 214e524dce795..8f20825675a1a 100644 --- a/drivers/net/ipa/ipa_main.c +++ b/drivers/net/ipa/ipa_main.c @@ -87,12 +87,14 @@ * @IPA_LOADER_DEFER: System not ready; try again later * @IPA_LOADER_SELF: AP loads GSI firmware * @IPA_LOADER_MODEM: Modem loads GSI firmware, signals when done + * @IPA_LOADER_SKIP: Neither AP nor modem need to load GSI firmware * @IPA_LOADER_INVALID: GSI firmware loader specification is invalid */ enum ipa_firmware_loader { IPA_LOADER_DEFER, IPA_LOADER_SELF, IPA_LOADER_MODEM, + IPA_LOADER_SKIP, IPA_LOADER_INVALID, }; @@ -740,6 +742,10 @@ static enum ipa_firmware_loader ipa_firmware_loader(struct device *dev) if (!strcmp(str, "modem")) return IPA_LOADER_MODEM; + /* No GSI firmware load is needed for "skip" */ + if (!strcmp(str, "skip")) + return IPA_LOADER_SKIP; + /* Any value other than "self" is an error */ if (strcmp(str, "self")) return IPA_LOADER_INVALID; @@ -872,10 +878,12 @@ static int ipa_probe(struct platform_device *pdev) if (loader == IPA_LOADER_MODEM) goto done; - /* The AP is loading GSI firmware; do so now */ - ret = ipa_firmware_load(dev); - if (ret) - goto err_deconfig; + if (loader == IPA_LOADER_SELF) { + /* The AP is loading GSI firmware; do so now */ + ret = ipa_firmware_load(dev); + if (ret) + goto err_deconfig; + } /* Otherwise loader == IPA_LOADER_SKIP */ /* GSI firmware is loaded; proceed to setup */ ret = ipa_setup(ipa); -- 2.34.1