Skip to content

Commit cbedccf

Browse files
Prachi Guptawilbryan
authored andcommitted
rt_xstop_analysis: compile all of firdata on gpe0
Change-Id: I804cdf63879a2b80c9e14149e45ee665240c4a88 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/43244 Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: Brian J. Stegmiller <bjs@us.ibm.com> Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com> Reviewed-by: ILYA SMIRNOV <ismirno@us.ibm.com> Reviewed-by: Andres A. Lugo-Reyes <aalugore@us.ibm.com> Reviewed-by: William A. Bryan <wilbryan@us.ibm.com>
1 parent f301809 commit cbedccf

31 files changed

+149
-592
lines changed

src/common/gpe_export.h

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,20 @@ typedef struct gpe_shared_data
6060
{
6161
uint32_t nest_freq_div; // Nest freq / 4
6262
uint32_t spipss_spec_p9; // Which APSS spec to use
63-
uint32_t reserved[62];
63+
uint32_t fir_heap_buffer_ptr;
64+
uint32_t fir_params_buffer_ptr;
65+
uint32_t reserved[60];
6466
} gpe_shared_data_t;
6567

68+
69+
#define HOMER_FIR_PARM_SIZE (3 * 1024)
70+
71+
/* This size has to agree with the size _FIR_PARMS_SECTION_SIZE defined in the */
72+
/* OCC linker command file. */
73+
#define FIR_PARMS_SECTION_SIZE 0x1000
74+
75+
// This size has to agree with the size _FIR_HEAP_SECTION_SIZE defined in the
76+
// OCC linker command file.
77+
#define FIR_HEAP_SECTION_SIZE 0x3000
78+
6679
#endif //_GPE_EXPORT_H

src/occ_405/cmdh/cmdh_fsp.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
#include "cmdh_mnfg_intf.h"
3737
#include "cmdh_tunable_parms.h"
3838
#include "cmdh_snapshot.h"
39-
#include "scom.h"
4039
#include "homer.h"
4140

4241
// OCB Channel Setup Defines

src/occ_405/dcom/dcom.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
#include <proc_pstate.h>
4040
#include <amec_data.h>
4141
#include <amec_sys.h>
42-
#include "scom.h"
4342
#include "pss_constants.h"
4443

4544
extern uint8_t G_occ_interrupt_type;

src/occ_405/homer.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,15 @@
6767
#define PPMR_OFFSET_HOMER 0x00300000 // PPMR image HOMER offset
6868
#define PPMR_ADDRESS_HOMER (HOMER_BASE_ADDRESS+PPMR_OFFSET_HOMER) // PPMR image memory address
6969

70+
extern uint32_t G_fir_master;
71+
#define OCC_SET_FIR_MASTER(_fm_t) (G_fir_master = _fm_t)
72+
#define OCC_IS_FIR_MASTER() ((G_fir_master == FIR_OCC_IS_FIR_MASTER) ? TRUE : FALSE)
73+
74+
enum fir_master
75+
{
76+
FIR_OCC_NOT_FIR_MASTER = 0x00000000,
77+
FIR_OCC_IS_FIR_MASTER = 0x00000001
78+
};
7079

7180
// Version(s) of HOMER host data currently supported
7281
typedef enum homer_version

src/occ_405/img_defs.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,6 @@ APP_INCLUDES = -I$(IMAGE_SRCDIR)/rtls \
234234
-I$(IMAGE_SRCDIR)/dcom \
235235
-I$(IMAGE_SRCDIR)/amec \
236236
-I$(IMAGE_SRCDIR)/cent \
237-
-I$(IMAGE_SRCDIR)/firdata \
238237
-I$(IMAGE_SRCDIR)/dimm \
239238
-I$(IMAGE_SRCDIR)/mem \
240239
-I$(IMAGE_SRCDIR)/lock \

src/occ_405/main.c

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@
5252
#include <homer.h>
5353
#include <amec_health.h>
5454
#include <amec_freq.h>
55-
#include "scom.h"
56-
#include <fir_data_collect.h>
5755
#include <pss_service_codes.h>
5856
#include <dimm.h>
5957
#include "occhw_shared_data.h"
@@ -62,11 +60,7 @@
6260
#include <p9_pstates_occ.h>
6361
#include <wof.h>
6462
#include "pgpe_service_codes.h"
65-
#include <native.h>
66-
#include <ast_mboxdd.h>
67-
#include <pnor_mboxdd.h>
6863
#include <common.h>
69-
pnorMbox_t l_pnorMbox;
7064

7165
extern uint32_t __ssx_boot; // Function address is 32 bits
7266
extern uint32_t G_occ_phantom_critical_count;
@@ -154,6 +148,11 @@ void create_tlb_entry(uint32_t address, uint32_t size);
154148
//mode interrupt handler
155149
SSX_IRQ_FAST2FULL(pmc_hw_error_fast, pmc_hw_error_isr);
156150

151+
152+
FIR_HEAP_BUFFER(uint8_t G_fir_heap[FIR_HEAP_SECTION_SIZE]);
153+
FIR_PARMS_BUFFER(uint8_t G_fir_data_parms[FIR_PARMS_SECTION_SIZE]);
154+
uint32_t G_fir_master = FIR_OCC_NOT_FIR_MASTER;
155+
157156
/*
158157
* Function Specification
159158
*
@@ -2062,6 +2061,7 @@ int main(int argc, char **argv)
20622061
homer_log_access_error(l_homerrc,
20632062
l_ssxrc,
20642063
l_occ_int_type);
2064+
20652065
// Get the FIR Master indicator
20662066
uint32_t l_fir_master = FIR_OCC_NOT_FIR_MASTER;
20672067
l_homerrc = homer_hd_map_read_unmap(HOMER_FIR_MASTER,
@@ -2104,6 +2104,10 @@ int main(int argc, char **argv)
21042104
(uint32_t)&G_fir_data_parms[0]);
21052105
}
21062106

2107+
//Set the fir_heap and fir_params pointer in the shared buffer
2108+
G_shared_gpe_data.fir_heap_buffer_ptr = (uint32_t)G_fir_heap;
2109+
G_shared_gpe_data.fir_params_buffer_ptr = (uint32_t)G_fir_data_parms;
2110+
21072111
//TODO: RTC 134619: Currently causes an SSX Panic due to SSX believing the
21082112
// interrupt is not owned by the 405. The fix is to update
21092113
// both occhw_interrupts.h and ssx_app_cfg.h. The change

src/occ_405/occLinkInputFile

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ INPUT ( amec_amester.o
1818
amec_slave_smh.o
1919
amec_tasks.o
2020
apss.o
21-
ast_mboxdd.o
2221
avsbus.o
2322
centaur_control.o
2423
centaur_data.o
@@ -45,7 +44,6 @@ INPUT ( amec_amester.o
4544
ffdc.o
4645
homer.o
4746
ll_ffdc.o
48-
lpc.o
4947
lock.o
5048
main.o
5149
memory.o
@@ -63,7 +61,6 @@ INPUT ( amec_amester.o
6361
occhw_ocb.o
6462
occhw_pba.o
6563
pgpe_interface.o
66-
pnor_mboxdd.o
6764
ppc405_boot.o
6865
ppc405_breakpoint.o
6966
ppc405_cache_core.o
@@ -82,7 +79,6 @@ INPUT ( amec_amester.o
8279
reset.o
8380
rtls_tables.o
8481
rtls.o
85-
scom.o
8682
sensor_inband_cmd.o
8783
sensor_info.o
8884
sensor_main_memory.o
@@ -102,13 +98,4 @@ INPUT ( amec_amester.o
10298
threadSch.o
10399
timer.o
104100
trac_interface.o
105-
wof.o
106-
firData.o
107-
fir_data_collect.o
108-
fsi.o
109-
native.o
110-
pnor_util.o
111-
scom_trgt.o
112-
scom_util.o
113-
scom_addr_util.o
114-
sbe_fifo.o)
101+
wof.o)

src/occ_405/proc/proc_pstate.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
#include "cmdh_fsp_cmds.h"
3535
#include "proc_data.h"
3636
#include "proc_pstate.h"
37-
#include "scom.h"
3837
#include "homer.h"
3938
#include <amec_freq.h>
4039
#include <common.h>

src/occ_405/scom.c

Lines changed: 0 additions & 185 deletions
This file was deleted.

src/occ_405/scom.h

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)