Skip to content

Commit

Permalink
Move lpc_rw to a source file
Browse files Browse the repository at this point in the history 
Moving lpc_rw to its source file to avoid code duplication
if more than one file includes lpc_utils.H.
This is mainly required by SBE to use lpc_rw
for virtual PNOR access.

Change-Id: I7de30bcbae932307e0b63d8d42ae6ce050753339
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/64296
Reviewed-by: Joachim Fenkes <fenkes@de.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/64310
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
  • Loading branch information
@Shakeebbk @crgeddes
Shakeebbk authored and crgeddes committed Sep 25, 2018
1 parent 7a6203d commit 38ef758
Show file tree
Hide file tree
Showing 3 changed files with 84 additions and 67 deletions.
3 changes: 1 addition & 2 deletions src/import/chips/p9/procedures/hwp/ffdc/p9_collect_lpc_regs.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
#include "p9_misc_scom_addresses.H"
#include "p9_misc_scom_addresses_fld.H"

const bool LPC_UTILS_TIMEOUT_FFDC = false;
#include "../perv/p9_lpc_utils.H"

static void lpc_dump(
Expand All @@ -48,7 +47,7 @@ static void lpc_dump(

for (uint32_t i = 0; i < l_nregs; i++)
{
fapi2::ReturnCode l_rc = lpc_read(i_target_chip, i_first_addr + (i * 4), l_data32);
fapi2::ReturnCode l_rc = lpc_read(i_target_chip, i_first_addr + (i * 4), l_data32, false);

if (l_rc != fapi2::FAPI2_RC_SUCCESS)
{
Expand Down
72 changes: 72 additions & 0 deletions src/import/chips/p9/procedures/hwp/perv/p9_lpc_utils.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,75 @@
/* permissions and limitations under the License. */
/* */
/* IBM_PROLOG_END_TAG */
#include "p9_lpc_utils.H"

#include "p9_perv_scom_addresses.H"
#include "p9_perv_scom_addresses_fld.H"
#include "p9_misc_scom_addresses.H"
#include "p9_misc_scom_addresses_fld.H"

fapi2::ReturnCode lpc_rw(
const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target_chip,
const uint32_t i_addr,
const bool i_read_notwrite,
const bool i_generate_ffdc,
fapi2::buffer<uint32_t>& io_data)
{
const int l_bit_offset = (i_addr & 4) << 3;
fapi2::buffer<uint64_t> l_command;
l_command.writeBit<PU_LPC_CMD_REG_RNW>(i_read_notwrite)
.insertFromRight<PU_LPC_CMD_REG_SIZE, PU_LPC_CMD_REG_SIZE_LEN>(0x4)
.insertFromRight<PU_LPC_CMD_REG_ADR, PU_LPC_CMD_REG_ADR_LEN>(i_addr);
FAPI_TRY(fapi2::putScom(i_target_chip, PU_LPC_CMD_REG, l_command), "Error writing LPC command register");

if (!i_read_notwrite)
{
fapi2::buffer<uint64_t> l_data;
l_data.insert(io_data, l_bit_offset, 32);
FAPI_TRY(fapi2::putScom(i_target_chip, PU_LPC_DATA_REG, l_data), "Error writing LPC data");
}

{
fapi2::buffer<uint64_t> l_status;
int timeout = LPC_CMD_TIMEOUT_COUNT;

while (timeout--)
{
FAPI_TRY(fapi2::getScom(i_target_chip, PU_LPC_STATUS_REG, l_status), "Error reading LPC status");

if (l_status.getBit<PU_LPC_STATUS_REG_DONE>())
{
break;
}

fapi2::delay(LPC_CMD_TIMEOUT_DELAY_NS, LPC_CMD_TIMEOUT_DELAY_CYCLE);
}

if (i_generate_ffdc)
{
FAPI_ASSERT(l_status.getBit<PU_LPC_STATUS_REG_DONE>(), fapi2::LPC_ACCESS_TIMEOUT()
.set_TARGET_CHIP(i_target_chip)
.set_COUNT(LPC_CMD_TIMEOUT_COUNT)
.set_COMMAND(l_command)
.set_DATA(io_data)
.set_STATUS(l_status),
"LPC access timed out");
}
else if (!l_status.getBit<PU_LPC_STATUS_REG_DONE>())
{
return fapi2::RC_LPC_ACCESS_TIMEOUT;
}
}

if (i_read_notwrite)
{
fapi2::buffer<uint64_t> l_data;
FAPI_TRY(fapi2::getScom(i_target_chip, PU_LPC_DATA_REG, l_data), "Error reading LPC data");
l_data.extract(io_data, l_bit_offset, 32);
}

return fapi2::FAPI2_RC_SUCCESS;

fapi_try_exit:
return fapi2::current_err;
}
76 changes: 11 additions & 65 deletions src/import/chips/p9/procedures/hwp/perv/p9_lpc_utils.H
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,85 +29,31 @@
#ifndef P9_LPC_UTILS_H_
#define P9_LPC_UTILS_H_

#include "fapi2.H"

const uint32_t LPC_CMD_TIMEOUT_DELAY_NS = 1000000;
const uint32_t LPC_CMD_TIMEOUT_DELAY_CYCLE = 1000000;
const uint32_t LPC_CMD_TIMEOUT_COUNT = 20;

static fapi2::ReturnCode lpc_rw(
fapi2::ReturnCode lpc_rw(
const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target_chip,
uint32_t i_addr, bool i_read_notwrite, fapi2::buffer<uint32_t>& io_data)
{
const int l_bit_offset = (i_addr & 4) << 3;
fapi2::buffer<uint64_t> l_command;
l_command.writeBit<PU_LPC_CMD_REG_RNW>(i_read_notwrite)
.insertFromRight<PU_LPC_CMD_REG_SIZE, PU_LPC_CMD_REG_SIZE_LEN>(0x4)
.insertFromRight<PU_LPC_CMD_REG_ADR, PU_LPC_CMD_REG_ADR_LEN>(i_addr);
FAPI_TRY(fapi2::putScom(i_target_chip, PU_LPC_CMD_REG, l_command), "Error writing LPC command register");

if (!i_read_notwrite)
{
fapi2::buffer<uint64_t> l_data;
l_data.insert(io_data, l_bit_offset, 32);
FAPI_TRY(fapi2::putScom(i_target_chip, PU_LPC_DATA_REG, l_data), "Error writing LPC data");
}

{
fapi2::buffer<uint64_t> l_status;
int timeout = LPC_CMD_TIMEOUT_COUNT;

while (timeout--)
{
FAPI_TRY(fapi2::getScom(i_target_chip, PU_LPC_STATUS_REG, l_status), "Error reading LPC status");

if (l_status.getBit<PU_LPC_STATUS_REG_DONE>())
{
break;
}

fapi2::delay(LPC_CMD_TIMEOUT_DELAY_NS, LPC_CMD_TIMEOUT_DELAY_CYCLE);
}

if (LPC_UTILS_TIMEOUT_FFDC)
{
FAPI_ASSERT(l_status.getBit<PU_LPC_STATUS_REG_DONE>(), fapi2::LPC_ACCESS_TIMEOUT()
.set_TARGET_CHIP(i_target_chip)
.set_COUNT(LPC_CMD_TIMEOUT_COUNT)
.set_COMMAND(l_command)
.set_DATA(io_data)
.set_STATUS(l_status),
"LPC access timed out");
}
else if (!l_status.getBit<PU_LPC_STATUS_REG_DONE>())
{
return fapi2::RC_LPC_ACCESS_TIMEOUT;
}
}

if (i_read_notwrite)
{
fapi2::buffer<uint64_t> l_data;
FAPI_TRY(fapi2::getScom(i_target_chip, PU_LPC_DATA_REG, l_data), "Error reading LPC data");
l_data.extract(io_data, l_bit_offset, 32);
}

return fapi2::FAPI2_RC_SUCCESS;

fapi_try_exit:
return fapi2::current_err;
}
const uint32_t i_addr,
const bool i_read_notwrite,
const bool i_generate_ffdc,
fapi2::buffer<uint32_t>& io_data);

static inline fapi2::ReturnCode lpc_read(
const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target_chip,
uint32_t i_addr, fapi2::buffer<uint32_t>& o_data)
uint32_t i_addr, fapi2::buffer<uint32_t>& o_data, bool i_generate_ffdc = true)
{
return lpc_rw(i_target_chip, i_addr, true, o_data);
return lpc_rw(i_target_chip, i_addr, true, i_generate_ffdc, o_data);
}

static inline fapi2::ReturnCode lpc_write(
const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target_chip,
uint32_t i_addr, fapi2::buffer<uint32_t> i_data)
uint32_t i_addr, fapi2::buffer<uint32_t> i_data, bool i_generate_ffdc = true)
{
return lpc_rw(i_target_chip, i_addr, false, i_data);
return lpc_rw(i_target_chip, i_addr, false, i_generate_ffdc, i_data);
}

#endif /* P9_LPC_UTILS_H_ */

0 comments on commit 38ef758

Please sign in to comment.