contributing.rst 11 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245
  1. Contributor's Guide
  2. ===================
  3. Getting Started
  4. ---------------
  5. - Make sure you have a Github account and you are logged on both
  6. `developer.trustedfirmware.org`_ and `review.trustedfirmware.org`_.
  7. - If you plan to contribute a major piece of work, it is usually a good idea to
  8. start a discussion around it on the mailing list. This gives everyone
  9. visibility of what is coming up, you might learn that somebody else is
  10. already working on something similar or the community might be able to
  11. provide some early input to help shaping the design of the feature.
  12. If you intend to include Third Party IP in your contribution, please mention
  13. it explicitly in the email thread and ensure that the changes that include
  14. Third Party IP are made in a separate patch (or patch series).
  15. - Clone `Trusted Firmware-A`_ on your own machine as described in
  16. :ref:`prerequisites_get_source`.
  17. - Create a local topic branch based on the `Trusted Firmware-A`_ ``master``
  18. branch.
  19. Making Changes
  20. --------------
  21. - Make commits of logical units. See these general `Git guidelines`_ for
  22. contributing to a project.
  23. - Ensure your commit messages comply with the `Conventional Commits`_
  24. specification:
  25. .. code::
  26. <type>[optional scope]: <description>
  27. [optional body]
  28. [optional footer(s)]
  29. You can use the tooling installed by the optional steps in the
  30. :ref:`prerequisites <Prerequisites>` guide to validate this locally.
  31. - Keep the commits on topic. If you need to fix another bug or make another
  32. enhancement, please address it on a separate topic branch.
  33. - Split the patch in manageable units. Small patches are usually easier to
  34. review so this will speed up the review process.
  35. - Avoid long commit series. If you do have a long series, consider whether
  36. some commits should be squashed together or addressed in a separate topic.
  37. - Ensure that each commit in the series has at least one ``Signed-off-by:``
  38. line, using your real name and email address. The names in the
  39. ``Signed-off-by:`` and ``Commit:`` lines must match. By adding this line the
  40. contributor certifies the contribution is made under the terms of the
  41. :download:`Developer Certificate of Origin <../../dco.txt>`.
  42. There might be multiple ``Signed-off-by:`` lines, depending on the history
  43. of the patch.
  44. More details may be found in the `Gerrit Signed-off-by Lines guidelines`_.
  45. - Ensure that each commit also has a unique ``Change-Id:`` line. If you have
  46. cloned the repository with the "`Clone with commit-msg hook`" clone method
  47. (following the :ref:`Prerequisites` document), this should already be the
  48. case.
  49. More details may be found in the `Gerrit Change-Ids documentation`_.
  50. - Write informative and comprehensive commit messages. A good commit message
  51. provides all the background information needed for reviewers to understand
  52. the intent and rationale of the patch. This information is also useful for
  53. future reference.
  54. For example:
  55. - What does the patch do?
  56. - What motivated it?
  57. - What impact does it have?
  58. - How was it tested?
  59. - Have alternatives been considered? Why did you choose this approach over
  60. another one?
  61. - If it fixes an `issue`_, include a reference.
  62. - Follow the :ref:`Coding Style` and :ref:`Coding Guidelines`.
  63. - Use the checkpatch.pl script provided with the Linux source tree. A
  64. Makefile target is provided for convenience, see :ref:`this
  65. section<automatic-compliance-checking>` for more details.
  66. - Where appropriate, please update the documentation.
  67. - Consider whether the :ref:`Porting Guide`, :ref:`Firmware Design` document
  68. or other in-source documentation needs updating.
  69. - If you are submitting new files that you intend to be the code owner for
  70. (for example, a new platform port), then also update the
  71. :ref:`code owners` file.
  72. - For topics with multiple commits, you should make all documentation changes
  73. (and nothing else) in the last commit of the series. Otherwise, include
  74. the documentation changes within the single commit.
  75. .. _copyright-license-guidance:
  76. - Ensure that each changed file has the correct copyright and license
  77. information. Files that entirely consist of contributions to this project
  78. should have a copyright notice and BSD-3-Clause SPDX license identifier of
  79. the form as shown in :ref:`license`. Files that contain changes to imported
  80. Third Party IP files should retain their original copyright and license
  81. notices.
  82. For significant contributions you may add your own copyright notice in the
  83. following format:
  84. ::
  85. Portions copyright (c) [XXXX-]YYYY, <OWNER>. All rights reserved.
  86. where XXXX is the year of first contribution (if different to YYYY) and YYYY
  87. is the year of most recent contribution. <OWNER> is your name or your company
  88. name.
  89. - Ensure that each patch in the patch series compiles in all supported
  90. configurations. Patches which do not compile will not be merged.
  91. - Please test your changes. As a minimum, ensure that Linux boots on the
  92. Foundation FVP. See :ref:`Arm Fixed Virtual Platforms (FVP)` for more
  93. information. For more extensive testing, consider running the `TF-A Tests`_
  94. against your patches.
  95. - Ensure that all CI automated tests pass. Failures should be fixed. They might
  96. block a patch, depending on how critical they are.
  97. Submitting Changes
  98. ------------------
  99. - Submit your changes for review at https://review.trustedfirmware.org
  100. targeting the ``integration`` branch.
  101. - Add reviewers for your patch:
  102. - At least one code owner for each module modified by the patch. See the list
  103. of modules and their :ref:`code owners`.
  104. - At least one maintainer. See the list of :ref:`maintainers`.
  105. - If some module has no code owner, try to identify a suitable (non-code
  106. owner) reviewer. Running ``git blame`` on the module's source code can
  107. help, as it shows who has been working the most recently on this area of
  108. the code.
  109. Alternatively, if it is impractical to identify such a reviewer, you might
  110. send an email to the `TF-A mailing list`_ to broadcast your review request
  111. to the community.
  112. Note that self-reviewing a patch is prohibited, even if the patch author is
  113. the only code owner of a module modified by the patch. Getting a second pair
  114. of eyes on the code is essential to keep up with the quality standards the
  115. project aspires to.
  116. - The changes will then undergo further review by the designated people. Any
  117. review comments will be made directly on your patch. This may require you to
  118. do some rework. For controversial changes, the discussion might be moved to
  119. the `TF-A mailing list`_ to involve more of the community.
  120. Refer to the `Gerrit Uploading Changes documentation`_ for more details.
  121. - The patch submission rules are the following. For a patch to be approved
  122. and merged in the tree, it must get:
  123. - One ``Code-Owner-Review+1`` for each of the modules modified by the patch.
  124. - A ``Maintainer-Review+1``.
  125. In the case where a code owner could not be found for a given module,
  126. ``Code-Owner-Review+1`` is substituted by ``Code-Review+1``.
  127. In addition to these various code review labels, the patch must also get a
  128. ``Verified+1``. This is usually set by the Continuous Integration (CI) bot
  129. when all automated tests passed on the patch. Sometimes, some of these
  130. automated tests may fail for reasons unrelated to the patch. In this case,
  131. the maintainers might (after analysis of the failures) override the CI bot
  132. score to certify that the patch has been correctly tested.
  133. In the event where the CI system lacks proper tests for a patch, the patch
  134. author or a reviewer might agree to perform additional manual tests
  135. in their review and the reviewer incorporates the review of the additional
  136. testing in the ``Code-Review+1`` or ``Code-Owner-Review+1`` as applicable to
  137. attest that the patch works as expected. Where possible additional tests should
  138. be added to the CI system as a follow up task. For example, for a
  139. platform-dependent patch where the said platform is not available in the CI
  140. system's board farm.
  141. - When the changes are accepted, the :ref:`maintainers` will integrate them.
  142. - Typically, the :ref:`maintainers` will merge the changes into the
  143. ``integration`` branch.
  144. - If the changes are not based on a sufficiently-recent commit, or if they
  145. cannot be automatically rebased, then the :ref:`maintainers` may rebase it
  146. on the ``integration`` branch or ask you to do so.
  147. - After final integration testing, the changes will make their way into the
  148. ``master`` branch. If a problem is found during integration, the
  149. :ref:`maintainers` will request your help to solve the issue. They may
  150. revert your patches and ask you to resubmit a reworked version of them or
  151. they may ask you to provide a fix-up patch.
  152. Binary Components
  153. -----------------
  154. - Platforms may depend on binary components submitted to the `Trusted Firmware
  155. binary repository`_ if they require code that the contributor is unable or
  156. unwilling to open-source. This should be used as a rare exception.
  157. - All binary components must follow the contribution guidelines (in particular
  158. licensing rules) outlined in the `readme.rst <tf-binaries-readme_>`_ file of
  159. the binary repository.
  160. - Binary components must be restricted to only the specific functionality that
  161. cannot be open-sourced and must be linked into a larger open-source platform
  162. port. The majority of the platform port must still be implemented in open
  163. source. Platform ports that are merely a thin wrapper around a binary
  164. component that contains all the actual code will not be accepted.
  165. - Only platform port code (i.e. in the ``plat/<vendor>`` directory) may rely on
  166. binary components. Generic code must always be fully open-source.
  167. --------------
  168. *Copyright (c) 2013-2020, Arm Limited and Contributors. All rights reserved.*
  169. .. _Conventional Commits: https://www.conventionalcommits.org/en/v1.0.0
  170. .. _developer.trustedfirmware.org: https://developer.trustedfirmware.org
  171. .. _review.trustedfirmware.org: https://review.trustedfirmware.org
  172. .. _issue: https://developer.trustedfirmware.org/project/board/1/
  173. .. _Trusted Firmware-A: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git
  174. .. _Git guidelines: http://git-scm.com/book/ch5-2.html
  175. .. _Gerrit Uploading Changes documentation: https://review.trustedfirmware.org/Documentation/user-upload.html
  176. .. _Gerrit Signed-off-by Lines guidelines: https://review.trustedfirmware.org/Documentation/user-signedoffby.html
  177. .. _Gerrit Change-Ids documentation: https://review.trustedfirmware.org/Documentation/user-changeid.html
  178. .. _TF-A Tests: https://trustedfirmware-a-tests.readthedocs.io
  179. .. _Trusted Firmware binary repository: https://review.trustedfirmware.org/admin/repos/tf-binaries
  180. .. _tf-binaries-readme: https://git.trustedfirmware.org/tf-binaries.git/tree/readme.rst
  181. .. _TF-A mailing list: https://lists.trustedfirmware.org/mailman/listinfo/tf-a