Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-06 07:33:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

* shared/clock/clock.c: Standard decrementer exception is now more

Browse Source 
robust against erroneous external exception disable times.
This commit is contained in:
Thomas Doerfler
2009-03-05 13:45:57 +00:00
parent cb54e10686
commit f1f7563ae8
4 changed files with 48 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
c/src/lib/libbsp/powerpc/ChangeLog
View File

@@ -1,3 +1,8 @@
2009-03-05 Sebastian Huber <sebastian.huber@embedded-brains.de>
* shared/clock/clock.c: Standard decrementer exception is now more
robust against erroneous external exception disable times.
2009-02-11 Matt Rippa <mrippa@gemini.edu> 2009-02-11 Matt Rippa <mrippa@gemini.edu>
PR 1352/bsps PR 1352/bsps

8
c/src/lib/libbsp/powerpc/gen5200/network_5200/network.c
View File

@@ -466,12 +466,12 @@ int mpc5200_eth_mii_read(struct mpc5200_enet_struct *sc, unsigned char phyAddr,
* 18-wire ethernet tranceiver (PHY). Please see your PHY * 18-wire ethernet tranceiver (PHY). Please see your PHY
* documentation for the register map. * documentation for the register map.
* *
* Returns: Success (boolean) * Returns: Success (bool)
* *
* Notes: * Notes:
* *
*/ */
static int mpc5200_eth_mii_write(struct mpc5200_enet_struct *sc, unsigned char phyAddr, unsigned char regAddr, unsigned short data) static bool mpc5200_eth_mii_write(struct mpc5200_enet_struct *sc, unsigned char phyAddr, unsigned char regAddr, unsigned short data)
{ {
unsigned long reg; /* convenient holder for the PHY register */ unsigned long reg; /* convenient holder for the PHY register */
unsigned long phy; /* convenient holder for the PHY */ unsigned long phy; /* convenient holder for the PHY */
@@ -514,12 +514,12 @@ static int mpc5200_eth_mii_write(struct mpc5200_enet_struct *sc, unsigned char p
* Description: Reset a running ethernet driver including the hardware * Description: Reset a running ethernet driver including the hardware
* FIFOs and the FEC. * FIFOs and the FEC.
* *
* Returns: Success (boolean) * Returns: Success (bool)
* *
* Notes: * Notes:
* *
*/ */
static int mpc5200_fec_reset(struct mpc5200_enet_struct *sc) { static bool mpc5200_fec_reset(struct mpc5200_enet_struct *sc) {
volatile int delay; volatile int delay;
/* /*
* Clear FIFO status registers * Clear FIFO status registers

63
c/src/lib/libbsp/powerpc/shared/clock/clock.c
View File

@@ -7,18 +7,19 @@
*/ */
/* /*
* Copyright (c) 2008 * Copyright (c) 2008, 2009
* Embedded Brains GmbH * Embedded Brains GmbH
* Obere Lagerstr. 30 * Obere Lagerstr. 30
* D-82178 Puchheim * D-82178 Puchheim
* Germany * Germany
* rtems@embedded-brains.de * rtems@embedded-brains.de
* *
* The license and distribution terms for this file may be found in the file * The license and distribution terms for this file may be
* LICENSE in this distribution or at http://www.rtems.com/license/LICENSE. * found in the file LICENSE in this distribution or at
* http://www.rtems.com/license/LICENSE.
*/ */
#include <rtems/libio.h> #include <rtems.h>
#include <rtems/clockdrv.h> #include <rtems/clockdrv.h>
#include <libcpu/powerpc-utility.h> #include <libcpu/powerpc-utility.h>
@@ -57,34 +58,40 @@ static void (*ppc_clock_tick)(void) = ppc_clock_no_tick;
static int ppc_clock_exception_handler( BSP_Exception_frame *frame, unsigned number) static int ppc_clock_exception_handler( BSP_Exception_frame *frame, unsigned number)
{ {
uint32_t reg1; uint32_t delta = ppc_clock_decrementer_value;
uint32_t reg2; uint32_t next = ppc_clock_next_time_base;
uint32_t reg3; uint32_t dec = 0;
uint32_t msr; uint32_t now = 0;
uint32_t msr = 0;
/* Set new decrementer value according to a reference time base */ do {
asm volatile ( /* Increment clock ticks */
"lwz %0, ppc_clock_next_time_base@sdarel(13);" Clock_driver_ticks += 1;
"lwz %1, ppc_clock_decrementer_value@sdarel(13);"
"mftb %2;"
"add %0, %0, %1;"
"subf %1, %2, %0;"
"stw %0, ppc_clock_next_time_base@sdarel(13);"
"mtdec %1;"
: "=r" (reg1), "=r" (reg2), "=r" (reg3)
);
/* Increment clock ticks */ /* Enable external exceptions */
Clock_driver_ticks += 1; msr = ppc_external_exceptions_enable();
/* Enable external exceptions */ /* Call clock ticker */
msr = ppc_external_exceptions_enable(); ppc_clock_tick();
/* Call clock ticker */ /* Restore machine state */
ppc_clock_tick(); ppc_external_exceptions_disable( msr);
/* Restore machine state */ /* Next time base */
ppc_external_exceptions_disable( msr); next += delta;
/* Current time */
now = ppc_time_base();
/* New decrementer value */
dec = next - now;
} while (dec > delta);
/* Set decrementer */
ppc_set_decrementer_register( dec);
/* Expected next time base */
ppc_clock_next_time_base = next;
return 0; return 0;
} }
@@ -201,7 +208,7 @@ rtems_device_driver Clock_initialize( rtems_device_major_number major, rtems_dev
/* Check decrementer value */ /* Check decrementer value */
if (ppc_clock_decrementer_value == 0) { if (ppc_clock_decrementer_value == 0) {
ppc_clock_decrementer_value = PPC_CLOCK_DECREMENTER_MAX; ppc_clock_decrementer_value = PPC_CLOCK_DECREMENTER_MAX;
SYSLOG_ERROR( "Decrementer value would be zero, will be set to maximum value instead\n"); SYSLOG_ERROR( "decrementer value would be zero, will be set to maximum value instead\n");
} }
/* Set the nanoseconds since last tick handler */ /* Set the nanoseconds since last tick handler */

4
c/src/lib/libbsp/powerpc/tqm8xx/include/tqm.h
View File

@@ -23,6 +23,8 @@
#ifndef __TQM_H__ #ifndef __TQM_H__
#define __TQM_H__ #define __TQM_H__
#if !defined(ASM)
#include <rtems.h> #include <rtems.h>
typedef struct { typedef struct {
@@ -40,7 +42,9 @@ typedef struct {
void (*put_char)(int c); /* function to output characters */ void (*put_char)(int c); /* function to output characters */
} tqm_bd_info_t; } tqm_bd_info_t;
#endif /* !defined(ASM) */
#define TQM_BD_INFO_ADDR 0x3400 #define TQM_BD_INFO_ADDR 0x3400
#define TQM_BD_INFO (*(tqm_bd_info_t *)TQM_BD_INFO_ADDR) #define TQM_BD_INFO (*(tqm_bd_info_t *)TQM_BD_INFO_ADDR)
#define TQM_CONF_INFO_BLOCK_ADDR 0x4001fe00 #define TQM_CONF_INFO_BLOCK_ADDR 0x4001fe00