From patchwork Thu Nov 10 19:56: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: 13039283 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9C372C4332F for ; Thu, 10 Nov 2022 19:56:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231305AbiKJT42 (ORCPT ); Thu, 10 Nov 2022 14:56:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48372 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231284AbiKJT40 (ORCPT ); Thu, 10 Nov 2022 14:56:26 -0500 Received: from mail-il1-x133.google.com (mail-il1-x133.google.com [IPv6:2607:f8b0:4864:20::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 577812BF0 for ; Thu, 10 Nov 2022 11:56:26 -0800 (PST) Received: by mail-il1-x133.google.com with SMTP id x16so1557602ilm.5 for ; Thu, 10 Nov 2022 11:56: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=v945GSX1eV3UJd6GCr0VKFlHKoDz5Oj9+fbjy4q6OhU=; b=yFfCLKNrKYDXvW92bMbGEQ1ZBinb7uE7Py8eAE0uyj+kVmFXNDcLnWnP/y130vReoN o/wM9VROwxH34Dxm3sOaMBp2SObqOhOxQB/YuUedPaqLg7pql12PhxUyti3DF57Sv8xY JCLhjyUvG9I7zI3ysZVBGFcEacWQHXRi75flg2C1KQZJPzJer0ge+M7ylt2OAFgkJrqb jFUNwynaXQWHRN19w6f2aWrfB5dGsqJaEOVpVBBQV2c06isj23O53N15zElWiAgs1jbq C3psD3R9mdrsvYFncz4IFc9WaRgeCYVEJ5INry8TWak7FiaFVl4M306FY4WP2CWWXvU4 BwbA== 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=v945GSX1eV3UJd6GCr0VKFlHKoDz5Oj9+fbjy4q6OhU=; b=AINoUTjajNtihr7w5uWuEcjYyxf3bmFfyFWdV3T5hAvSOw91snbx52e3TGHzQoJPcw UBY/1WTyK3TYqmtOfWA+9I3O6Z2LdCcna7S4O3r42moHqWTj7JRE7OiYvjb9FcITCBcv Ev94+W9bN8cPgFJGHqURdHNukH3No9hcIsWyo+oDOKu/GNsKRcOdcPmzZv6eYyRMUYQM MEKQVZgnlYDmGmSaYXq/yAPb/ynRLMIFiNi86CWFY8d6oKxB1jD088qIwLZ5LonJ2Yvh C6iiDTLrpQqfCLwhCa6kWHn+AO8jzTxWOAPBMWDuD2bjxVBlIJpY8QgvhbyVOjN1CVbP rmAQ== X-Gm-Message-State: ACrzQf1qvljIaLBHYTiKLzyIbmns1lv9AiYsYBQDKXdatCoQrzHa4Gzo P0I/SrJ1ABDx0i5amtIzG1tb3g== X-Google-Smtp-Source: AMsMyM5L29aFqs7m8ZPN3GsYSvo0zVt9qdszersId9k19DlVRcwZzBWCRO94Df58Deu0la3PRUMDeg== X-Received: by 2002:a92:d3c8:0:b0:2ec:364c:55c5 with SMTP id c8-20020a92d3c8000000b002ec364c55c5mr3284669ilh.61.1668110185610; Thu, 10 Nov 2022 11:56:25 -0800 (PST) Received: from presto.localdomain ([98.61.227.136]) by smtp.gmail.com with ESMTPSA id l2-20020a6b3e02000000b006bbddd49984sm28602ioa.9.2022.11.10.11.56.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Nov 2022 11:56: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 1/2] dt-bindings: net: qcom,ipa: remove an unnecessary restriction Date: Thu, 10 Nov 2022 13:56:17 -0600 Message-Id: <20221110195619.1276302-2-elder@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221110195619.1276302-1-elder@linaro.org> References: <20221110195619.1276302-1-elder@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Commit d8604b209e9b3 ("dt-bindings: net: qcom,ipa: add firmware-name property") added a requirement for a "firmware-name" property that is more restrictive than necessary. If the AP loads GSI firmware, the name of the firmware file to use may optionally be provided via a "firmware-name" property. If the *modem* loads GSI firmware, "firmware-name" doesn't need to be supplied--but it's harmless to do so (it will simply be ignored). Remove the unnecessary restriction, and allow "firware-name" to be supplied even if it's not needed. Signed-off-by: Alex Elder Reviewed-by: Krzysztof Kozlowski --- Documentation/devicetree/bindings/net/qcom,ipa.yaml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/Documentation/devicetree/bindings/net/qcom,ipa.yaml b/Documentation/devicetree/bindings/net/qcom,ipa.yaml index dd4bb2e748800..2d253ef488188 100644 --- a/Documentation/devicetree/bindings/net/qcom,ipa.yaml +++ b/Documentation/devicetree/bindings/net/qcom,ipa.yaml @@ -162,16 +162,6 @@ oneOf: - required: - memory-region -# If memory-region is present, firmware-name may optionally be present. -# But if modem-init is present, firmware-name must not be present. -if: - required: - - modem-init -then: - not: - required: - - firmware-name - additionalProperties: false examples: From patchwork Thu Nov 10 19:56: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: 13039284 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6B6E8C4321E for ; Thu, 10 Nov 2022 19:56:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229862AbiKJT4a (ORCPT ); Thu, 10 Nov 2022 14:56:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48408 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231304AbiKJT42 (ORCPT ); Thu, 10 Nov 2022 14:56:28 -0500 Received: from mail-il1-x12d.google.com (mail-il1-x12d.google.com [IPv6:2607:f8b0:4864:20::12d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D04BC2BF0 for ; Thu, 10 Nov 2022 11:56:27 -0800 (PST) Received: by mail-il1-x12d.google.com with SMTP id o13so1553171ilq.6 for ; Thu, 10 Nov 2022 11:56:27 -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=ocUEjaXvalO2lDp0ra2nIWRh/qi3vcvKb/fRj0kfIXs=; b=iO0BMOiKTGpHVZQMg6F9oQUWAqh31KTlX5fuYl3NviTrB6Kei0Xho18Y7D4Be1OVbe +DgWY6VYuK3jIljAx6cdNWxzNdGRAA2TlrpRDGOrRG3W0AmtM8cbxxNshFQJbrfWOCVc 3qWf/AA59DPimGQwSAXaf/sF4980VjIAEN1ZOf048/Bf+NVyFru/JoEFDxM8OaqReW7v bgOvGYgbgvRo4e9J2wD5VabDpZ9RbE46BQZ1D8jRtz8kpGG7pmxJ0PgdV4yIgEPbnpre 6sz3Fx9QAWwJ355ZoLF9zcR0Cwv1tG675ND1A9WAGG+j7ABm/tReyAUHSHzyxGH/AB7G wJLQ== 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=ocUEjaXvalO2lDp0ra2nIWRh/qi3vcvKb/fRj0kfIXs=; b=JF/iV8ZSKoUNAXPwtPuEJBF3mqByKi2llhGNWsmU47uAvOc6ECXSKFslJOhvemtZQN 47Rq2k33WTKhj07XmZdcPwgjeoWzyoiCUzOxlk1Xl9uUNmfUcdcEx+HsnibnaYaJJcQF FkX/xEaGb4Sypf5vM6T5wuF0BvnP6l99t3VjPF5h0F6OV9IQTaTROxDqDDjo75HHj7Qb m+5sOuCpj8LH9WtBJk8b6D4Cu1xBBheHv7iqj4GrPdd1oGq+GjuoMSA5GQ4ZOC9Msd4X pD40WfwkPGZdaCucrkb1+6T2HT9xwLPj56xa6kQX3lmNUpKOzv91+DqD5krxDxmVvgUq /vSg== X-Gm-Message-State: ACrzQf0gNtqCxDkpMc4HyEFFCxN0vq4FmmiNTlKKxzjU93vEWqRJNSND NZRHrj4GV/04TLksQxqHLdAXYQ== X-Google-Smtp-Source: AMsMyM5O5C3ge1Cvx+Fe0k1+5IM0IsCZT5vUxMcvAKevaj85MR58vznJVKxrpJnWUoUD+lx0MAt7DQ== X-Received: by 2002:a05:6e02:1a08:b0:2ff:dc4b:a4c0 with SMTP id s8-20020a056e021a0800b002ffdc4ba4c0mr3468201ild.221.1668110187502; Thu, 10 Nov 2022 11:56:27 -0800 (PST) Received: from presto.localdomain ([98.61.227.136]) by smtp.gmail.com with ESMTPSA id l2-20020a6b3e02000000b006bbddd49984sm28602ioa.9.2022.11.10.11.56.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Nov 2022 11:56: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 2/2] dt-bindings: net: qcom,ipa: restate a requirement Date: Thu, 10 Nov 2022 13:56:18 -0600 Message-Id: <20221110195619.1276302-3-elder@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221110195619.1276302-1-elder@linaro.org> References: <20221110195619.1276302-1-elder@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Either the AP or modem loads GSI firmware. If the modem-init property is present, the modem loads it. Otherwise, the AP loads it, and in that case the memory-region property must be defined. Currently this requirement is expressed as one or the other of the modem-init or the memory-region property being required. But it's harmless for the memory-region to be present if the modem is loading firmware (it'll just be ignored). Restate the requirement so that the memory-region property is required only if modem-init is not present. Signed-off-by: Alex Elder Reviewed-by: Krzysztof Kozlowski --- Documentation/devicetree/bindings/net/qcom,ipa.yaml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Documentation/devicetree/bindings/net/qcom,ipa.yaml b/Documentation/devicetree/bindings/net/qcom,ipa.yaml index 2d253ef488188..e752b76192df0 100644 --- a/Documentation/devicetree/bindings/net/qcom,ipa.yaml +++ b/Documentation/devicetree/bindings/net/qcom,ipa.yaml @@ -155,12 +155,15 @@ required: - interconnects - qcom,smem-states -# Either modem-init is present, or memory-region must be present. -oneOf: - - required: +# If modem-init is not present, the AP loads GSI firmware, and +# memory-region must be specified +if: + not: + required: - modem-init - - required: - - memory-region +then: + required: + - memory-region additionalProperties: false