Skip to content

Commit

Permalink
Squashed 'mpfs_hal/' changes from 2a91d75..4d93f3a
Browse files Browse the repository at this point in the history 
4d93f3a warning removal- added missing function prototypes
cb6ab73 DDR and other updates
330998a DDR and other updates
e8153d4 DDR update- BCLK SCK offset seperated for each memory type
69dd37f Merge branch 'feature/ESWBM_G6-40-add-support-for-multi-hart-application' of ssh://bitbucket.microchip.com/fpga_pfsoc_es/mss-mpfs-hal-src into feature/ESWBM_G6-40-add-support-for-multi-hart-application
de085aa refractoring startup code to unify code under the IMAGE_LOADED_BY_BOOTLOADER == 1 condition
25c35bf provide functions for dynamic branch prediction.
43044ce Added support for setting branch prediction
14fedff Added multihart support for bare metal app

git-subtree-dir: mpfs_hal
git-subtree-split: 4d93f3a5cdc125a62a304d7d28d1cb0dac79dfd0
  • Loading branch information
@mallynch
mallynch committed Aug 19, 2022
1 parent f604992 commit 2deb85d
Show file tree
Hide file tree
Showing 8 changed files with 392 additions and 136 deletions.
18 changes: 18 additions & 0 deletions common/mss_util.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,24 @@ void display_address_of_interest(uint64_t * address_of_interest, int nb_location
}
#endif

/*------------------------------------------------------------------------------
* This function disables dynamic branch prediction on the hart from which it
* executes. It is enabled by default.
*/
void disable_branch_prediction(void)
{
write_csr(0x7C0, 0x1u);
}

/*------------------------------------------------------------------------------
* This function enables dynamic branch prediction on the hart from which it
* executes.
*/
void enable_branch_prediction(void)
{
write_csr(0x7C0, 0x0u);
}

#ifdef __cplusplus
}
#endif
Expand Down
2 changes: 2 additions & 0 deletions common/mss_util.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ void __disable_all_irqs(void);
void __enable_irq(void);
void __enable_local_irq(uint8_t local_interrupt);
void __disable_local_irq(uint8_t local_interrupt);
void disable_branch_prediction(void);
void enable_branch_prediction(void);

static inline void spinunlock(volatile long *pLock)
{
Expand Down
67 changes: 53 additions & 14 deletions common/nwc/mss_ddr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,13 @@
* Local Defines
*/
/* This string is updated if any change to ddr driver */
#define DDR_DRIVER_VERSION_STRING "0.4.015"
#define DDR_DRIVER_VERSION_STRING "0.4.018"
/* Version | Comment */
/* 0.4.015 | Added some debug feedback in verify state . */
/* 0.4.018 | Corrected error introduced for DDR3 in 0.4.14 */
/* 0.4.017 | made SW_TRAING_BCLK_SCLK_OFFSET seperate for each mem type */
/* 0.4.016 | DDR3-Added support for DDR3L removed in v0.3.027 */
/* | Corrected dpc value update during write leveling */
/* 0.4.015 | Added some debug feedback in verify state. */
/* 0.4.014 | Tidy-up, replace some majic numbers.No functional change. */
/* 0.4.013 | ddr3- Corrected dpc value update during write leveling */
/* 0.4.012 | ADD_CMD_CLK_MOVE_ORDER 0,1,2 for 1333Mhz, 1,2,0 for 1600MHz */
Expand Down Expand Up @@ -194,6 +198,7 @@ static void set_ddr_rpc_regs(DDR_TYPE ddr_type);
static uint8_t get_num_lanes(void);
static void load_dq(uint8_t lane);
static uint8_t use_software_bclk_sclk_training(DDR_TYPE ddr_type);
static uint8_t bclk_sclk_offset(DDR_TYPE ddr_type);
static void config_ddr_io_pull_up_downs_rpc_bits(DDR_TYPE ddr_type);
#ifdef MANUAL_ADDCMD_TRAINIG
static uint8_t ddr_manual_addcmd_refclk_offset(DDR_TYPE ddr_type, uint8_t * refclk_sweep_index);
Expand Down Expand Up @@ -533,13 +538,14 @@ static uint32_t ddr_setup(void)
if (ddr_type == LPDDR4)
{
/* vrgen, modify during write leveling, turns off ODT */
CFG_DDR_SGMII_PHY->DPC_BITS.DPC_BITS = (dpc_bits & ~DDR_DPC_VRGEN_H_MASK)| (0x5U<<DDR_DPC_VRGEN_H_SHIFT);
CFG_DDR_SGMII_PHY->DPC_BITS.DPC_BITS =\
(dpc_bits & ~DDR_DPC_VRGEN_H_MASK)| (DPC_VRGEN_H_LPDDR4_WR_LVL_VAL << DDR_DPC_VRGEN_H_SHIFT);
CFG_DDR_SGMII_PHY->rpc3_ODT.rpc3_ODT = 0x0;
}
else if (ddr_type == DDR3)
else if ((ddr_type == DDR3)||(ddr_type == DDR3L))
{
/* vrgen, modify during write leveling */
CFG_DDR_SGMII_PHY->DPC_BITS.DPC_BITS = dpc_bits | (0x2U<<DDR_DPC_VRGEN_H_SHIFT);
CFG_DDR_SGMII_PHY->DPC_BITS.DPC_BITS = dpc_bits | (DPC_VRGEN_H_DDR3_WR_LVL_VAL<<DDR_DPC_VRGEN_H_SHIFT);
}
ddr_training_state = DDR_TRAINING_FLASH_REGS;
break;
Expand Down Expand Up @@ -812,7 +818,7 @@ static uint32_t ddr_setup(void)
* Initiate IP training and wait for dfi_init_complete
*/
/*asserting training_reset */
if (ddr_type != DDR3)
if (!((ddr_type == DDR3)||(ddr_type == DDR3L)))
{
CFG_DDR_SGMII_PHY->training_reset.training_reset =\
0x00000000U;
Expand Down Expand Up @@ -897,16 +903,16 @@ static uint32_t ddr_setup(void)
* BCLK_SCLK_OFFSET_BASE
*/
{
bclk_phase = ((bclk_answer+SW_TRAING_BCLK_SCLK_OFFSET) & 0x07UL ) << 8U;
bclk90_phase=((bclk_answer+SW_TRAING_BCLK_SCLK_OFFSET+2U) & 0x07UL ) << 11U;
bclk_phase = ((bclk_answer+bclk_sclk_offset(ddr_type)) & 0x07UL ) << 8U;
bclk90_phase=((bclk_answer+bclk_sclk_offset(ddr_type)+2U) & 0x07UL ) << 11U;
MSS_SCB_DDR_PLL->PLL_PHADJ = (0x00004003UL | bclk_phase | bclk90_phase);
MSS_SCB_DDR_PLL->PLL_PHADJ = (0x00000003UL | bclk_phase | bclk90_phase);
MSS_SCB_DDR_PLL->PLL_PHADJ = (0x00004003UL | bclk_phase | bclk90_phase);

}
#ifdef DEBUG_DDR_INIT
(void)uprint32(g_debug_uart, "\n\r bclk_phase ", bclk_phase);
(void)uprint32(g_debug_uart, "\n\r SW_TRAING_BCLK_SCLK_OFFSET value ", SW_TRAING_BCLK_SCLK_OFFSET);
(void)uprint32(g_debug_uart, "\n\r bclk_sclk_offset value ", bclk_sclk_offset(ddr_type));
#endif
/* SET Store DRV & VREF initial values (to be re-applied after CA training) */
uint32_t ca_drv=CFG_DDR_SGMII_PHY->rpc1_DRV.rpc1_DRV;
Expand Down Expand Up @@ -1111,7 +1117,7 @@ static uint32_t ddr_setup(void)

}/* end vref_training; */

if (ddr_type == DDR3)
if ((ddr_type == DDR3)||(ddr_type == DDR3L))
{
ddr3_address_cmd_training(ddr_type, &refclk_sweep_index, retry_count, &bclk_phase, &bclk90_phase, &refclk_phase, &refclk_offset );
}
Expand Down Expand Up @@ -1157,7 +1163,7 @@ static uint32_t ddr_setup(void)
{
CFG_DDR_SGMII_PHY->training_skip.training_skip =\
LIBERO_SETTING_TRAINING_SKIP_SETTING;
if ((ddr_type == DDR3)||(ddr_type == LPDDR3)||(ddr_type == LPDDR4)||(ddr_type == DDR4))
if ((ddr_type == DDR3)||(ddr_type == DDR3L)||(ddr_type == LPDDR3)||(ddr_type == LPDDR4)||(ddr_type == DDR4))
{
/* RX_MD_CLKN */
CFG_DDR_SGMII_PHY->rpc168.rpc168 = 0x0U;
Expand Down Expand Up @@ -1575,7 +1581,7 @@ static uint32_t ddr_setup(void)
CFG_DDR_SGMII_PHY->expert_mode_en.expert_mode_en = 0x0000008U;
if(error == 0U)
{
if(ddr_type == DDR3) /* Changing WPU and WPD */
if((ddr_type == DDR3)||(ddr_type == DDR3L)) /* Changing WPU and WPD */
{
/* only run when ECC is on - sar121393 */
if (LIBERO_SETTING_DDRPHY_MODE & DDRPHY_MODE_ECC_MASK)
Expand Down Expand Up @@ -4401,6 +4407,39 @@ static uint8_t use_software_bclk_sclk_training(DDR_TYPE ddr_type)
return(result);
}

/**
* bclk_sclk_offset()
* @param ddr_type
* @return
*/
static uint8_t bclk_sclk_offset(DDR_TYPE ddr_type)
{
uint8_t result = 0U;
switch (ddr_type)
{
default:
case DDR_OFF_MODE:
result = LIBERO_SETTING_SW_TRAING_BCLK_SCLK_OFFSET_LPDDR4;
break;
case DDR3L:
result = LIBERO_SETTING_SW_TRAING_BCLK_SCLK_OFFSET_DDR3L;
break;
case DDR3:
result = LIBERO_SETTING_SW_TRAING_BCLK_SCLK_OFFSET_DDR3;
break;
case DDR4:
result = LIBERO_SETTING_SW_TRAING_BCLK_SCLK_OFFSET_DDR4;
break;
case LPDDR3:
result = LIBERO_SETTING_SW_TRAING_BCLK_SCLK_OFFSET_LPDDR3;
break;
case LPDDR4:
result = LIBERO_SETTING_SW_TRAING_BCLK_SCLK_OFFSET_LPDDR4;
break;
}
return(result);
}

/**
* config_ddr_io_pull_up_downs_rpc_bits()
*
Expand Down Expand Up @@ -5751,11 +5790,11 @@ static void ddr3_address_cmd_training(DDR_TYPE ddr_type, uint8_t * refclk_sweep_
a5_offset_status = DDR_ADD_CMD_A5_OFFSET_FAIL;
#ifdef DEBUG_DDR_INIT
(void)uprint32(g_debug_uart, "\n\r\n\r\r ADDCMD_OFFSET used in this testing ", *refclk_offset);
(void)uprint32(g_debug_uart, "\n\r\n\r\r BCLK_OFFSET used in this testing ",SW_TRAING_BCLK_SCLK_OFFSET);
(void)uprint32(g_debug_uart, "\n\r\n\r\r BCLK_OFFSET used in this testing ",bclk_sclk_offset(ddr_type));
#endif
while(a5_offset_status != DDR_ADD_CMD_A5_OFFSET_PASS)
{
a5_offset_status = DDR_ADD_CMD_A5_OFFSET_FAIL;
a5_offset_status = DDR_ADD_CMD_A5_OFFSET_PASS;
//ADDCMD Training improvement , adds delay on DDR clock loopback path
CFG_DDR_SGMII_PHY->rpc147.rpc147 = init_del_offset + rpc147_offset;
//ADDCMD Training improvement , adds delay on A9 loopback path
Expand Down
27 changes: 24 additions & 3 deletions common/nwc/mss_ddr.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -437,6 +437,15 @@ typedef enum DDR_MEMORY_ACCESS_
#define TRANSITION_A5_THRESHOLD 18U
#endif

/* Value used during write leveling */
#ifndef DPC_VRGEN_H_LPDDR4_WR_LVL_VAL
#define DPC_VRGEN_H_LPDDR4_WR_LVL_VAL 0x5U
#endif
/* Value used during write leveling */
#ifndef DPC_VRGEN_H_DDR3_WR_LVL_VAL
#define DPC_VRGEN_H_DDR3_WR_LVL_VAL 0x2U
#endif

#if !defined (DDR_FULL_32BIT_NC_CHECK_EN)
#define DDR_FULL_32BIT_NC_CHECK_EN 1
#endif
Expand Down Expand Up @@ -476,9 +485,21 @@ typedef enum DDR_MEMORY_ACCESS_

#define NUM_RPC_166_VALUES (MAX_RPC_166_VALUE - MIN_RPC_166_VALUE)

/* This is a fixed setting, will move into driver in next commit */
#if !defined (SW_TRAING_BCLK_SCLK_OFFSET)
#define SW_TRAING_BCLK_SCLK_OFFSET 0x00000005UL
/* Offsets for each mem type- fixed values */
#if !defined (LIBERO_SETTING_SW_TRAING_BCLK_SCLK_OFFSET_LPDDR4)
#define LIBERO_SETTING_SW_TRAING_BCLK_SCLK_OFFSET_LPDDR4 0x00000005UL
#endif
#if !defined (LIBERO_SETTING_SW_TRAING_BCLK_SCLK_OFFSET_LPDDR3)
#define LIBERO_SETTING_SW_TRAING_BCLK_SCLK_OFFSET_LPDDR3 0x00000007UL
#endif
#if !defined (LIBERO_SETTING_SW_TRAING_BCLK_SCLK_OFFSET_DDR4)
#define LIBERO_SETTING_SW_TRAING_BCLK_SCLK_OFFSET_DDR4 0x00000006UL
#endif
#if !defined (LIBERO_SETTING_SW_TRAING_BCLK_SCLK_OFFSET_DDR3)
#define LIBERO_SETTING_SW_TRAING_BCLK_SCLK_OFFSET_DDR3 0x00000006UL
#endif
#if !defined (LIBERO_SETTING_SW_TRAING_BCLK_SCLK_OFFSET_DDR3L)
#define LIBERO_SETTING_SW_TRAING_BCLK_SCLK_OFFSET_DDR3L 0x00000006UL
#endif
/*
* 0x6DU => setting vref_ca to 40%
Expand Down
6 changes: 3 additions & 3 deletions mpfs_hal_version.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@
extern "C" {
#endif

#define MPFS_HAL_VERSION_MAJOR 1
#define MPFS_HAL_VERSION_MINOR 8
#define MPFS_HAL_VERSION_PATCH 146
#define MPFS_HAL_VERSION_MAJOR 2
#define MPFS_HAL_VERSION_MINOR 0
#define MPFS_HAL_VERSION_PATCH 102

#ifdef __cplusplus
}
Expand Down
Loading

0 comments on commit 2deb85d

Please sign in to comment.