blob: aa050dabe446934288b07ef14ba0024ed75916f7 [file] [log] [blame]
Paul Beesleyfc9ee362019-03-07 15:47:15 +00001Contributor's Guide
2===================
Douglas Raillardd7c21b72017-06-28 15:23:03 +01003
4Getting Started
5---------------
6
Sandrine Bailleuxd3147342020-05-12 10:36:05 +02007- Make sure you have a Github account and you are logged on both
8 `developer.trustedfirmware.org`_ and `review.trustedfirmware.org`_.
Douglas Raillardd7c21b72017-06-28 15:23:03 +01009
Sandrine Bailleux6ef77ce2020-08-03 10:27:19 +020010- If you plan to contribute a major piece of work, it is usually a good idea to
11 start a discussion around it on the mailing list. This gives everyone
12 visibility of what is coming up, you might learn that somebody else is
13 already working on something similar or the community might be able to
14 provide some early input to help shaping the design of the feature.
15
16 If you intend to include Third Party IP in your contribution, please mention
17 it explicitly in the email thread and ensure that the changes that include
18 Third Party IP are made in a separate patch (or patch series).
Douglas Raillardd7c21b72017-06-28 15:23:03 +010019
Paul Beesleyd2fcc4e2019-05-29 13:59:40 +010020- Clone `Trusted Firmware-A`_ on your own machine as described in
21 :ref:`prerequisites_get_source`.
Sandrine Bailleux75804e52020-08-12 11:29:46 +020022
John Tsichritzis2fd3d922019-05-28 13:13:39 +010023- Create a local topic branch based on the `Trusted Firmware-A`_ ``master``
Douglas Raillardd7c21b72017-06-28 15:23:03 +010024 branch.
25
26Making Changes
27--------------
28
29- Make commits of logical units. See these general `Git guidelines`_ for
30 contributing to a project.
Sandrine Bailleux75804e52020-08-12 11:29:46 +020031
Chris Kay98b26e32020-12-09 16:52:03 +000032- Ensure your commit messages comply with the `Conventional Commits`_
33 specification:
34
35 .. code::
36
37 <type>[optional scope]: <description>
38
39 [optional body]
40
41 [optional footer(s)]
42
43 You can use the tooling installed by the optional steps in the
44 :ref:`prerequisites <Prerequisites>` guide to validate this locally.
45
Douglas Raillardd7c21b72017-06-28 15:23:03 +010046- Keep the commits on topic. If you need to fix another bug or make another
Sandrine Bailleux6ef77ce2020-08-03 10:27:19 +020047 enhancement, please address it on a separate topic branch.
Sandrine Bailleux75804e52020-08-12 11:29:46 +020048
Sandrine Bailleuxe0cb1892020-08-14 15:58:50 +020049- Split the patch in manageable units. Small patches are usually easier to
50 review so this will speed up the review process.
51
Douglas Raillardd7c21b72017-06-28 15:23:03 +010052- Avoid long commit series. If you do have a long series, consider whether
53 some commits should be squashed together or addressed in a separate topic.
Sandrine Bailleux75804e52020-08-12 11:29:46 +020054
Sandrine Bailleuxe0cb1892020-08-14 15:58:50 +020055- Ensure that each commit in the series has at least one ``Signed-off-by:``
56 line, using your real name and email address. The names in the
57 ``Signed-off-by:`` and ``Commit:`` lines must match. By adding this line the
58 contributor certifies the contribution is made under the terms of the
59 :download:`Developer Certificate of Origin <../../dco.txt>`.
60
61 There might be multiple ``Signed-off-by:`` lines, depending on the history
62 of the patch.
63
64 More details may be found in the `Gerrit Signed-off-by Lines guidelines`_.
65
66- Ensure that each commit also has a unique ``Change-Id:`` line. If you have
67 cloned the repository with the "`Clone with commit-msg hook`" clone method
68 (following the :ref:`Prerequisites` document), this should already be the
69 case.
70
71 More details may be found in the `Gerrit Change-Ids documentation`_.
72
73- Write informative and comprehensive commit messages. A good commit message
74 provides all the background information needed for reviewers to understand
75 the intent and rationale of the patch. This information is also useful for
76 future reference.
77
78 For example:
79
80 - What does the patch do?
81 - What motivated it?
82 - What impact does it have?
83 - How was it tested?
84 - Have alternatives been considered? Why did you choose this approach over
85 another one?
86 - If it fixes an `issue`_, include a reference.
87
88- Follow the :ref:`Coding Style` and :ref:`Coding Guidelines`.
89
90 - Use the checkpatch.pl script provided with the Linux source tree. A
91 Makefile target is provided for convenience, see :ref:`this
92 section<automatic-compliance-checking>` for more details.
Douglas Raillardd7c21b72017-06-28 15:23:03 +010093
Sandrine Bailleux75804e52020-08-12 11:29:46 +020094- Where appropriate, please update the documentation.
Douglas Raillardd7c21b72017-06-28 15:23:03 +010095
Sandrine Bailleux75804e52020-08-12 11:29:46 +020096 - Consider whether the :ref:`Porting Guide`, :ref:`Firmware Design` document
97 or other in-source documentation needs updating.
Douglas Raillardd7c21b72017-06-28 15:23:03 +010098
Sandrine Bailleuxd3147342020-05-12 10:36:05 +020099 - If you are submitting new files that you intend to be the code owner for
100 (for example, a new platform port), then also update the
101 :ref:`code owners` file.
Sandrine Bailleux75804e52020-08-12 11:29:46 +0200102
103 - For topics with multiple commits, you should make all documentation changes
104 (and nothing else) in the last commit of the series. Otherwise, include
105 the documentation changes within the single commit.
106
Sandrine Bailleux398b1882020-08-17 08:52:33 +0200107.. _copyright-license-guidance:
108
Sandrine Bailleux75804e52020-08-12 11:29:46 +0200109- Ensure that each changed file has the correct copyright and license
110 information. Files that entirely consist of contributions to this project
111 should have a copyright notice and BSD-3-Clause SPDX license identifier of
112 the form as shown in :ref:`license`. Files that contain changes to imported
113 Third Party IP files should retain their original copyright and license
114 notices.
115
116 For significant contributions you may add your own copyright notice in the
117 following format:
118
119 ::
120
121 Portions copyright (c) [XXXX-]YYYY, <OWNER>. All rights reserved.
122
123 where XXXX is the year of first contribution (if different to YYYY) and YYYY
124 is the year of most recent contribution. <OWNER> is your name or your company
125 name.
Douglas Raillardd7c21b72017-06-28 15:23:03 +0100126
Sandrine Bailleuxe0cb1892020-08-14 15:58:50 +0200127- Ensure that each patch in the patch series compiles in all supported
128 configurations. Patches which do not compile will not be merged.
129
Louis Mayencourt72ef3d42019-03-22 11:47:22 +0000130- Please test your changes. As a minimum, ensure that Linux boots on the
Paul Beesleyd2fcc4e2019-05-29 13:59:40 +0100131 Foundation FVP. See :ref:`Arm Fixed Virtual Platforms (FVP)` for more
132 information. For more extensive testing, consider running the `TF-A Tests`_
133 against your patches.
Douglas Raillardd7c21b72017-06-28 15:23:03 +0100134
Sandrine Bailleuxe0cb1892020-08-14 15:58:50 +0200135- Ensure that all CI automated tests pass. Failures should be fixed. They might
136 block a patch, depending on how critical they are.
137
Douglas Raillardd7c21b72017-06-28 15:23:03 +0100138Submitting Changes
139------------------
140
Sandrine Bailleuxe0cb1892020-08-14 15:58:50 +0200141- Submit your changes for review at https://review.trustedfirmware.org
142 targeting the ``integration`` branch.
Louis Mayencourt72ef3d42019-03-22 11:47:22 +0000143
Sandrine Bailleuxe0cb1892020-08-14 15:58:50 +0200144- Add reviewers for your patch:
Louis Mayencourt72ef3d42019-03-22 11:47:22 +0000145
Sandrine Bailleuxe0cb1892020-08-14 15:58:50 +0200146 - At least one code owner for each module modified by the patch. See the list
147 of modules and their :ref:`code owners`.
Douglas Raillardd7c21b72017-06-28 15:23:03 +0100148
Sandrine Bailleuxe0cb1892020-08-14 15:58:50 +0200149 - At least one maintainer. See the list of :ref:`maintainers`.
Louis Mayencourt72ef3d42019-03-22 11:47:22 +0000150
Sandrine Bailleuxe0cb1892020-08-14 15:58:50 +0200151 - If some module has no code owner, try to identify a suitable (non-code
152 owner) reviewer. Running ``git blame`` on the module's source code can
153 help, as it shows who has been working the most recently on this area of
154 the code.
Louis Mayencourt72ef3d42019-03-22 11:47:22 +0000155
Sandrine Bailleuxe0cb1892020-08-14 15:58:50 +0200156 Alternatively, if it is impractical to identify such a reviewer, you might
157 send an email to the `TF-A mailing list`_ to broadcast your review request
158 to the community.
159
160 Note that self-reviewing a patch is prohibited, even if the patch author is
161 the only code owner of a module modified by the patch. Getting a second pair
162 of eyes on the code is essential to keep up with the quality standards the
163 project aspires to.
164
165- The changes will then undergo further review by the designated people. Any
166 review comments will be made directly on your patch. This may require you to
167 do some rework. For controversial changes, the discussion might be moved to
168 the `TF-A mailing list`_ to involve more of the community.
Louis Mayencourt72ef3d42019-03-22 11:47:22 +0000169
170 Refer to the `Gerrit Uploading Changes documentation`_ for more details.
Douglas Raillardd7c21b72017-06-28 15:23:03 +0100171
Sandrine Bailleuxe0cb1892020-08-14 15:58:50 +0200172- The patch submission rules are the following. For a patch to be approved
173 and merged in the tree, it must get:
174
175 - One ``Code-Owner-Review+1`` for each of the modules modified by the patch.
176 - A ``Maintainer-Review+1``.
177
178 In the case where a code owner could not be found for a given module,
179 ``Code-Owner-Review+1`` is substituted by ``Code-Review+1``.
180
181 In addition to these various code review labels, the patch must also get a
182 ``Verified+1``. This is usually set by the Continuous Integration (CI) bot
183 when all automated tests passed on the patch. Sometimes, some of these
184 automated tests may fail for reasons unrelated to the patch. In this case,
185 the maintainers might (after analysis of the failures) override the CI bot
186 score to certify that the patch has been correctly tested.
187
188 In the event where the CI system lacks proper tests for a patch, the patch
189 author or a reviewer might agree to perform additional manual tests
190 in their review and the reviewer incorporates the review of the additional
191 testing in the ``Code-Review+1`` or ``Code-Owner-Review+1`` as applicable to
192 attest that the patch works as expected. Where possible additional tests should
193 be added to the CI system as a follow up task. For example, for a
194 platform-dependent patch where the said platform is not available in the CI
195 system's board farm.
196
Paul Beesleyf8640672019-04-12 14:19:42 +0100197- When the changes are accepted, the :ref:`maintainers` will integrate them.
Douglas Raillardd7c21b72017-06-28 15:23:03 +0100198
Paul Beesleyf8640672019-04-12 14:19:42 +0100199 - Typically, the :ref:`maintainers` will merge the changes into the
Louis Mayencourt72ef3d42019-03-22 11:47:22 +0000200 ``integration`` branch.
Sandrine Bailleuxe0cb1892020-08-14 15:58:50 +0200201
Louis Mayencourt72ef3d42019-03-22 11:47:22 +0000202 - If the changes are not based on a sufficiently-recent commit, or if they
Paul Beesleyf8640672019-04-12 14:19:42 +0100203 cannot be automatically rebased, then the :ref:`maintainers` may rebase it
Sandrine Bailleuxd3147342020-05-12 10:36:05 +0200204 on the ``integration`` branch or ask you to do so.
Sandrine Bailleuxe0cb1892020-08-14 15:58:50 +0200205
Louis Mayencourt72ef3d42019-03-22 11:47:22 +0000206 - After final integration testing, the changes will make their way into the
Sandrine Bailleuxd3147342020-05-12 10:36:05 +0200207 ``master`` branch. If a problem is found during integration, the
208 :ref:`maintainers` will request your help to solve the issue. They may
209 revert your patches and ask you to resubmit a reworked version of them or
210 they may ask you to provide a fix-up patch.
Douglas Raillardd7c21b72017-06-28 15:23:03 +0100211
Jayanth Dodderi Chidanand32e5fa02021-08-31 12:27:48 +0100212Add Build Configurations
213------------------------
214
215- TF-A uses Jenkins tool for Continuous Integration and testing activities.
216 Various CI Jobs are deployed which run tests on every patch before being
217 merged. So each of your patches go through a series of checks before they
218 get merged on to the master branch.
219
220- ``Coverity Scan analysis`` is one of the tests we perform on our source code
221 at regular intervals. We maintain a build script ``tf-cov-make`` which contains the
222 build configurations of various platforms in order to cover the entire source
223 code being analysed by Coverity.
224
225- When you submit your patches for review containing new source files, please
226 ensure to include them for the ``Coverity Scan analysis`` by adding the
227 respective build configurations in the ``tf-cov-make`` build script.
228
229- In this section you find the details on how to append your new build
230 configurations for Coverity Scan analysis:
231
232#. We maintain a separate repository named `tf-a-ci-scripts repository`_
233 for placing all the test scripts which will be executed by the CI Jobs.
234
235#. In this repository, ``tf-cov-make`` script is located at
236 ``tf-a-ci-scripts/script/tf-coverity/tf-cov-make``
237
238#. Edit `tf-cov-make`_ script by appending all the possible build configurations with
239 the specific ``build-flags`` relevant to your platform, so that newly added
240 source files get built and analysed by Coverity.
241
242#. For better understanding follow the below specified examples listed in the
243 ``tf-cov-make`` script.
244
Jayanth Dodderi Chidanandef7d6f32021-09-09 14:23:10 +0100245.. code:: shell
Jayanth Dodderi Chidanand32e5fa02021-08-31 12:27:48 +0100246
247 Example 1:
248 #Intel
249 make PLAT=stratix10 $(common_flags) all
250 make PLAT=agilex $(common_flags) all
251
252- In the above example there are two different SoCs ``stratix`` and ``agilex``
253 under the Intel platform and the build configurations has been added suitably
254 to include most of their source files.
255
Jayanth Dodderi Chidanandef7d6f32021-09-09 14:23:10 +0100256.. code:: shell
Jayanth Dodderi Chidanand32e5fa02021-08-31 12:27:48 +0100257
258 Example 2:
259 #Hikey
260 make PLAT=hikey $(common_flags) ${TBB_OPTIONS} ENABLE_PMF=1 all
261 make PLAT=hikey960 $(common_flags) ${TBB_OPTIONS} all
262 make PLAT=poplar $(common_flags) all
263
264- In this case for ``Hikey`` boards additional ``build-flags`` has been included
265 along with the ``commom_flags`` to cover most of the files relevant to it.
266
267- Similar to this you can still find many other different build configurations
268 of various other platforms listed in the ``tf-cov-make`` script. Kindly refer
269 them and append your build configurations respectively.
270
Julius Wernercece91a2019-04-18 16:47:46 -0700271Binary Components
272-----------------
273
274- Platforms may depend on binary components submitted to the `Trusted Firmware
275 binary repository`_ if they require code that the contributor is unable or
276 unwilling to open-source. This should be used as a rare exception.
277- All binary components must follow the contribution guidelines (in particular
278 licensing rules) outlined in the `readme.rst <tf-binaries-readme_>`_ file of
279 the binary repository.
280- Binary components must be restricted to only the specific functionality that
281 cannot be open-sourced and must be linked into a larger open-source platform
282 port. The majority of the platform port must still be implemented in open
283 source. Platform ports that are merely a thin wrapper around a binary
284 component that contains all the actual code will not be accepted.
285- Only platform port code (i.e. in the ``plat/<vendor>`` directory) may rely on
286 binary components. Generic code must always be fully open-source.
287
Douglas Raillardd7c21b72017-06-28 15:23:03 +0100288--------------
289
Jayanth Dodderi Chidanand32e5fa02021-08-31 12:27:48 +0100290*Copyright (c) 2013-2021, Arm Limited and Contributors. All rights reserved.*
Douglas Raillardd7c21b72017-06-28 15:23:03 +0100291
Chris Kay98b26e32020-12-09 16:52:03 +0000292.. _Conventional Commits: https://www.conventionalcommits.org/en/v1.0.0
Louis Mayencourt72ef3d42019-03-22 11:47:22 +0000293.. _developer.trustedfirmware.org: https://developer.trustedfirmware.org
Sandrine Bailleuxd3147342020-05-12 10:36:05 +0200294.. _review.trustedfirmware.org: https://review.trustedfirmware.org
Louis Mayencourt72ef3d42019-03-22 11:47:22 +0000295.. _issue: https://developer.trustedfirmware.org/project/board/1/
John Tsichritzis2fd3d922019-05-28 13:13:39 +0100296.. _Trusted Firmware-A: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git
Douglas Raillardd7c21b72017-06-28 15:23:03 +0100297.. _Git guidelines: http://git-scm.com/book/ch5-2.html
Louis Mayencourt72ef3d42019-03-22 11:47:22 +0000298.. _Gerrit Uploading Changes documentation: https://review.trustedfirmware.org/Documentation/user-upload.html
299.. _Gerrit Signed-off-by Lines guidelines: https://review.trustedfirmware.org/Documentation/user-signedoffby.html
300.. _Gerrit Change-Ids documentation: https://review.trustedfirmware.org/Documentation/user-changeid.html
Sandrine Bailleuxd3147342020-05-12 10:36:05 +0200301.. _TF-A Tests: https://trustedfirmware-a-tests.readthedocs.io
Julius Wernercece91a2019-04-18 16:47:46 -0700302.. _Trusted Firmware binary repository: https://review.trustedfirmware.org/admin/repos/tf-binaries
303.. _tf-binaries-readme: https://git.trustedfirmware.org/tf-binaries.git/tree/readme.rst
Sandrine Bailleuxd3147342020-05-12 10:36:05 +0200304.. _TF-A mailing list: https://lists.trustedfirmware.org/mailman/listinfo/tf-a
Jayanth Dodderi Chidanand32e5fa02021-08-31 12:27:48 +0100305.. _tf-a-ci-scripts repository: https://git.trustedfirmware.org/ci/tf-a-ci-scripts.git/
306.. _tf-cov-make: https://git.trustedfirmware.org/ci/tf-a-ci-scripts.git/tree/script/tf-coverity/tf-cov-make