Merge pull request #2227 from kgdeepak/ima-update
Add Centaur units for P9 DTS files
diff --git a/doc/release-notes/v2.0.5.rst b/doc/release-notes/v2.0.5.rst
new file mode 100644
index 0000000..873e52d
--- /dev/null
+++ b/doc/release-notes/v2.0.5.rst
@@ -0,0 +1,57 @@
+Release Notes for OpenPower Firmware v2.0.5
+===========================================
+
+op-build v2.0.5 was released on Thursday July 19th, 2018 and replaces op-build v2.0.4 as the current stable release in the 2.0.x series.
+
+It is recommended that v2.0.4 be used over any previous v2.0.x version due to the bug fixes contained within.
+
+Updated Packages
+----------------
+
++---------------------+---------------------+---------------------+----------------------------------------------------+
+| Package | Old Version | New Version | Platforms |
++=====================+=====================+=====================+====================================================+
+| skiboot | v6.0.5 | v6.0.6 | openpower_mambo, firestone, firenze, garrison, |
+| | | | zaius, p9dsu, palmetto, pseries, vesnin, |
+| | | | witherspoon, habanero, openpower_p9_mambo, zz, |
+| | | | barreleye, romulus |
++---------------------+---------------------+---------------------+----------------------------------------------------+
+
+Skiboot changes
+---------------
+
+- phb4/CAPI: Reallocate PEC2 DMA-Read engines to improve GPU-Direct bandwidth
+
+ We reallocate additional 16/8 DMA-Read engines allocated to stack0/1
+ on PEC2 respectively. This is needed to improve bandwidth available to
+ the Mellanox CX5 adapter when trying to read GPU memory (GPU-Direct).
+
+ If kernel cxl driver indicates a request to allocate maximum possible
+ DMA read engines when calling enable_capi_mode() and card is attached
+ to PEC2/stack0 slot then we assume its a Mellanox CX5 adapter. We then
+ allocate additional 16/8 extra DMA read engines to stack0 and stack1
+ respectively on PEC2. This is done by populating the
+ XPEC_PCI_PRDSTKOVR and XPEC_NEST_READ_STACK_OVERRIDE as suggested by
+ the h/w team.
+- phb4: Disable nodal scoped DMA accesses when PB pump mode is enabled
+
+ By default when a PCIe device issues a read request via the PHB it is first
+ issued with nodal scope. When accessing GPU memory the NPU does not know at the
+ time of response if the requested memory page is off node or not. Therefore
+ every read of GPU memory by a PHB is retried with larger scope which introduces
+ bandwidth and latency issues.
+
+ On smaller boxes which have pump mode enabled nodal and group scoped reads are
+ treated the same and both types of request are broadcast to one chip. Therefore
+ we can avoid the retry by disabling nodal scope on the PHB for these boxes. On
+ larger boxes nodal (single chip) and group (multiple chip) scoped reads are
+ treated differently. Therefore we avoid disabling nodal scope on large boxes
+ which have pump mode disabled to avoid all PHB requests being broadcast to
+ multiple chips.
+- npu2/hw-procedures: Enable parity and credit overflow checks
+
+ Enable these error checking features by setting the appropriate bits in
+ our one-off initialization of each "NTL Misc Config 2" register.
+
+ The exception is NDL RX parity checking, which should be disabled during
+ the link training procedures.
diff --git a/openpower/configs/habanero_defconfig b/openpower/configs/habanero_defconfig
index 765efa5..0cea81c 100644
--- a/openpower/configs/habanero_defconfig
+++ b/openpower/configs/habanero_defconfig
@@ -43,7 +43,7 @@
BR2_HOSTBOOT_P8_CONFIG_FILE="habanero.config"
BR2_OPENPOWER_MACHINE_XML_TARGET_TYPES_OPENPOWER_XML=y
BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="habanero-xml"
-BR2_OPENPOWER_MACHINE_XML_VERSION="6a78496c286e284719a8201148a5088030b897de"
+BR2_OPENPOWER_MACHINE_XML_VERSION="acb73cf1f3d46e375abea1511d77427b568d87fb"
BR2_OPENPOWER_MACHINE_XML_FILENAME="habanero.xml"
BR2_OPENPOWER_SYSTEM_XML_FILENAME="HABANERO_hb.system.xml"
BR2_OPENPOWER_MRW_XML_FILENAME="HABANERO_hb.mrw.xml"
diff --git a/openpower/configs/palmetto_defconfig b/openpower/configs/palmetto_defconfig
index 5837e39..7a836bd 100644
--- a/openpower/configs/palmetto_defconfig
+++ b/openpower/configs/palmetto_defconfig
@@ -40,7 +40,7 @@
BR2_OPENPOWER_POWER8=y
BR2_HOSTBOOT_P8_CONFIG_FILE="palmetto.config"
BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="palmetto-xml"
-BR2_OPENPOWER_MACHINE_XML_VERSION="c6f563966e9fadc4fb60194c064b2310c9b916b1"
+BR2_OPENPOWER_MACHINE_XML_VERSION="e0fae90fcd61b0c8a0df1d1b7e36f1af68c0bc12"
BR2_OPENPOWER_MACHINE_XML_FILENAME="palmetto.xml"
BR2_OPENPOWER_SYSTEM_XML_FILENAME="PALMETTO_hb.system.xml"
BR2_OPENPOWER_MRW_XML_FILENAME="PALMETTO_hb.mrw.xml"