Skip to content

GR_LYCHEE,RZ_A1H,VK_RZ_A1H: Fix greentea ticker test case failures #10213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 27, 2019
Merged

GR_LYCHEE,RZ_A1H,VK_RZ_A1H: Fix greentea ticker test case failures #10213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cb31d11
Fix the value of SystemCoreClock
d-kato Mar 25, 2019
2509ea8
Removed clock mode decision of "SystemCoreClockUpdate()"
d-kato Mar 25, 2019
e96c633
Refactoring system clock driver
d-kato Mar 25, 2019
090fcb0
Changed LOOP_SCALER of "wait_ns()"
d-kato Mar 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions platform/mbed_wait_api_no_rtos.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,8 @@ void wait_us(int us)
#endif
#elif defined __CORTEX_A
#if __CORTEX_A == 9
// Cortex-A9 is dual-issue, so let's assume same performance as Cortex-M7.
// TODO - test.
#define LOOP_SCALER 2000
// Cortex-A9 can dual issue for 3 cycles per iteration (SUB,NOP) = 1, (NOP,BCS) = 2
#define LOOP_SCALER 3000
#endif
#endif

Expand Down
19 changes: 9 additions & 10 deletions targets/TARGET_RENESAS/TARGET_RZ_A1XX/TARGET_GR_LYCHEE/device/os_tick_ostm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,8 @@

#include "os_tick.h"
#include "irq_ctrl.h"

#include <MBRZA1LU.h>

#include <cmsis.h>
#include "cmsis.h"
#include "mbed_drv_cfg.h"


// Define OS TImer interrupt priority
Expand Down Expand Up @@ -62,15 +60,15 @@ int32_t OS_Tick_Setup (uint32_t freq, IRQHandler_t handler)
// Get CPG.FRQCR[IFC] bits
clock = (CPG.FRQCR >> 8) & 0x03;

// Determine Divider 2 output clock by using SystemCoreClock
// Determine Divider 2 output clock by using RENESAS_RZ_A1_P0_CLK
if (clock == 0x03U) {
clock = (SystemCoreClock * 3U);
clock = (RENESAS_RZ_A1_P0_CLK * 3U);
}
else if (clock == 0x01U) {
clock = (SystemCoreClock * 3U)/2U;
clock = (RENESAS_RZ_A1_P0_CLK * 3U)/2U;
}
else {
clock = SystemCoreClock;
clock = RENESAS_RZ_A1_P0_CLK;
}

// Determine tick frequency
Expand Down Expand Up @@ -144,7 +142,8 @@ void OS_Tick_Enable (void)
}

/// Disable OS Tick.
void OS_Tick_Disable (void) {
void OS_Tick_Disable (void)
{

// Stop the OSTM counter
OSTM.OSTMnTT = 0x01U;
Expand All @@ -156,7 +155,7 @@ void OS_Tick_Disable (void) {
}

// Acknowledge OS Tick IRQ.
void OS_Tick_AcknowledgeIRQ (void)
void OS_Tick_AcknowledgeIRQ (void)
{
IRQ_ClearPending (OSTM_IRQn);
}
Expand Down
35 changes: 9 additions & 26 deletions targets/TARGET_RENESAS/TARGET_RZ_A1XX/TARGET_GR_LYCHEE/device/system_RZ_A1LU.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,10 @@
* limitations under the License.
*/

#include <RZ_A1LU.h>
#include "RZ_A1LU.h"
#include "RZ_A1_Init.h"
#include "irq_ctrl.h"

#define CS2_SDRAM_MODE_16BIT_CAS2_BR_BW (*(volatile uint16_t*)0x3FFFD040)
#define CS3_SDRAM_MODE_16BIT_CAS2_BR_BW (*(volatile uint16_t*)0x3FFFE040)
#define GPIO_PORT0_BOOTMODE_BITMASK (0x000fu)
#include "mbed_drv_cfg.h"

/*
Port 0 (P0) MD pin assignment
Expand All @@ -45,30 +42,17 @@
/*----------------------------------------------------------------------------
System Core Clock Variable
*----------------------------------------------------------------------------*/
uint32_t SystemCoreClock = CM1_RENESAS_RZ_A1_P0_CLK;
uint32_t SystemCoreClock = RENESAS_RZ_A1_SYS_CLK;

/*----------------------------------------------------------------------------
System Core Clock update function
*----------------------------------------------------------------------------*/
void SystemCoreClockUpdate (void)
{
uint32_t freq;
uint16_t mode;
uint16_t ifc;

mode = (GPIO.PPR0 >> 2U) & 0x01U;

if (mode == 0) {
/* Clock Mode 0 */
/* CLKIN is between 10MHz and 13.33MHz */
/* Divider 1 uses 1/1 ratio, PLL x30 is ON */
freq = CM0_RENESAS_RZ_A1_CLKIN * 30U;
} else {
/* Clock Mode 1 */
/* CLKIN is 48MHz */
/* Divider 1 uses 1/4 ratio, PLL x32 is ON */
freq = (CM1_RENESAS_RZ_A1_CLKIN * 32U) / 4U;
}
freq = RENESAS_RZ_A1_SYS_CLK;

/* Get CPG.FRQCR[IFC] bits */
ifc = (CPG.FRQCR >> 8U) & 0x03U;
Expand All @@ -77,12 +61,11 @@ void SystemCoreClockUpdate (void)
if (ifc == 0x03U) {
/* Division ratio is 1/3 */
freq = (freq / 3U);
}
else {
if (ifc == 0x01U) {
/* Division ratio is 2/3 */
freq = (freq * 2U) / 3U;
}
} else if (ifc == 0x01U) {
/* Division ratio is 2/3 */
freq = (freq * 2U) / 3U;
} else {
/* do nothing */
}

SystemCoreClock = freq;
Expand Down
5 changes: 5 additions & 0 deletions targets/TARGET_RENESAS/TARGET_RZ_A1XX/TARGET_GR_LYCHEE/mbed_drv_cfg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@

#define RENESAS_RZ_A1_P0_CLK CM1_RENESAS_RZ_A1_P0_CLK

/* Clock Mode 1 */
/* CLKIN is 48MHz */
/* Divider 1 uses 1/4 ratio, PLL x32 is ON */
#define RENESAS_RZ_A1_SYS_CLK ((CM1_RENESAS_RZ_A1_CLKIN * 32U) / 4U)

#define LP_TICKER_MTU2_CH 2

/* flash (W25Q64JV) */
Expand Down
14 changes: 6 additions & 8 deletions targets/TARGET_RENESAS/TARGET_RZ_A1XX/TARGET_RZ_A1H/device/os_tick_ostm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,8 @@

#include "os_tick.h"
#include "irq_ctrl.h"

#include <MBRZA1H.h>

#include <cmsis.h>
#include "cmsis.h"
#include "mbed_drv_cfg.h"


// Define OS TImer interrupt priority
Expand Down Expand Up @@ -62,15 +60,15 @@ int32_t OS_Tick_Setup (uint32_t freq, IRQHandler_t handler)
// Get CPG.FRQCR[IFC] bits
clock = (CPG.FRQCR >> 8) & 0x03;

// Determine Divider 2 output clock by using SystemCoreClock
// Determine Divider 2 output clock by using RENESAS_RZ_A1_P0_CLK
if (clock == 0x03U) {
clock = (SystemCoreClock * 3U);
clock = (RENESAS_RZ_A1_P0_CLK * 3U);
}
else if (clock == 0x01U) {
clock = (SystemCoreClock * 3U)/2U;
clock = (RENESAS_RZ_A1_P0_CLK * 3U)/2U;
}
else {
clock = SystemCoreClock;
clock = RENESAS_RZ_A1_P0_CLK;
}

// Determine tick frequency
Expand Down
35 changes: 9 additions & 26 deletions targets/TARGET_RENESAS/TARGET_RZ_A1XX/TARGET_RZ_A1H/device/system_RZ_A1H.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,10 @@
* limitations under the License.
*/

#include <RZ_A1H.h>
#include "RZ_A1H.h"
#include "RZ_A1_Init.h"
#include "irq_ctrl.h"

#define CS2_SDRAM_MODE_16BIT_CAS2_BR_BW (*(volatile uint16_t*)0x3FFFD040)
#define CS3_SDRAM_MODE_16BIT_CAS2_BR_BW (*(volatile uint16_t*)0x3FFFE040)
#define GPIO_PORT0_BOOTMODE_BITMASK (0x000fu)
#include "mbed_drv_cfg.h"

/*
Port 0 (P0) MD pin assignment
Expand All @@ -45,30 +42,17 @@
/*----------------------------------------------------------------------------
System Core Clock Variable
*----------------------------------------------------------------------------*/
uint32_t SystemCoreClock = CM0_RENESAS_RZ_A1_P0_CLK;
uint32_t SystemCoreClock = RENESAS_RZ_A1_SYS_CLK;

/*----------------------------------------------------------------------------
System Core Clock update function
*----------------------------------------------------------------------------*/
void SystemCoreClockUpdate (void)
{
uint32_t freq;
uint16_t mode;
uint16_t ifc;

mode = (GPIO.PPR0 >> 2U) & 0x01U;

if (mode == 0) {
/* Clock Mode 0 */
/* CLKIN is between 10MHz and 13.33MHz */
/* Divider 1 uses 1/1 ratio, PLL x30 is ON */
freq = CM0_RENESAS_RZ_A1_CLKIN * 30U;
} else {
/* Clock Mode 1 */
/* CLKIN is 48MHz */
/* Divider 1 uses 1/4 ratio, PLL x32 is ON */
freq = (CM1_RENESAS_RZ_A1_CLKIN * 32U) / 4U;
}
freq = RENESAS_RZ_A1_SYS_CLK;

/* Get CPG.FRQCR[IFC] bits */
ifc = (CPG.FRQCR >> 8U) & 0x03U;
Expand All @@ -77,12 +61,11 @@ void SystemCoreClockUpdate (void)
if (ifc == 0x03U) {
/* Division ratio is 1/3 */
freq = (freq / 3U);
}
else {
if (ifc == 0x01U) {
/* Division ratio is 2/3 */
freq = (freq * 2U) / 3U;
}
} else if (ifc == 0x01U) {
/* Division ratio is 2/3 */
freq = (freq * 2U) / 3U;
} else {
/* do nothing */
}

SystemCoreClock = freq;
Expand Down
5 changes: 5 additions & 0 deletions targets/TARGET_RENESAS/TARGET_RZ_A1XX/TARGET_RZ_A1H/mbed_drv_cfg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@

#define RENESAS_RZ_A1_P0_CLK CM0_RENESAS_RZ_A1_P0_CLK

/* Clock Mode 0 */
/* CLKIN is between 10MHz and 13.33MHz */
/* Divider 1 uses 1/1 ratio, PLL x30 is ON */
#define RENESAS_RZ_A1_SYS_CLK (CM0_RENESAS_RZ_A1_CLKIN * 30U)

#define LP_TICKER_MTU2_CH 3

/* flash (MX25L6433FM2I) */
Expand Down
14 changes: 6 additions & 8 deletions targets/TARGET_RENESAS/TARGET_RZ_A1XX/TARGET_VK_RZ_A1H/device/os_tick_ostm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,8 @@

#include "os_tick.h"
#include "irq_ctrl.h"

#include <VKRZA1H.h>

#include <cmsis.h>
#include "cmsis.h"
#include "mbed_drv_cfg.h"


// Define OS TImer interrupt priority
Expand Down Expand Up @@ -62,15 +60,15 @@ int32_t OS_Tick_Setup (uint32_t freq, IRQHandler_t handler)
// Get CPG.FRQCR[IFC] bits
clock = (CPG.FRQCR >> 8) & 0x03;

// Determine Divider 2 output clock by using SystemCoreClock
// Determine Divider 2 output clock by using RENESAS_RZ_A1_P0_CLK
if (clock == 0x03U) {
clock = (SystemCoreClock * 3U);
clock = (RENESAS_RZ_A1_P0_CLK * 3U);
}
else if (clock == 0x01U) {
clock = (SystemCoreClock * 3U)/2U;
clock = (RENESAS_RZ_A1_P0_CLK * 3U)/2U;
}
else {
clock = SystemCoreClock;
clock = RENESAS_RZ_A1_P0_CLK;
}

// Determine tick frequency
Expand Down
41 changes: 12 additions & 29 deletions targets/TARGET_RENESAS/TARGET_RZ_A1XX/TARGET_VK_RZ_A1H/device/system_VK_RZ_A1H.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,10 @@
* limitations under the License.
*/

#include <VK_RZ_A1H.h>
#include "VK_RZ_A1H.h"
#include "RZ_A1_Init.h"
#include "irq_ctrl.h"

#define CS2_SDRAM_MODE_16BIT_CAS2_BR_BW (*(volatile uint16_t*)0x3FFFD040)
#define CS3_SDRAM_MODE_16BIT_CAS2_BR_BW (*(volatile uint16_t*)0x3FFFE040)
#define GPIO_PORT0_BOOTMODE_BITMASK (0x000fu)
#include "mbed_drv_cfg.h"

/*
Port 0 (P0) MD pin assignment
Expand All @@ -45,48 +42,34 @@
/*----------------------------------------------------------------------------
System Core Clock Variable
*----------------------------------------------------------------------------*/
uint32_t SystemCoreClock = CM0_RENESAS_RZ_A1_P0_CLK;
uint32_t SystemCoreClock = RENESAS_RZ_A1_SYS_CLK;

/*----------------------------------------------------------------------------
System Core Clock update function
*----------------------------------------------------------------------------*/
void SystemCoreClockUpdate (void)
{
{
uint32_t freq;
uint16_t mode;
uint16_t ifc;

mode = (GPIO.PPR0 >> 2U) & 0x01U;
freq = RENESAS_RZ_A1_SYS_CLK;

if (mode == 0) {
/* Clock Mode 0 */
/* CLKIN is between 10MHz and 13.33MHz */
/* Divider 1 uses 1/1 ratio, PLL x30 is ON */
freq = CM0_RENESAS_RZ_A1_CLKIN * 30U;
} else {
/* Clock Mode 1 */
/* CLKIN is 48MHz */
/* Divider 1 uses 1/4 ratio, PLL x32 is ON */
freq = (CM1_RENESAS_RZ_A1_CLKIN * 32U) / 4U;
}

/* Get CPG.FRQCR[IFC] bits */
ifc = (CPG.FRQCR >> 8U) & 0x03U;

/* Determine Divider 2 output clock */
if (ifc == 0x03U) {
/* Division ratio is 1/3 */
freq = (freq / 3U);
} else if (ifc == 0x01U) {
/* Division ratio is 2/3 */
freq = (freq * 2U) / 3U;
} else {
/* do nothing */
}
else {
if (ifc == 0x01U) {
/* Division ratio is 2/3 */
freq = (freq * 2U) / 3U;
}
}

SystemCoreClock = freq;
}
}

/*----------------------------------------------------------------------------
IRQ Handler Register/Unregister
Expand Down
5 changes: 5 additions & 0 deletions targets/TARGET_RENESAS/TARGET_RZ_A1XX/TARGET_VK_RZ_A1H/mbed_drv_cfg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,9 @@

#define RENESAS_RZ_A1_P0_CLK CM0_RENESAS_RZ_A1_P0_CLK

/* Clock Mode 0 */
/* CLKIN is between 10MHz and 13.33MHz */
/* Divider 1 uses 1/1 ratio, PLL x30 is ON */
#define RENESAS_RZ_A1_SYS_CLK (CM0_RENESAS_RZ_A1_CLKIN * 30U)

#endif