Skip to content

Commit 358d588

Browse files
author
Igor Bagnucki
committed
Fix compilation errors part 3
Signed-off-by: Igor Bagnucki <[email protected]>
1 parent 0b0f708 commit 358d588

File tree

2 files changed

+2
-61
lines changed

2 files changed

+2
-61
lines changed

src/include/cpu/power/istep_6.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@ void istep_6_11(void);
8181
#define OCB_PIB_OCBCSR0_OCB_STREAM_MODE (4)
8282
#define OCB_PIB_OCBCSR0_OCB_STREAM_TYPE (5)
8383

84+
#define MASK_WOR_INCR (5)
85+
8486
#define PU_PBABAR0 (0x05012B00)
8587
#define PU_PBABAR1 (0x05012B01)
8688
#define PU_PBABAR2 (0x05012B02)

src/soc/ibm/power9/istep_6_11.c

Lines changed: 0 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -358,64 +358,3 @@ static void put_ocb_indirect(
358358
write_scom(PU_OCB_PIB_OCBDR0, io_ocb_buffer[l_index]);
359359
}
360360
}
361-
362-
static void get_ocb_indirect(
363-
const uint32_t i_ocb_req_length,
364-
const uint32_t i_oci_address,
365-
uint64_t* io_ocb_buffer)
366-
{
367-
write_scom(PU_OCB_PIB_OCBAR0, i_oci_address << 32);
368-
for(uint32_t l_loopCount = 0; l_loopCount < i_ocb_req_length; l_loopCount++)
369-
{
370-
io_ocb_buffer[l_loopCount] = read_scom(PU_OCB_PIB_OCBDR0);
371-
}
372-
}
373-
374-
static void p9_pm_ocb_indir_access(
375-
const p9ocb::PM_OCB_ACCESS_OP i_ocb_op,
376-
const uint32_t i_ocb_req_length,
377-
const uint32_t i_oci_address,
378-
uint64_t* io_ocb_buffer)
379-
{
380-
write_scom(PU_OCB_PIB_OCBAR0, i_oci_address << 32);
381-
if(i_ocb_op == p9ocb::OCB_PUT)
382-
{
383-
uint64_t ocb_pib = read_scom(PU_OCB_PIB_OCBCSR0_RO);
384-
if((ocb_pib & OCB_PIB_OCBCSR0_OCB_STREAM_MODE)
385-
&& (ocb_pib & OCB_PIB_OCBCSR0_OCB_STREAM_TYPE))
386-
{
387-
uint64_t stream_push_control = read_scom(PU_OCB_OCI_OCBSHCS0_SCOM);
388-
if (stream_push_control & OCB_OCI_OCBSHCS0_PUSH_ENABLE)
389-
for(uint8_t l_counter = 0; l_counter < 4; l_counter++;)
390-
{
391-
if (!(stream_push_control & OCB_OCI_OCBSHCS0_PUSH_FULL))
392-
{
393-
break;
394-
}
395-
// Hostboot has delay of 0 here
396-
wait_us(1, false);
397-
stream_push_control = read_scom(PU_OCB_OCI_OCBSHCS0_SCOM);
398-
}
399-
}
400-
for(uint32_t l_index = 0; l_index < i_ocb_req_length; l_index++)
401-
{
402-
l_data64.insertFromRight(io_ocb_buffer[l_index], 0, 64);
403-
write_scom(PU_OCB_PIB_OCBDR0, l_data64);
404-
}
405-
}
406-
else if(i_ocb_op == p9ocb::OCB_GET)
407-
{
408-
for(uint32_t l_loopCount = 0; l_loopCount < i_ocb_req_length; l_loopCount++)
409-
{
410-
io_ocb_buffer[l_loopCount] = read_scom(PU_OCB_PIB_OCBDR0);
411-
}
412-
}
413-
}
414-
415-
static void p9_pm_pba_bar_config(
416-
int bar_index,
417-
int bar_address)
418-
{
419-
write_scom(PBA_BARs[bar_index], i_pba_bar_addr & 0x1FFFFFFFFFFFFFFF);
420-
write_scom(PBA_BARMSKs[bar_index], 0x300000);
421-
}

0 commit comments

Comments
 (0)