meta-schemas: Allow '#' anywhere in required DT property names #116
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Commit 0e28a44 ("meta-schemas: Allow '#' anywhere is DT property names") amended the 'propertyNames' regex to allow names such as 'marvell,#interrupts'. Make the same amendment to the 'required' regex for consistency to avoid errors like: Documentation/devicetree/bindings/security/tpm/ibm,vtpm.yaml: required:4: 'ibm,#dma-address-cells' does not match '^([a-zA-Z#][a-zA-Z0-9,+\\-._@]{0,63}|\\$nodename)$' hint: 'required' must be valid DT property or node names from schema $id: http://devicetree.org/meta-schemas/keywords.yaml# Signed-off-by: Lukas Wunner <[email protected]>
Commit 0e28a44 ("meta-schemas: Allow '#' anywhere is DT property names") amended the 'propertyNames' regex to allow names such as 'marvell,#interrupts'. Make the same amendment to the allowed patternProperties for consistency to avoid errors like: Documentation/devicetree/bindings/tpm/ibm,vtpm.example.dtb: vtpm@30000003: 'ibm,#dma-address-cells', 'ibm,#dma-size-cells' do not match any of the regexes: '.*-names$', '.*-supply$', '^#.*-cells$', '^#[a-zA-Z0-9,+\\-._]{0,63}$', '^[a-zA-Z0-9][a-zA-Z0-9,+\\-._]{0,63}$', '^[a-zA-Z0-9][a-zA-Z0-9,+\\-._]{0,63}@[0-9a-fA-F]+(,[0-9a-fA-F]+)*$', '^__.*__$', 'pinctrl-[0-9]+' from schema $id: http://devicetree.org/schemas/dt-core.yaml# Signed-off-by: Lukas Wunner <[email protected]>
robherring
reviewed
Nov 20, 2023
| @@ -74,7 +74,7 @@ patternProperties: | |||
| - $ref: types.yaml#/definitions/phandle | |||
|
|
|||
| # property and node namespace overlaps. Catch both here | |||
| "^[a-zA-Z0-9][a-zA-Z0-9,+\\-._]{0,63}$": | |||
| "^[a-zA-Z0-9][a-zA-Z0-9#,+\\-._]{0,63}$": | |||
There was a problem hiding this comment.
I don't think '#' is allowed in node names. Or if it is, I don't think there are any cases of it.
There was a problem hiding this comment.
As the code comment says, the regex applies both to property as well as node names.
In this case, the change is required for property names, not node names. As the commit message explains, I'm having to deal with ibm,#dma-address-cells and ibm,#dma-size-cells properties which the regex currently doesn't allow. Those properties are defined in Documentation/devicetree/bindings/security/tpm/ibmvtpm.txt. I am converting that file to DT schema per your request, see here.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Commit 0e28a44 ("meta-schemas: Allow '#' anywhere is DT property names") amended the
propertyNamesregex to allow names such asmarvell,#interrupts.Make the same amendment to the
requiredregex for consistency to avoid errors like: