summaryrefslogtreecommitdiffstats
path: root/libpore/pore_inline_assembler.c
diff options
context:
space:
mode:
authorStewart Smith <stewart@linux.ibm.com>2018-11-27 10:25:02 +1100
committerStewart Smith <stewart@linux.ibm.com>2018-11-28 17:48:46 +1100
commit87b436c32ac86aa159b20d5c9545fd0c24a54bdd (patch)
treeadc54f34b222cc54dd6583b5f2e5505f6bf27721 /libpore/pore_inline_assembler.c
parentacb0f21605005a1be9d478aad5a3d3bc5c0aef63 (diff)
downloadtalos-skiboot-87b436c32ac86aa159b20d5c9545fd0c24a54bdd.tar.gz
talos-skiboot-87b436c32ac86aa159b20d5c9545fd0c24a54bdd.zip
libpore: Sync p8 files, remove erroneous "IBM Confidential"
We also had some rogue "IBM Confidential" strings that we failed to remove with the original change of Copyright headers for open sourcing. Do this by synchronising with the hostboot copy of the code, which removed the Confidential string when their copyright headers changed for initial open sourcing of the code back in 2014. See hostboot commit 3bcf5b7982bb8a2d9227dbff7be4ff2ce5fec05c where the HWP copyright headers were updated. We likely missed this as we did a similar process inside the skiboot repository, but likely only on the (C) headers themselves. The libpore changes that we were missing *look* minor, but we need to throw some testing at them at least, as there *are* changes that we were missing. We also have to make a minor modification (being sent upstream) to avoid a compiler warning of always false comparison (<0 on unsigned int) Reported-by: Dawn Sylvia <ddzubak@us.ibm.com> Reviewed-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
Diffstat (limited to 'libpore/pore_inline_assembler.c')
-rw-r--r--libpore/pore_inline_assembler.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/libpore/pore_inline_assembler.c b/libpore/pore_inline_assembler.c
index 6c8e303e..5747c6f4 100644
--- a/libpore/pore_inline_assembler.c
+++ b/libpore/pore_inline_assembler.c
@@ -5,7 +5,9 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* COPYRIGHT International Business Machines Corp. 2012,2014 */
+/* Contributors Listed Below - COPYRIGHT 2012,2014 */
+/* [+] International Business Machines Corp. */
+/* */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
@@ -25,7 +27,7 @@
//-----------------------------------------------------------------------------
// *! (C) Copyright International Business Machines Corp. 2013
// *! All Rights Reserved -- Property of IBM
-// *! *** IBM Confidential ***
+// *! *** ***
//-----------------------------------------------------------------------------
// ** WARNING : This file is maintained as part of the OCC firmware. Do **
@@ -890,7 +892,7 @@ pore_inline_instruction3(PoreInlineContext *ctx, int opcode, uint32_t operand,
// Assemble WAIT
//
// The cycle count must be an unsigned 24-bit immediate otherwise the error
-// PORE_INLINE_UINT24_REQUIRED is signaled. PGAS requires that HALT be used
+// PORE_INLINE_UINT24_REQUIRED is signalled. PGAS requires that HALT be used
// if the intention is to halt
int
@@ -914,7 +916,7 @@ pore_WAITS(PoreInlineContext *ctx, uint32_t cycles)
// Assemble HOOKI
//
// The hook index must be an unsigned 24-bit immediate otherwise the error
-// PORE_INLINE_UINT24_REQUIRED is signaled.
+// PORE_INLINE_UINT24_REQUIRED is signalled.
int
pore_HOOKI(PoreInlineContext *ctx, uint32_t index, uint64_t imm)
OpenPOWER on IntegriCloud