dt-bindings: net: qcom,ipa: relax some restrictions
cover dt-bindings: net: qcom,ipa: relax some restrictions
The first patch in this series simply removes an unnecessary requirement in the IPA binding. Previously, if the modem was doing GSI firmware loading, the firmware name property was required to *not* be present. There is no harm in having the firmware name be specified, so this restriction isn't needed.
The second patch restates a requirement on the "memory-region" property more accurately.
These binding changes have no impact on existing code or DTS files. These aren't really bug fixes, so no need to back-port.
David et al, to be clear, I intend for this to be taken through the netdev tree. Thanks.
-Alex
Alex Elder (2):
dt-bindings: net: qcom,ipa: remove an unnecessary restriction
dt-bindings: net: qcom,ipa: restate a requirement
.../devicetree/bindings/net/qcom,ipa.yaml | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-)
Signature · 1 line
2.34.1
PATCH 1/2 dt-bindings: net: qcom,ipa: remove an unnecessary restriction
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.
--- Documentation/devicetree/bindings/net/qcom,ipa.yaml | 10 ---------- 1 file changed, 10 deletions(-)
Documentation/devicetree/bindings/net/qcom,ipa.yaml +0 -10
@@ -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:
Signature · 1 line
2.34.1
Re: [PATCH net-next 1/2] dt-bindings: net: qcom,ipa: remove an unnecessary restriction
Quoted 9 lines · Alex Elder
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).
Quoted 6 lines
Remove the unnecessary restriction, and allow "firware-name" to be supplied even if it's not needed.
Signed-off-by Alex Elder <[email protected]>--- Documentation/devicetree/bindings/net/qcom,ipa.yaml | 10 ----------
Best regards,
Krzysztof
PATCH 2/2 dt-bindings: net: qcom,ipa: restate a requirement
In reply to Alex ElderEither 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.
--- Documentation/devicetree/bindings/net/qcom,ipa.yaml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
Documentation/devicetree/bindings/net/qcom,ipa.yaml +8 -5
@@ -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
Signature · 1 line
2.34.1
Re: [PATCH net-next 2/2] dt-bindings: net: qcom,ipa: restate a requirement
Quoted 9 lines · Alex Elder
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).
Quoted 6 lines
Restate the requirement so that the memory-region property is required only if modem-init is not present.
Signed-off-by Alex Elder <[email protected]>--- Documentation/devicetree/bindings/net/qcom,ipa.yaml | 13 ++++++++-----
Best regards,
Krzysztof
This series was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:
Quoted 10 lines · On Thu, 10 Nov 2022 13:56:16 -0600 you wrote:
The first patch in this series simply removes an unnecessary requirement in the IPA binding. Previously, if the modem was doing GSI firmware loading, the firmware name property was required to *not* be present. There is no harm in having the firmware name be specified, so this restriction isn't needed.
The second patch restates a requirement on the "memory-region" property more accurately.
[...]
Here is the summary with links:
- [net-next,1/2] dt-bindings: net: qcom,ipa: remove an unnecessary restriction
https://git.kernel.org/netdev/net-next/c/9d26628a4ce2 - [net-next,2/2] dt-bindings: net: qcom,ipa: restate a requirement https://git.kernel.org/netdev/net-next/c/7a6ca44c1e61
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html