From patchwork Tue Nov 15 11:31:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 20325 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2665630wru; Tue, 15 Nov 2022 03:36:52 -0800 (PST) X-Google-Smtp-Source: AA0mqf4kz4QKe0DrctAo/LGSPuNA2ArF2zpGEY0XLsYtOEFk8WAYkTgLp1pjuEg0z8psfby9B3Ot X-Received: by 2002:a63:165f:0:b0:439:ac9b:37a6 with SMTP id 31-20020a63165f000000b00439ac9b37a6mr15969920pgw.591.1668512212204; Tue, 15 Nov 2022 03:36:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668512212; cv=none; d=google.com; s=arc-20160816; b=FD/53dcz6QyzO8wXHCNYNb71U6absDEgfrqMlLJ8Mka9BxKtA8WTq54qPB8xcmSSPW O0fOD9TAsbEaV7mtjvDQwqZ9XCLpivosJDpzAm38iEhdV12341iLxUyOYB7qso6D5DyT 4imdiXm5jvtzYFFhMKeZ+5lc2+cUAtR9GIWlQbHXHjS8q2DDIrzkC4X/SkC+D4Sc7XyX OGogE1m6pc+dT3J3x1gjJsKAo0WHfcJYpiCbUGauz88AsZuizjHyo8etEGl5ntdJeutr IbqMlwxBYu1sTeoIFjoBKy+VwasT5Ui9c9wUyqhqGbRUZzxL5qC5pE1kdFwMHF87BGz/ PQ8Q== 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=//f8EyB8LSqoVSjEW+GVHDxH1+750hjBFR+YGqa4pV0=; b=kMfx1W5K/1SnyLgPDf6L57Uv7K6xvgYyfyaoNhykC0jdy+bpu0sxOY/8kI54G07Lf9 mZRS9aWCbHxloIV91WtwQFndHLiFKnCsiM3AMttaOE92ev9kkDr6yx/aZ9FV6LloDpix LVYYIIATebdefMRjH+MqzW0eVKzqGUDe8iiz/WaguAzF1/hNFbzvdP+wgb5EINQPDMo4 xCTvZ3jZvGO68hBAJnPcTd96xbZs4dKPM2xQwNKMhJOOYGuFvfPxkV7lqGkxzAnU127Z XtrbUIlBCKTqiq/wp24Riu46N+O1YpE609a5McccuZU547uZeZyv4AF94CnYqLiTEhTm LaPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jOQPJlYP; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id il7-20020a17090b164700b00213d512f07csi13277327pjb.182.2022.11.15.03.36.38; Tue, 15 Nov 2022 03:36:52 -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=jOQPJlYP; 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 S237662AbiKOLbh (ORCPT + 99 others); Tue, 15 Nov 2022 06:31:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36856 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232249AbiKOLb2 (ORCPT ); Tue, 15 Nov 2022 06:31:28 -0500 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C8AE9193E6 for ; Tue, 15 Nov 2022 03:31:26 -0800 (PST) Received: by mail-wr1-x435.google.com with SMTP id a14so23752939wru.5 for ; Tue, 15 Nov 2022 03:31:26 -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=//f8EyB8LSqoVSjEW+GVHDxH1+750hjBFR+YGqa4pV0=; b=jOQPJlYPnNW9IUDitc6PpH0x42P8nRMNN76WIopGX4H6ZdAX2i+7ToPcxs9pg5AQgd Iyv6vdhXzotGfB9gbnJyJZfzsGK7SeVOYj4k8v0xcH2bMDB463fnj0fGgaEvACF4RjEz tzF6R0iDGH8rgg3wvI0Z6mQx+GUrCsFcQOuYcqKeyTOp4YQmOkQIcbq9gdTkxu6EOrL5 G7D1JfR7dPPJWVegWKyRXag0Rc85AQPcftM8S+pLyqQyJHzKZVT0ehD7CprlRBUCFQCO 99akSAAUFhhXELzvfLqyG+itTD6SukYvFdS+OVPE2R/Ox29nLjMr63abXVx8mUpeodhJ yijg== 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=//f8EyB8LSqoVSjEW+GVHDxH1+750hjBFR+YGqa4pV0=; b=TBh8Ma3/gTGObqJpVKi9fe3q8EafPuU+KGd0CtjeOpxTkNni1bq9gL5z0E9gsq6MXL yKC7iEmePcxGa/2eCzfUxTwSgaEorb1qs9gFgJfkvJewKk3WIAmcRvI7ANGE8Tk20Xlk fmkSfhhZuH7jsd9gi+07Qb9YV3DrL0ykKgyEwAs0chQZyQfseyfhR9MIuOEHnE1OYFJF ahhoeakXdFjf1z2rxA70MtyVIBcMR3+mP8MIMSBqKLZj6wuAwAl9W4DmNicp/uQEzEnG qCQvRwZqsg1gNAYGed/oi+VDzxAzh9KNvjT00nk3oTp3L9iszBPKxyH5uCwQQvLOP3xm 6yRQ== X-Gm-Message-State: ANoB5pnEfaZmfr4GlhjZadIB/C3rW0IMvfu1QZ6m2b6K2cmQZvKFaXxp gcj3IpfDvLVlhZZ3EYcGJiKSvg== X-Received: by 2002:adf:fac3:0:b0:22e:244d:687a with SMTP id a3-20020adffac3000000b0022e244d687amr10329018wrs.82.1668511885176; Tue, 15 Nov 2022 03:31:25 -0800 (PST) Received: from zoltan.localdomain ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id r18-20020adfe692000000b00238df11940fsm12273091wrm.16.2022.11.15.03.31.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Nov 2022 03:31:24 -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 v2 1/5] dt-bindings: net: qcom,ipa: deprecate modem-init Date: Tue, 15 Nov 2022 05:31:15 -0600 Message-Id: <20221115113119.249893-2-elder@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221115113119.249893-1-elder@linaro.org> References: <20221115113119.249893-1-elder@linaro.org> MIME-Version: 1.0 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749561861545980179?= X-GMAIL-MSGID: =?utf-8?q?1749561861545980179?= GSI firmware for IPA must be loaded during initialization, either by the AP or by the modem. The loader is currently specified based on whether the Boolean modem-init property is present. Instead, use a new property with an enumerated value to indicate explicitly how GSI firmware gets loaded. With this in place, a third approach can be added in an upcoming patch. The new qcom,gsi-loader property has two defined values: - self: The AP loads GSI firmware - modem: The modem loads GSI firmware The modem-init property must still be supported, but is now marked deprecated. Update the example so it represents the SC7180 SoC, and provide examples for the qcom,gsi-loader, memory-region, and firmware-name properties. Signed-off-by: Alex Elder Reviewed-by: Krzysztof Kozlowski --- v2: Updated description, switched example completely to SC7180. .../devicetree/bindings/net/qcom,ipa.yaml | 76 ++++++++++++++----- 1 file changed, 55 insertions(+), 21 deletions(-) diff --git a/Documentation/devicetree/bindings/net/qcom,ipa.yaml b/Documentation/devicetree/bindings/net/qcom,ipa.yaml index e752b76192df0..d0f34763b9383 100644 --- a/Documentation/devicetree/bindings/net/qcom,ipa.yaml +++ b/Documentation/devicetree/bindings/net/qcom,ipa.yaml @@ -124,19 +124,29 @@ properties: - const: ipa-clock-enabled-valid - const: ipa-clock-enabled + qcom,gsi-loader: + enum: + - self + - modem + description: + Indicates how GSI firmware should be loaded. If the AP loads + and validates GSI firmware, this property has value "self". + If the modem does this, this property has value "modem". + modem-init: + deprecated: true type: boolean description: - If present, it indicates that the modem is responsible for - performing early IPA initialization, including loading and - validating firwmare used by the GSI. + This is the older (deprecated) way of indicating how GSI firmware + should be loaded. If present, the modem loads GSI firmware; if + absent, the AP loads GSI firmware. memory-region: maxItems: 1 description: If present, a phandle for a reserved memory area that holds the firmware passed to Trust Zone for authentication. Required - when Trust Zone (not the modem) performs early initialization. + when the AP (not the modem) performs early initialization. firmware-name: $ref: /schemas/types.yaml#/definitions/string @@ -155,15 +165,36 @@ required: - interconnects - qcom,smem-states -# If modem-init is not present, the AP loads GSI firmware, and -# memory-region must be specified -if: - not: - required: - - modem-init -then: - required: - - memory-region +allOf: + # If qcom,gsi-loader is present, modem-init must not be present + - if: + required: + - qcom,gsi-loader + then: + properties: + modem-init: false + + # If qcom,gsi-loader is "self", the AP loads GSI firmware, and + # memory-region must be specified + if: + properties: + qcom,gsi-loader: + contains: + const: self + then: + required: + - memory-region + else: + # If qcom,gsi-loader is not present, we use deprecated behavior. + # If modem-init is not present, the AP loads GSI firmware, and + # memory-region must be specified. + if: + not: + required: + - modem-init + then: + required: + - memory-region additionalProperties: false @@ -194,14 +225,17 @@ examples: }; ipa@1e40000 { - compatible = "qcom,sdm845-ipa"; + compatible = "qcom,sc7180-ipa"; - modem-init; + qcom,gsi-loader = "self"; + memory-region = <&ipa_fw_mem>; + firmware-name = "qcom/sc7180-trogdor/modem/modem.mdt"; - iommus = <&apps_smmu 0x720 0x3>; + iommus = <&apps_smmu 0x440 0x0>, + <&apps_smmu 0x442 0x0>; reg = <0x1e40000 0x7000>, - <0x1e47000 0x2000>, - <0x1e04000 0x2c000>; + <0x1e47000 0x2000>, + <0x1e04000 0x2c000>; reg-names = "ipa-reg", "ipa-shared", "gsi"; @@ -219,9 +253,9 @@ examples: clock-names = "core"; interconnects = - <&rsc_hlos MASTER_IPA &rsc_hlos SLAVE_EBI1>, - <&rsc_hlos MASTER_IPA &rsc_hlos SLAVE_IMEM>, - <&rsc_hlos MASTER_APPSS_PROC &rsc_hlos SLAVE_IPA_CFG>; + <&aggre2_noc MASTER_IPA 0 &mc_virt SLAVE_EBI1 0>, + <&aggre2_noc MASTER_IPA 0 &system_noc SLAVE_IMEM 0>, + <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_IPA_CFG 0>; interconnect-names = "memory", "imem", "config"; From patchwork Tue Nov 15 11:31:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 20326 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2665721wru; Tue, 15 Nov 2022 03:37:01 -0800 (PST) X-Google-Smtp-Source: AA0mqf4NYUY8y5AhcD0xCeKJs29laJdSVGJLU9IO56qWI1OaQ4QRjM3GecAOLOS7xg5wh9G0g+Mw X-Received: by 2002:a17:90a:62c5:b0:212:d404:5513 with SMTP id k5-20020a17090a62c500b00212d4045513mr158346pjs.27.1668512221006; Tue, 15 Nov 2022 03:37:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668512220; cv=none; d=google.com; s=arc-20160816; b=uTsuTDaLY2eS/1cY6AfD7+09Xkkvp3fyGT5d5x3nlq2Eg2B/3Lj03+vasrMkds4Y47 rBeYlo6Piovoni6id4a8HlVDnOgW5bnZpCIa4wUFXJA28JDLztFTBHn/L2HpfzPInQ0m 2wB46u28liK/xg7HVEgQoYo7/XpI4Hgd0h1ibijA3wB5rx61iaK64BjSKM7wxwpCZUiW IkkyYS6cE/Uelw6qSRvLI8Cq4/Mgg8Gyxf6nGnXTkudUFGZAMIkO9BAdfLudnay6i7xy bBTm37i4+GpDtVtla6XfCmf1+RkzpmlnILMW9ajOI/FlUazocaDgIw2Ey9+N5LL1m5Jk KHWg== 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=IbFCvRl1cs7XC6NWdvqbuTmw/rqE6VsOAXoQYLExO5Q=; b=ID2428zVYOFtVjR/OjWMUpCaUlFt+1eewEzxeRtX1PVMwHXx7YtbIs0EoIMy+RDb0I sGgtLAFIDRTMIBelO/tK0+brJBeHPKt2AKKcXKs8/AlKuWFYQLCveKdG0SM4qH6t7rs+ cUnQSnSN1+aO+PgROxWCDVGXN8ASUmSkM+ut7fQahsrlEUxVUvtASgdc0b0ptSEb9Q57 0DlcueMcxclVpWMmeYqQ9f3e/EqlhSr8hIf6rHmA04QhUY5s2JZQDgP/c4yCHKhBXCgT spaFh4qE7xy7sURI16Z3o1Iazh8a69VoCAdm4NH04NJRgjxmERYFMkOP2keLwC5uy0Cz WrhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cYbRnUjq; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m13-20020a170902f64d00b001868d5fc29bsi12789623plg.259.2022.11.15.03.36.47; Tue, 15 Nov 2022 03:37:00 -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=cYbRnUjq; 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 S232897AbiKOLbo (ORCPT + 99 others); Tue, 15 Nov 2022 06:31:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36828 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230355AbiKOLba (ORCPT ); Tue, 15 Nov 2022 06:31:30 -0500 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5749C17E2E for ; Tue, 15 Nov 2022 03:31:28 -0800 (PST) Received: by mail-wr1-x430.google.com with SMTP id o4so23625842wrq.6 for ; Tue, 15 Nov 2022 03:31:28 -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=IbFCvRl1cs7XC6NWdvqbuTmw/rqE6VsOAXoQYLExO5Q=; b=cYbRnUjqpEjManEKkdqcrYyuXoBez9/oOJAeEmcI2tRlNTl1NoyEzlzIPXCdit1eE5 y4D3xv5gQauvoixnhhcrDQFN4mYEOSGSb+btX02JoZrVFSik0N8I1kAr2aLRC/lB3BSP fcG3BL7lkVp3a+n+C/WKugTduGRsbVe4FqsctV268gfJKOjriumE4V7YaO0inFJyLFNP AIPQiTykLvbSFahIuowc6lGqgxvN636Wt/Jq3kbT46mSkNiSt7OmwDzO/cdAA5zcPU/L HMRBuZ2VJIDa8bXa8oXKHlRr37PSPgOYZMUGhwjyJ/lW/A/zOUp25/csQaESL47qnnaw mDRg== 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=IbFCvRl1cs7XC6NWdvqbuTmw/rqE6VsOAXoQYLExO5Q=; b=a6JkrfbBZHe34sZDbi22+dsbzd1h3ErK69rX+84Gl8YAYBwPB8EAcfsCzXKlt8Y+nY U1UeZH2Ggfv/3tQaDo5lIc5aC7QX6XZuj9ws8PuhKaILfty8JUBN23qY0Vxo+ZxMy45A C9h+VhrsMF7N5P/kgfgkustA3mmWdxF6fuRmdkGNlmPxV85yO2ma+Z3b1CiTf3ONkaFO 5ipUI+9rWZJDVUmn+TE6U+MK81iR849AZAuhDu3L9IKSbYyUqPEMbHKqCP1dnLTGEXsa X0TF138VEa6Xa+vro+t2JkzJ00h/gknQjNIoR7okYpD6s14ZxlORUH3fvphGVSl4o3KU 3R9w== X-Gm-Message-State: ANoB5pk4jBYZY1nc0EdOk6fRy1pHBrmKUTJitRwjLVj3RqlJxanxMc6F PkHgGmtnvq2VJfcrYjHeMajJHg== X-Received: by 2002:adf:fc8c:0:b0:235:9aae:35a6 with SMTP id g12-20020adffc8c000000b002359aae35a6mr9921596wrr.686.1668511886775; Tue, 15 Nov 2022 03:31:26 -0800 (PST) Received: from zoltan.localdomain ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id r18-20020adfe692000000b00238df11940fsm12273091wrm.16.2022.11.15.03.31.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Nov 2022 03:31:26 -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 v2 2/5] net: ipa: encapsulate decision about firmware load Date: Tue, 15 Nov 2022 05:31:16 -0600 Message-Id: <20221115113119.249893-3-elder@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221115113119.249893-1-elder@linaro.org> References: <20221115113119.249893-1-elder@linaro.org> MIME-Version: 1.0 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749561870493588012?= X-GMAIL-MSGID: =?utf-8?q?1749561870493588012?= The GSI layer used for IPA requires firmware to be loaded. Currently either the AP or the modem loads the firmware, distinguished by whether the "modem-init" Device Tree property is defined. Some newer systems implement a third option. In preparation for that, encapsulate the code that determines how the GSI firmware gets loaded in a new function, ipa_firmware_loader(). Signed-off-by: Alex Elder --- drivers/net/ipa/ipa_main.c | 39 ++++++++++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 8 deletions(-) diff --git a/drivers/net/ipa/ipa_main.c b/drivers/net/ipa/ipa_main.c index ebb6c9b311eb9..9e43b79d233e9 100644 --- a/drivers/net/ipa/ipa_main.c +++ b/drivers/net/ipa/ipa_main.c @@ -81,6 +81,19 @@ /* Divider for 19.2 MHz crystal oscillator clock to get common timer clock */ #define IPA_XO_CLOCK_DIVIDER 192 /* 1 is subtracted where used */ +/** + * enum ipa_firmware_loader: How GSI firmware gets loaded + * + * @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 + */ +enum ipa_firmware_loader { + IPA_LOADER_DEFER, + IPA_LOADER_SELF, + IPA_LOADER_MODEM, +}; + /** * ipa_setup() - Set up IPA hardware * @ipa: IPA pointer @@ -696,6 +709,18 @@ static void ipa_validate_build(void) BUILD_BUG_ON(!ipa_aggr_granularity_val(IPA_AGGR_GRANULARITY)); } +static enum ipa_firmware_loader ipa_firmware_loader(struct device *dev) +{ + if (of_property_read_bool(dev->of_node, "modem-init")) + return IPA_LOADER_MODEM; + + /* We need Trust Zone to load firmware; make sure it's available */ + if (qcom_scm_is_available()) + return IPA_LOADER_SELF; + + return IPA_LOADER_DEFER; +} + /** * ipa_probe() - IPA platform driver probe function * @pdev: Platform device pointer @@ -722,9 +747,9 @@ static void ipa_validate_build(void) static int ipa_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; + enum ipa_firmware_loader loader; const struct ipa_data *data; struct ipa_power *power; - bool modem_init; struct ipa *ipa; int ret; @@ -747,11 +772,9 @@ static int ipa_probe(struct platform_device *pdev) return -EINVAL; } - /* If we need Trust Zone, make sure it's available */ - modem_init = of_property_read_bool(dev->of_node, "modem-init"); - if (!modem_init) - if (!qcom_scm_is_available()) - return -EPROBE_DEFER; + loader = ipa_firmware_loader(dev); + if (loader == IPA_LOADER_DEFER) + return -EPROBE_DEFER; /* The clock and interconnects might not be ready when we're * probed, so might return -EPROBE_DEFER. @@ -796,7 +819,7 @@ static int ipa_probe(struct platform_device *pdev) if (ret) goto err_endpoint_exit; - ret = ipa_smp2p_init(ipa, modem_init); + ret = ipa_smp2p_init(ipa, loader == IPA_LOADER_MODEM); if (ret) goto err_table_exit; @@ -815,7 +838,7 @@ static int ipa_probe(struct platform_device *pdev) * call to ipa_setup() when it has finished. In that case we're * done here. */ - if (modem_init) + if (loader == IPA_LOADER_MODEM) goto done; /* Otherwise we need to load the firmware and have Trust Zone validate From patchwork Tue Nov 15 11:31:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 20327 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2666336wru; Tue, 15 Nov 2022 03:38:09 -0800 (PST) X-Google-Smtp-Source: AA0mqf4+AAvK/RwOcHHnwwOxkKuAZPbxL+WY8sCWGiJwJkCTyX5bis/vNRpxzabvym1Gn2aUM+Qo X-Received: by 2002:a05:6a00:1c96:b0:562:e0fb:3c79 with SMTP id y22-20020a056a001c9600b00562e0fb3c79mr17978418pfw.39.1668512289630; Tue, 15 Nov 2022 03:38:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668512289; cv=none; d=google.com; s=arc-20160816; b=1GnsXrOzgYBSWFgiB0Goa8KfnWvTch2Nebkunv1hoM2Z4x9BCY/IJ7HOqECaczdoWw mMGMulJfuS8QZTXA+NTm8/jo8efTbh+9wwrHkb4PtNl/RdYqZNsMejPZjTwVld5tQmHQ pBK3gmDLQsuyBZZ5OARGfBfOV7qKMHMVNgyKV3XYgpf8i2Vj9Ud7spALSkfFky620fHS tLTmDEzTe20OjLf29EX9y5b8g0C6+IM17Smj3N1S68szje4qZNxUxWGVP9GxO+QozJeS 7au3B6rSoOybAHRbPE2HQGW52M2xeI6veIKnT3nb2bEnRLE0fGRbCzJZZyudjSVBOzOb CHVA== 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=QmJK2z6YewxghveqGIb9UQBF6OMvTjY+OevUyUnH0xk=; b=qH2Rk3uRrrbgAICi+wBKEuuHr8+ymGTgvLu/DHBiDgn/KxWGERnAl9acBUaJefASR2 rhWGP5fWyoIBU4JISGDESt7p2yLJKTHMFLjuU5ElIfK/XuqspOzWlffq4WNWQgu6+iia RrjFdG6D4P31tz6farFvJuDnxA0vbctB1Esmzf0xOs1fYVz4WQ3nZsJfAfEijrY61mdy cXEqb64LN5n+PJR/UoX+muwALUe/QTuHHnsNKGBv7GlRGXr6rgpIpGJRNjvKs7ZHKz+z A65V+JO+3GeBPda6hCET9AtMgdHHnpis5Zppzqz6J78vVnHo5xXoKnB/elSQi9kc8U6Q kBZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=k4Wk8SJz; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f25-20020a631019000000b0046fb2a57348si12520702pgl.84.2022.11.15.03.37.55; Tue, 15 Nov 2022 03:38:09 -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=k4Wk8SJz; 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 S237801AbiKOLbt (ORCPT + 99 others); Tue, 15 Nov 2022 06:31:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36890 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232655AbiKOLbb (ORCPT ); Tue, 15 Nov 2022 06:31:31 -0500 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A550C1834F for ; Tue, 15 Nov 2022 03:31:29 -0800 (PST) Received: by mail-wr1-x42b.google.com with SMTP id l14so23737070wrw.2 for ; Tue, 15 Nov 2022 03:31:29 -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=QmJK2z6YewxghveqGIb9UQBF6OMvTjY+OevUyUnH0xk=; b=k4Wk8SJzRhqnAXgbsU5UoMU6S3GG5pKKmOwOlxbFHnJZK2Gd1ISJplEGnPTTgav2Io p7LEnsWo+qY65f9r4bO1QhQR6I4KnqEVRZPkC1UPoU1BJcIcIfyqLGVFB7l9ytX6LKg6 RmVHalJsc+Af9sEHGLvpgJLFysuZSAyGXkcXC8TD/7d1jjz3gJPLcr3em5oZDNlj6u0h Koi50OZFkn26y6VCrs6mCrl4zccZ3ee9sJ20m7msyngMafejHfgADR+HiVh/QPIcHx9f zkEl0TlYx7/uSs54/CmF2F3cGX0vHoxQB4RFA8oVgsyUlOVRS+DVFxyZm9d/jsCxKiHn uOUw== 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=QmJK2z6YewxghveqGIb9UQBF6OMvTjY+OevUyUnH0xk=; b=M/najmoPuRUef+uzCeUoeDeoBttzS4hB1UJGxpjq8B7eRu1YG7PKT7v75Rsz5iLmlV Ri1CU5YYeKpx5Zj4hz19JCeCO5CjiLLwpcNKFAhus8EQCFf6y/TsWEMMXGoU4bTOkElN 0daFnEiWS4w2vTGI4s8p69ZKMdDNsXOhoVeEiyTywm2s3D7VVNNEdQSp478nKjahEPPk iDAu5uF4MGJnPJLIryYrrZ1vjageuAAk7PFrwve42fWGMnatxt1WOMgeYFdKKIUtHeS2 jzdIKCEMQqqq6UZ1bxvPz2I8RAC7uQXV6qNGgfKlB62YJXGfpzRg8sh19uoFAMJu2QXS TOBw== X-Gm-Message-State: ANoB5pmQKtl12Hry2CXyBweNjo0X9UAekfIXj/q+cwqlb89f1Mo1gn9h ZbbRdGaQcJ288rMOiWPe3V6Lhw== X-Received: by 2002:a5d:4903:0:b0:236:87f4:75d with SMTP id x3-20020a5d4903000000b0023687f4075dmr10004008wrq.447.1668511889176; Tue, 15 Nov 2022 03:31:29 -0800 (PST) Received: from zoltan.localdomain ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id r18-20020adfe692000000b00238df11940fsm12273091wrm.16.2022.11.15.03.31.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Nov 2022 03:31:27 -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 v2 3/5] net: ipa: introduce "qcom,gsi-loader" property Date: Tue, 15 Nov 2022 05:31:17 -0600 Message-Id: <20221115113119.249893-4-elder@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221115113119.249893-1-elder@linaro.org> References: <20221115113119.249893-1-elder@linaro.org> MIME-Version: 1.0 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749561942771715542?= X-GMAIL-MSGID: =?utf-8?q?1749561942771715542?= Introduce a new way of specifying how the GSI firmware gets loaded for IPA. Currently, this is indicated by the presence or absence of the Boolean "modem-init" Device Tree property. The new property must have a value--either "self" or "modem"--which indicates whether the AP or modem is the GSI firmware loader, respectively. For legacy systems, the new property will not exist, and the "modem-init" property will be used. For newer systems, the "qcom,gsi-loader" property *must* exist, and must have one of the two prescribed values. It is an error to have both properties defined, and it is an error for the new property to have an unrecognized value. Signed-off-by: Alex Elder --- drivers/net/ipa/ipa_main.c | 44 ++++++++++++++++++++++++++++++++------ 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/drivers/net/ipa/ipa_main.c b/drivers/net/ipa/ipa_main.c index 9e43b79d233e9..214e524dce795 100644 --- a/drivers/net/ipa/ipa_main.c +++ b/drivers/net/ipa/ipa_main.c @@ -87,11 +87,13 @@ * @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_INVALID: GSI firmware loader specification is invalid */ enum ipa_firmware_loader { IPA_LOADER_DEFER, IPA_LOADER_SELF, IPA_LOADER_MODEM, + IPA_LOADER_INVALID, }; /** @@ -711,9 +713,37 @@ static void ipa_validate_build(void) static enum ipa_firmware_loader ipa_firmware_loader(struct device *dev) { - if (of_property_read_bool(dev->of_node, "modem-init")) + bool modem_init; + const char *str; + int ret; + + /* Look up the old and new properties by name */ + modem_init = of_property_read_bool(dev->of_node, "modem-init"); + ret = of_property_read_string(dev->of_node, "qcom,gsi-loader", &str); + + /* If the new property doesn't exist, it's legacy behavior */ + if (ret == -EINVAL) { + if (modem_init) + return IPA_LOADER_MODEM; + goto out_self; + } + + /* Any other error on the new property means it's poorly defined */ + if (ret) + return IPA_LOADER_INVALID; + + /* New property value exists; if old one does too, that's invalid */ + if (modem_init) + return IPA_LOADER_INVALID; + + /* Modem loads GSI firmware for "modem" */ + if (!strcmp(str, "modem")) return IPA_LOADER_MODEM; + /* Any value other than "self" is an error */ + if (strcmp(str, "self")) + return IPA_LOADER_INVALID; +out_self: /* We need Trust Zone to load firmware; make sure it's available */ if (qcom_scm_is_available()) return IPA_LOADER_SELF; @@ -773,6 +803,8 @@ static int ipa_probe(struct platform_device *pdev) } loader = ipa_firmware_loader(dev); + if (loader == IPA_LOADER_INVALID) + return -EINVAL; if (loader == IPA_LOADER_DEFER) return -EPROBE_DEFER; @@ -834,20 +866,18 @@ static int ipa_probe(struct platform_device *pdev) dev_info(dev, "IPA driver initialized"); - /* If the modem is doing early initialization, it will trigger a - * call to ipa_setup() when it has finished. In that case we're - * done here. + /* If the modem is loading GSI firmware, it will trigger a call to + * ipa_setup() when it has finished. In that case we're done here. */ if (loader == IPA_LOADER_MODEM) goto done; - /* Otherwise we need to load the firmware and have Trust Zone validate - * and install it. If that succeeds we can proceed with setup. - */ + /* The AP is loading GSI firmware; do so now */ ret = ipa_firmware_load(dev); if (ret) goto err_deconfig; + /* GSI firmware is loaded; proceed to setup */ ret = ipa_setup(ipa); if (ret) goto err_deconfig; From patchwork Tue Nov 15 11:31:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 20330 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2666821wru; Tue, 15 Nov 2022 03:39:04 -0800 (PST) X-Google-Smtp-Source: AA0mqf5U6Y7BebTuLtGfQPyiKeJuiIvNEiXqpQjto0wrem49cnOqIYZOqPibRny6pB9upNONjTEW X-Received: by 2002:a63:5025:0:b0:464:8d6:8dc7 with SMTP id e37-20020a635025000000b0046408d68dc7mr15634216pgb.594.1668512344002; Tue, 15 Nov 2022 03:39:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668512343; cv=none; d=google.com; s=arc-20160816; b=GOSfbw8WSVQdpanQPXJMA0vTHDbwhxbHwDSY9WAng0MELG8f8oeL9LIBipHEabVSsU ObK9Dv7oBRd+QSpMWASBoMZzx/NPbu1SySFNRvyv8nHsu3NsqPS29zAB8pK6PzaXX6vL xmr4EeN4tyzI4rNj+ZymhLSdCurS7ymBDNokiiOyMqzw9qO7GIMg7P15k8HoxBFKwxe5 9rG2/R03sZvwMX3pJ1kA6UpVA8Z/izfFKVFyayJcvyBwvGG2hlvgVLP6czeRWwil88LK b4Mocv+RBneLVTCWPPH9btRU+WmCMl9j9X7f9mGf4XfBeUcNhin7vHWKQNNZGkjfY+kG 5QdQ== 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=8v8FoH1On1F2wnSoCme92GBkJZmxbbw7MltkC0PFYms=; b=yJk6dfHIjzdoGcXPy/dH5hBAMi7wU5sQUFFkz10GeZufvCMOC8X5M9vu0vM/HDWOaI j0D/4vtj9zmKmvSjoezkYmGNtyZ8OOHghkRF7yQ/YUmn4nd+dogPiNZer2SMsHwTYgcS QRrhSeR9v7Pj+NY7imtUw1ZVj/z4b1T6K1Q9smH+90JZAhicLJULGLk7bOG4m8gOC5by 0l7zMIJffTpZGhajJ9i6Zm2MqNAAMLGu02PjsQ/OVQhpnHwM9tWainn9aBmCvoDynhr9 tGwp8Rtsj+Hu/4onmOi87gczPURLgEDVFRzE9j+/+HqjXKxw7zxL/9TykkXjAwN6pS/r QtmQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fV81m0WS; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g12-20020a62f94c000000b00551fcfe090fsi10379677pfm.340.2022.11.15.03.38.49; Tue, 15 Nov 2022 03:39:03 -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=fV81m0WS; 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 S237915AbiKOLb5 (ORCPT + 99 others); Tue, 15 Nov 2022 06:31:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233081AbiKOLbd (ORCPT ); Tue, 15 Nov 2022 06:31:33 -0500 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 647251C90E for ; Tue, 15 Nov 2022 03:31:32 -0800 (PST) Received: by mail-wr1-x435.google.com with SMTP id d9so19025866wrm.13 for ; Tue, 15 Nov 2022 03:31:32 -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=8v8FoH1On1F2wnSoCme92GBkJZmxbbw7MltkC0PFYms=; b=fV81m0WSB0Y0qWL64erh+PxRX/0jfKH6EuUYi1t5kjQz8PuFyAd/DioBHcf1HQT1db OddtrRrcbbaPvBsbdaXjpnNFSM8I5foNs2TU2VHwWYfJfWJMz3jJWdko60QZC1c9W2+K x04Jka6V9I2ds31GZRRI7ZwSHNYHKBUgVHXYO2ZuTlvGyZWXgbWMetK/aWK/O+eNT5SQ TTMkr5aMtu0YG3tnX6tWeNIoPYlgqieK07001dSLFGfH+0PoCe+hlvZEmNXP2oOLqKRd YYjhFulu7AC/oG076eU0IV4Xc3400GQwJ6NAYXFDu5aowI0gVPXvwjawC5ID9sLV9ZI5 FcTg== 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=8v8FoH1On1F2wnSoCme92GBkJZmxbbw7MltkC0PFYms=; b=qWf68zjzx15ERCc4NFfvCLhg2i6nbtSLQHUP3EQjDRfMXVLiVhN4W4znBNkiQDomvd 7KThL7zpfK5+8l6T44nLJWgxTacD5xqhvPgBlpavJeiWErbmFYWC8l+CrOLqbsDKN/0m TFrdVYQm2R3i81Ld0lR+iBLEArdzDeqHA01SP5+9H+/ygnDnzh5HmuxFurxdskNBcrtg 1dBDR7/Mf27pWgGf18QAlQZkLy/9V5cuhlkSCsLAG+FmEwPc8WwdzvJxcFeFapzGDzt6 +qmb7CXgXgyTrYUnclQKjZljsiy+o7cKZU3WhmNt/AiJLYOEpc4MtpQWZdWumYnpby3O dECA== X-Gm-Message-State: ANoB5plrH9RJeyoAYIOmO5Y8pZAZT3bL9uRxgYryztOE49SbCp3nuiMG 3JFSPW8D8IUl7wGP6BCGioc6YQ== X-Received: by 2002:adf:ec8f:0:b0:236:ae0d:e833 with SMTP id z15-20020adfec8f000000b00236ae0de833mr10196617wrn.155.1668511890934; Tue, 15 Nov 2022 03:31:30 -0800 (PST) Received: from zoltan.localdomain ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id r18-20020adfe692000000b00238df11940fsm12273091wrm.16.2022.11.15.03.31.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Nov 2022 03:31:29 -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 v2 4/5] dt-bindings: net: qcom,ipa: support skipping GSI firmware load Date: Tue, 15 Nov 2022 05:31:18 -0600 Message-Id: <20221115113119.249893-5-elder@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221115113119.249893-1-elder@linaro.org> References: <20221115113119.249893-1-elder@linaro.org> MIME-Version: 1.0 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749561999335563534?= X-GMAIL-MSGID: =?utf-8?q?1749561999335563534?= Add a new enumerated value to those defined for the qcom,gsi-loader property. If the qcom,gsi-loader is "skip", the GSI firmware will already be loaded, so neither the AP nor modem is required to load GSI firmware. Signed-off-by: Alex Elder Reviewed-by: Krzysztof Kozlowski --- Documentation/devicetree/bindings/net/qcom,ipa.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/net/qcom,ipa.yaml b/Documentation/devicetree/bindings/net/qcom,ipa.yaml index d0f34763b9383..9e81b9ec7cfdd 100644 --- a/Documentation/devicetree/bindings/net/qcom,ipa.yaml +++ b/Documentation/devicetree/bindings/net/qcom,ipa.yaml @@ -128,10 +128,12 @@ properties: enum: - self - modem + - skip description: Indicates how GSI firmware should be loaded. If the AP loads and validates GSI firmware, this property has value "self". If the modem does this, this property has value "modem". + Otherwise, "skip" means GSI firmware loading is not required. modem-init: deprecated: true From patchwork Tue Nov 15 11:31:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 20328 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2666354wru; Tue, 15 Nov 2022 03:38:12 -0800 (PST) X-Google-Smtp-Source: AA0mqf61ioH2aLqsh4j9uvTKbvME/x1MUKELxVpvOUsdlAjsbgzUphEMjsL2KUuvB3DRTg9t6X1W X-Received: by 2002:aa7:c04a:0:b0:461:97fe:a331 with SMTP id k10-20020aa7c04a000000b0046197fea331mr14318931edo.238.1668512291907; Tue, 15 Nov 2022 03:38:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668512291; cv=none; d=google.com; s=arc-20160816; b=hIrNtG0MGPSjhG/sOtHhc1P2V2JFr1Qv1oVUL5KNs0MnocM+6RGwjj7RcIyHpcL5xh cxtVGctjcoma4b1LNzgoRf42Pg5ErmihdU6UzcI7XVrMRXQ1A903p1H2yXppbbj9vaOM Ni9q7pLf+2mqqg1A1+wixbBh6Qou+2F+V59eDGlXLdpItA4BcsandGugIMOrWSTUZ3G0 C16dFxoH6m2/bG4JIOqKp7b9CqBenOUz77Rih6SCvfEBFmKA5V4a8MYKR0za97ibcd99 rQvnhqXYGs95GJESaU5wgVN96uIOslTqSFZVLrU70IpO0yDULqLD8aqqSyAYYjC9JiyD qFsg== 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=CWdJKdhjDxLJnDL5cm8Qje3wkAlggLt/yYHVtQLCuPl+61a5Xmsr0jHdEPSRZhnmoB umbmuTjYCxpuzj5BKiRx3wYjUwXd8vtWEDYbOMgzIwyN6hIq5iNpSa552LAxhhxtch+W i1urlapfx3ExTc4v8u/yxwxqENXeJNU5wqAOFTS6FMfzSIoUw74B1CmlOAAYa3JLQjF+ /yxxYSSeqI2j8slVfGk9yTUR4YtHBzQLcywS15HA5XnKE+FodlH7ebMvhWOsqj2Zv8qI 76Ww06FDCiXJADtRY+90+h7I7LbciTCQA9eljqIXD3ukx8zEkx9o6kmlXNYF5eM+S59L fxnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=D8EGa8ht; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i7-20020a05640242c700b00461cb980126si12811423edc.309.2022.11.15.03.37.21; Tue, 15 Nov 2022 03:38:11 -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=D8EGa8ht; 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 S229583AbiKOLcM (ORCPT + 99 others); Tue, 15 Nov 2022 06:32:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36874 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236559AbiKOLbf (ORCPT ); Tue, 15 Nov 2022 06:31:35 -0500 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D918E1A3B4 for ; Tue, 15 Nov 2022 03:31:32 -0800 (PST) Received: by mail-wr1-x436.google.com with SMTP id g12so23556960wrs.10 for ; Tue, 15 Nov 2022 03:31:32 -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=D8EGa8htGFTrwr+uWFdhGjdWi5azQWY7WKuZsWKqSGl7DOBh5SqcqwVODSBoQ5raO3 16AhnKECzyxTxO7lN0ueLWY2nuYw2CdMPY/TbAJfSzrSkwxtx1hodXF27VnVR3P1SJwA wDO79WtzmOQyTP+Hy9qWADtHJAB2b2DxfGDlH8/j8SdN5KygAJ4KVfqjfABAjmxKamZl Gamru9txX23IdiJM7YAAh5W8WZfXelXG2MdFpSx2khyzXBPdwMHdllb5kf1+/UXPmw2y E5jfGp8Vv0HZ60B2wDiJQrYWgF/CpkTkZmYgOn5gJZNWsdBSnK08LXQSpPxY8pxRj12Y O3qQ== 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=osmlYZNwkXfu5BxKhOszyaCeTb2+N9D7SoQrLNFEKghtVFya5fAhQRRWIInzF1+dMp XIDmR8sGlvJijYwvFGGTsQZURjmpTUxjMX5+YnbpaLfLykKGLgmQhNIejo6vApWFv4oU ZP+BQ6YtP8LKpblgzb34Y+ZV/kYTjJs1GaCdxzlUwgj2vrZk0pJUUpZOpUMdmuM3HqGD Bd9C+yKYCkqDofpTN0cIr6jHgn3iFPDFKQpMamDNG4IPKVuSYhjT4DtHucZCNhYmHSAR j1XYmVQP1NzZtaSQq9PVLclco9gevARtN3S1H6SxWJJcqU17NN1wb7OnUgdrIcDktAQg N77g== X-Gm-Message-State: ANoB5pmj9P3rj3KTjaiYcybxpbrkstYFYHBKP9qglXl6FZsZWR5TCZYC xeSYMd/Hi5pAUnw1Vush68Xm4g== X-Received: by 2002:a5d:58c3:0:b0:238:8896:7876 with SMTP id o3-20020a5d58c3000000b0023888967876mr10459521wrf.645.1668511892383; Tue, 15 Nov 2022 03:31:32 -0800 (PST) Received: from zoltan.localdomain ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id r18-20020adfe692000000b00238df11940fsm12273091wrm.16.2022.11.15.03.31.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Nov 2022 03:31:31 -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 v2 5/5] net: ipa: permit GSI firmware loading to be skipped Date: Tue, 15 Nov 2022 05:31:19 -0600 Message-Id: <20221115113119.249893-6-elder@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221115113119.249893-1-elder@linaro.org> References: <20221115113119.249893-1-elder@linaro.org> MIME-Version: 1.0 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749561945399718459?= X-GMAIL-MSGID: =?utf-8?q?1749561945399718459?= 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);