Merge "Apply compile-time check for AArch64-only cores" into integration
diff --git a/docs/conf.py b/docs/conf.py
index 697b871..64f1243 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -23,7 +23,7 @@
# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
-extensions = []
+extensions = ['sphinx.ext.autosectionlabel']
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
@@ -54,6 +54,9 @@
with open('global_substitutions.txt', 'r') as subs:
rst_prolog = subs.read()
+# Minimum version of sphinx required
+needs_sphinx = '2.0'
+
# -- Options for HTML output -------------------------------------------------
# Don't show the "Built with Sphinx" footer
@@ -75,3 +78,8 @@
'prev_next_buttons_location': 'both', # Top and bottom of the page
'style_external_links': True # Display an icon next to external links
}
+
+# -- Options for autosectionlabel --------------------------------------------
+
+# Only generate automatic section labels for document titles
+autosectionlabel_maxdepth = 1
\ No newline at end of file
diff --git a/docs/index.rst b/docs/index.rst
index 4e8f17a..7ac0584 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -260,13 +260,13 @@
project and the `Acknowledgments`_ file for a list of contributors to the
project.
-Feedback and support
-~~~~~~~~~~~~~~~~~~~~
+Contact us
+~~~~~~~~~~
-Arm welcomes any feedback on TF-A. If you think you have found a security
+We welcome any feedback on TF-A. If you think you have found a security
vulnerability, please report this using the process defined in the TF-A
-`Security Center`_. For all other feedback, please use the
-`issue tracker`_.
+`Security Center`_. For all other feedback, you can use either the
+`issue tracker`_ or our `mailing list`_.
Arm licensees may contact Arm directly via their partner managers.
@@ -293,6 +293,7 @@
.. _Trusty Secure OS: https://source.android.com/security/trusty
.. _trustedfirmware.org: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git
.. _issue tracker: https://issues.trustedfirmware.org
+.. _mailing list: https://lists.trustedfirmware.org/mailman/listinfo/tf-a
.. _Security Center: ./process/security.rst
.. _license: ./license.rst
.. _Contributing Guidelines: ./process/contributing.rst
diff --git a/docs/requirements.txt b/docs/requirements.txt
new file mode 100644
index 0000000..8f95774
--- /dev/null
+++ b/docs/requirements.txt
@@ -0,0 +1,2 @@
+sphinx>=2.0.0
+sphinx-rtd-theme>=0.4.3
\ No newline at end of file
diff --git a/drivers/arm/gic/v3/gicv3_main.c b/drivers/arm/gic/v3/gicv3_main.c
index cf92f10..a94dbf6 100644
--- a/drivers/arm/gic/v3/gicv3_main.c
+++ b/drivers/arm/gic/v3/gicv3_main.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2015-2019, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -265,6 +265,10 @@
write_scr_el3(scr_el3 & (~SCR_NS_BIT));
isb();
+ /* Write the secure ICC_SRE_EL1 register */
+ write_icc_sre_el1(ICC_SRE_SRE_BIT);
+ isb();
+
/* Program the idle priority in the PMR */
write_icc_pmr_el1(GIC_PRI_MASK);
@@ -274,9 +278,6 @@
/* Enable Group1 Secure interrupts */
write_icc_igrpen1_el3(read_icc_igrpen1_el3() |
IGRPEN1_EL3_ENABLE_G1S_BIT);
-
- /* Write the secure ICC_SRE_EL1 register */
- write_icc_sre_el1(ICC_SRE_SRE_BIT);
isb();
}
diff --git a/readme.rst b/readme.rst
index 58be43f..6846419 100644
--- a/readme.rst
+++ b/readme.rst
@@ -282,13 +282,13 @@
project and the `Acknowledgments`_ file for a list of contributors to the
project.
-Feedback and support
-~~~~~~~~~~~~~~~~~~~~
+Contact us
+~~~~~~~~~~
-Arm welcomes any feedback on TF-A. If you think you have found a security
+We welcome any feedback on TF-A. If you think you have found a security
vulnerability, please report this using the process defined in the TF-A
-`Security Center`_. For all other feedback, please use the
-`issue tracker`_.
+`Security Center`_. For all other feedback, you can use either the
+`issue tracker`_ or our `mailing list`_.
Arm licensees may contact Arm directly via their partner managers.
@@ -328,6 +328,7 @@
.. _Trusty Secure OS: https://source.android.com/security/trusty
.. _trustedfirmware.org: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git
.. _issue tracker: https://developer.trustedfirmware.org/project/board/1/
+.. _mailing list: https://lists.trustedfirmware.org/mailman/listinfo/tf-a
.. _Security Center: ./docs/process/security.rst
.. _license: ./license.rst
.. _Contributing Guidelines: ./docs/process/contributing.rst