[Skiboot] [PATCH v2] libpore: Sync p8 files, remove erroneous "IBM Confidential"
Stewart Smith
stewart at linux.ibm.com
Tue Nov 27 14:50:50 AEDT 2018
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 at us.ibm.com>
Signed-off-by: Stewart Smith <stewart at linux.ibm.com>
---
Changes since v1:
- fix some fun build warnings because in skiboot we turn those on.
libpore/fapi_sbe_common.H | 6 ++++--
libpore/p8_pore_table_gen_api.H | 6 ++++--
libpore/p8_pore_table_gen_api_fixed.C | 6 ++++--
libpore/p8_pore_table_static_data.c | 6 ++++--
libpore/pore_inline.h | 8 +++++---
libpore/pore_inline_assembler.c | 10 ++++++----
libpore/sbe_xip_image.c | 23 ++++++++++++++---------
libpore/sbe_xip_image.h | 13 +++++++++----
8 files changed, 50 insertions(+), 28 deletions(-)
diff --git a/libpore/fapi_sbe_common.H b/libpore/fapi_sbe_common.H
index fa8cc7107753..cf0e76f92aae 100644
--- a/libpore/fapi_sbe_common.H
+++ b/libpore/fapi_sbe_common.H
@@ -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. */
@@ -28,7 +30,7 @@
//------------------------------------------------------------------------------
// *! (C) Copyright International Business Machines Corp. 2011
// *! All Rights Reserved -- Property of IBM
-// *! *** IBM Confidential ***
+// *! *** ***
//------------------------------------------------------------------------------
// *! OWNER NAME : Email:
diff --git a/libpore/p8_pore_table_gen_api.H b/libpore/p8_pore_table_gen_api.H
index 9846dfdd2157..63081ca50388 100644
--- a/libpore/p8_pore_table_gen_api.H
+++ b/libpore/p8_pore_table_gen_api.H
@@ -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. */
@@ -24,7 +26,7 @@
/*------------------------------------------------------------------------------*/
/* *! (C) Copyright International Business Machines Corp. 2012 */
/* *! All Rights Reserved -- Property of IBM */
-/* *! *** IBM Confidential *** */
+/* *! *** *** */
/*------------------------------------------------------------------------------*/
/* *! TITLE : p8_pore_table_gen_api.H */
/* *! DESCRIPTION : Contains all external APIs used by firmware (PHYP) to */
diff --git a/libpore/p8_pore_table_gen_api_fixed.C b/libpore/p8_pore_table_gen_api_fixed.C
index b609b0d6db1c..9e816ecd11b8 100644
--- a/libpore/p8_pore_table_gen_api_fixed.C
+++ b/libpore/p8_pore_table_gen_api_fixed.C
@@ -5,7 +5,9 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* COPYRIGHT International Business Machines Corp. 2013,2014 */
+/* Contributors Listed Below - COPYRIGHT 2013,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. 2012 */
/* *! All Rights Reserved -- Property of IBM */
-/* *! *** IBM Confidential *** */
+/* *! *** *** */
/*------------------------------------------------------------------------------*/
/* *! TITLE : p8_pore_table_gen_api_fixed.C */
/* *! DESCRIPTION : PORE SLW table generaion APIs */
diff --git a/libpore/p8_pore_table_static_data.c b/libpore/p8_pore_table_static_data.c
index 49b9d9a147cc..d6c35b88027f 100644
--- a/libpore/p8_pore_table_static_data.c
+++ b/libpore/p8_pore_table_static_data.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. 2012 */
/* *! All Rights Reserved -- Property of IBM */
-/* *! *** IBM Confidential *** */
+/* *! *** *** */
/*------------------------------------------------------------------------------*/
/* *! TITLE : p8_pore_table_static_data */
/* *! DESCRIPTION : Global static data declaration file. */
diff --git a/libpore/pore_inline.h b/libpore/pore_inline.h
index 214fca6f7557..1af9199cfce7 100644
--- a/libpore/pore_inline.h
+++ b/libpore/pore_inline.h
@@ -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. */
@@ -28,7 +30,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 **
@@ -291,7 +293,7 @@ typedef uint32_t PoreInlineLocation;
/// PORE inline assembler context
///
/// See the documentation page \ref pore_inline_assembler and the function
-/// pore_inline_context_create() for further details.
+/// pore_inline_context_create() for futher details.
typedef struct {
diff --git a/libpore/pore_inline_assembler.c b/libpore/pore_inline_assembler.c
index 6c8e303eef29..5747c6f4df7b 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)
diff --git a/libpore/sbe_xip_image.c b/libpore/sbe_xip_image.c
index 3f32d653aed2..2b05a0b90e9e 100644
--- a/libpore/sbe_xip_image.c
+++ b/libpore/sbe_xip_image.c
@@ -5,7 +5,9 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* COPYRIGHT International Business Machines Corp. 2012,2014 */
+/* Contributors Listed Below - COPYRIGHT 2012,2015 */
+/* [+] 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. */
@@ -20,12 +22,12 @@
/* permissions and limitations under the License. */
/* */
/* IBM_PROLOG_END_TAG */
-// $Id: sbe_xip_image.c,v 1.28 2013/12/11 00:12:41 bcbrock Exp $
+// $Id: sbe_xip_image.c,v 1.31 2015/07/29 23:40:06 cmolsen Exp $
// $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/sbe/sbe_xip_image.c,v $
//-----------------------------------------------------------------------------
// *! (C) Copyright International Business Machines Corp. 2011
// *! All Rights Reserved -- Property of IBM
-// *! *** IBM Confidential ***
+// *! *** ***
//-----------------------------------------------------------------------------
// *! OWNER NAME: Bishop Brock Email: bcbrock at us.ibm.com
//------------------------------------------------------------------------------
@@ -578,7 +580,7 @@ xipPutSection(const void* i_image,
SbeXipSection* i_hostSection)
{
int rc;
- SbeXipSection *imageSection;
+ SbeXipSection *imageSection = NULL;
rc = xipGetSectionPointer(i_image, i_sectionId, &imageSection);
@@ -596,7 +598,7 @@ XIP_STATIC int
xipSetSectionOffset(void* io_image, const int i_section,
const uint32_t i_offset)
{
- SbeXipSection* section;
+ SbeXipSection* section = NULL;
int rc;
rc = xipGetSectionPointer(io_image, i_section, §ion);
@@ -612,7 +614,7 @@ xipSetSectionOffset(void* io_image, const int i_section,
XIP_STATIC int
xipSetSectionSize(void* io_image, const int i_section, const uint32_t i_size)
{
- SbeXipSection* section;
+ SbeXipSection* section = NULL;
int rc;
rc = xipGetSectionPointer(io_image, i_section, §ion);
@@ -1711,7 +1713,7 @@ sbe_xip_get_section(const void* i_image,
SbeXipSection* o_hostSection)
{
int rc;
- SbeXipSection *imageSection;
+ SbeXipSection *imageSection = NULL;
rc = xipGetSectionPointer(i_image, i_sectionId, &imageSection);
@@ -1841,6 +1843,7 @@ xipGetHaltMap(void* io_image,
void* io_arg)
{
int rc;
+
GetHaltStruct* s = (GetHaltStruct*)io_arg;
(void)io_image;
@@ -2257,7 +2260,8 @@ sbe_xip_append(void* io_image,
SbeXipSection section, initialSection;
int rc, final, restoreOnError;
void* hostAddress;
- uint32_t pad, initialSize;
+ uint32_t pad;
+ uint32_t initialSize = 0;
do {
restoreOnError = 0;
@@ -2493,8 +2497,9 @@ sbe_xip_translate_header(SbeXipHeader* o_dest, const SbeXipHeader* i_src)
o_dest->iv_magic = xipRevLe64(i_src->iv_magic);
o_dest->iv_entryOffset = xipRevLe64(i_src->iv_entryOffset);
o_dest->iv_linkAddress = xipRevLe64(i_src->iv_linkAddress);
+ o_dest->iv_ptsVersion = xipRevLe64(i_src->iv_ptsVersion);
- for (i = 0; i < 5; i++) {
+ for (i = 0; i < 4; i++) {
o_dest->iv_reserved64[i] = 0;
}
diff --git a/libpore/sbe_xip_image.h b/libpore/sbe_xip_image.h
index 955f3dcfdbb3..0b871a769949 100644
--- a/libpore/sbe_xip_image.h
+++ b/libpore/sbe_xip_image.h
@@ -5,7 +5,9 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* COPYRIGHT International Business Machines Corp. 2012,2014 */
+/* Contributors Listed Below - COPYRIGHT 2012,2015 */
+/* [+] 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. */
@@ -23,12 +25,12 @@
#ifndef __SBE_XIP_IMAGE_H
#define __SBE_XIP_IMAGE_H
-// $Id: sbe_xip_image.h,v 1.24 2013/06/13 20:26:33 bcbrock Exp $
+// $Id: sbe_xip_image.h,v 1.26 2015/07/29 23:40:17 cmolsen Exp $
// $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/sbe/sbe_xip_image.h,v $
//-----------------------------------------------------------------------------
// *! (C) Copyright International Business Machines Corp. 2011
// *! All Rights Reserved -- Property of IBM
-// *! *** IBM Confidential ***
+// *! *** ***
//-----------------------------------------------------------------------------
// *! OWNER NAME: Bishop Brock Email: bcbrock at us.ibm.com
//------------------------------------------------------------------------------
@@ -341,8 +343,11 @@ typedef struct {
/// address
uint64_t iv_linkAddress;
+ /// PTS version
+ uint64_t iv_ptsVersion;
+
/// Reserved for future expansion
- uint64_t iv_reserved64[5];
+ uint64_t iv_reserved64[4];
//////////////////////////////////////////////////////////////////////
// Section Table - 4-byte aligned; 16 entries
--
2.19.1
More information about the Skiboot
mailing list