RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

bsps/arm: Prepare for interface down support

Browse Source
This commit is contained in:
Sebastian Huber
2012-12-14 12:17:15 +01:00
parent 573822b1e9
commit e99893f986
1 changed files with 82 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

159
c/src/lib/libbsp/arm/shared/lpc/network/lpc-ethernet.c
View File

@@ -291,10 +291,9 @@ static volatile lpc_eth_controller *const lpc_eth =
#endif #endif
typedef enum { typedef enum {
LPC_ETH_NOT_INITIALIZED, LPC_ETH_STATE_NOT_INITIALIZED = 0,
LPC_ETH_INITIALIZED, LPC_ETH_STATE_DOWN,
LPC_ETH_STARTED, LPC_ETH_STATE_UP
LPC_ETH_RUNNING
} lpc_eth_state; } lpc_eth_state;
typedef struct { typedef struct {
@@ -332,13 +331,39 @@ typedef struct {
unsigned transmit_no_descriptor_errors; unsigned transmit_no_descriptor_errors;
unsigned transmit_overflow_errors; unsigned transmit_overflow_errors;
unsigned transmit_fatal_errors; unsigned transmit_fatal_errors;
rtems_vector_number interrupt_number;
rtems_id control_task;
} lpc_eth_driver_entry; } lpc_eth_driver_entry;
static lpc_eth_driver_entry lpc_eth_driver_data = { static lpc_eth_driver_entry lpc_eth_driver_data;
.state = LPC_ETH_NOT_INITIALIZED,
.receive_task = RTEMS_ID_NONE, static void lpc_eth_control_request_complete(const lpc_eth_driver_entry *e)
.transmit_task = RTEMS_ID_NONE {
}; rtems_status_code sc = rtems_event_transient_send(e->control_task);
assert(sc == RTEMS_SUCCESSFUL);
}
static void lpc_eth_control_request(
lpc_eth_driver_entry *e,
rtems_id task,
rtems_event_set event
)
{
rtems_status_code sc = RTEMS_SUCCESSFUL;
uint32_t nest_count = 0;
e->control_task = rtems_task_self();
sc = rtems_bsdnet_event_send(task, event);
assert(sc == RTEMS_SUCCESSFUL);
nest_count = rtems_bsdnet_semaphore_release_recursive();
sc = rtems_event_transient_receive(RTEMS_WAIT, RTEMS_NO_TIMEOUT);
assert(sc == RTEMS_SUCCESSFUL);
rtems_bsdnet_semaphore_obtain_recursive(nest_count);
e->control_task = 0;
}
static inline uint32_t lpc_eth_increment( static inline uint32_t lpc_eth_increment(
uint32_t value, uint32_t value,
@@ -596,6 +621,8 @@ static void lpc_eth_receive_task(void *arg)
/* Enable receive interrupts */ /* Enable receive interrupts */
lpc_eth_enable_receive_interrupts(); lpc_eth_enable_receive_interrupts();
lpc_eth_control_request_complete(e);
/* Wait for events */ /* Wait for events */
continue; continue;
} }
@@ -830,6 +857,8 @@ static void lpc_eth_transmit_task(void *arg)
/* Enable transmitter */ /* Enable transmitter */
lpc_eth->command |= ETH_CMD_TX_ENABLE; lpc_eth->command |= ETH_CMD_TX_ENABLE;
lpc_eth_control_request_complete(e);
} }
/* Free consumed fragments */ /* Free consumed fragments */
@@ -1102,15 +1131,12 @@ static int lpc_eth_mdio_write(
return eno; return eno;
} }
static void lpc_eth_interface_init(void *arg) static void lpc_eth_up_or_down(lpc_eth_driver_entry *e, bool up)
{ {
rtems_status_code sc = RTEMS_SUCCESSFUL; rtems_status_code sc = RTEMS_SUCCESSFUL;
lpc_eth_driver_entry *e = (lpc_eth_driver_entry *) arg;
struct ifnet *ifp = &e->arpcom.ac_if; struct ifnet *ifp = &e->arpcom.ac_if;
LPC_ETH_PRINTF("%s\n", __func__); if (up && e->state == LPC_ETH_STATE_DOWN) {
if (e->state == LPC_ETH_INITIALIZED) {
lpc_eth_config_module_enable(); lpc_eth_config_module_enable();
/* Soft reset */ /* Soft reset */
@@ -1137,7 +1163,7 @@ static void lpc_eth_interface_init(void *arg)
#else #else
lpc_eth->command = 0x0400; lpc_eth->command = 0x0400;
#endif #endif
lpc_eth->intenable = 0; lpc_eth->intenable = ETH_INT_RX_OVERRUN | ETH_INT_TX_UNDERRUN;
lpc_eth->intclear = 0x30ff; lpc_eth->intclear = 0x30ff;
lpc_eth->powerdown = 0; lpc_eth->powerdown = 0;
@@ -1149,59 +1175,40 @@ static void lpc_eth_interface_init(void *arg)
lpc_eth->sa2 = ((uint32_t) e->arpcom.ac_enaddr [1] << 8) lpc_eth->sa2 = ((uint32_t) e->arpcom.ac_enaddr [1] << 8)
| (uint32_t) e->arpcom.ac_enaddr [0]; | (uint32_t) e->arpcom.ac_enaddr [0];
lpc_eth_enable_promiscous_mode((ifp->if_flags & IFF_PROMISC) != 0);
/* Enable receiver */ /* Enable receiver */
lpc_eth->mac1 = 0x03; lpc_eth->mac1 = 0x03;
/* Start receive task */ /* Initialize tasks */
if (e->receive_task == RTEMS_ID_NONE) { lpc_eth_control_request(e, e->receive_task, LPC_ETH_EVENT_INITIALIZE);
e->receive_task = rtems_bsdnet_newproc( lpc_eth_control_request(e, e->transmit_task, LPC_ETH_EVENT_INITIALIZE);
"ntrx",
4096,
lpc_eth_receive_task,
e
);
sc = rtems_bsdnet_event_send(e->receive_task, LPC_ETH_EVENT_INITIALIZE);
RTEMS_SYSLOG_ERROR_SC(sc, "send receive initialize event");
}
/* Start transmit task */ /* Install interrupt handler */
if (e->transmit_task == RTEMS_ID_NONE) { sc = rtems_interrupt_handler_install(
e->transmit_task = rtems_bsdnet_newproc( e->interrupt_number,
"nttx", "Ethernet",
4096, RTEMS_INTERRUPT_UNIQUE,
lpc_eth_transmit_task, lpc_eth_interrupt_handler,
e e
); );
sc = rtems_bsdnet_event_send(e->transmit_task, LPC_ETH_EVENT_INITIALIZE); assert(sc == RTEMS_SUCCESSFUL);
RTEMS_SYSLOG_ERROR_SC(sc, "send transmit initialize event");
}
/* Change state */
if (
e->receive_task != RTEMS_ID_NONE && e->transmit_task != RTEMS_ID_NONE
) {
e->state = LPC_ETH_STARTED;
}
}
if (e->state == LPC_ETH_STARTED) {
/* Enable fatal interrupts */
lpc_eth->intenable = ETH_INT_RX_OVERRUN | ETH_INT_TX_UNDERRUN;
/* Enable promiscous mode */
lpc_eth_enable_promiscous_mode((ifp->if_flags & IFF_PROMISC) != 0);
/* Start watchdog timer */ /* Start watchdog timer */
ifp->if_timer = 1; ifp->if_timer = 1;
/* Set interface to running state */
ifp->if_flags |= IFF_RUNNING;
/* Change state */ /* Change state */
e->state = LPC_ETH_RUNNING; e->state = LPC_ETH_STATE_UP;
} else if (!up && e->state == LPC_ETH_STATE_UP) {
/* TODO */
} }
} }
static void lpc_eth_interface_init(void *arg)
{
/* Nothing to do */
}
static void lpc_eth_interface_stats(lpc_eth_driver_entry *e) static void lpc_eth_interface_stats(lpc_eth_driver_entry *e)
{ {
int media = IFM_MAKEWORD(0, 0, 0, 0); int media = IFM_MAKEWORD(0, 0, 0, 0);
@@ -1309,13 +1316,7 @@ static int lpc_eth_interface_ioctl(
ether_ioctl(ifp, cmd, data); ether_ioctl(ifp, cmd, data);
break; break;
case SIOCSIFFLAGS: case SIOCSIFFLAGS:
if (ifp->if_flags & IFF_RUNNING) { lpc_eth_up_or_down(e, (ifp->if_flags & IFF_UP) != 0);
/* TODO: off */
}
if (ifp->if_flags & IFF_UP) {
ifp->if_flags |= IFF_RUNNING;
/* TODO: init */
}
break; break;
case SIOCADDMULTI: case SIOCADDMULTI:
case SIOCDELMULTI: case SIOCDELMULTI:
@@ -1395,7 +1396,6 @@ static unsigned lpc_eth_fixup_unit_count(int count, int default_value, int max)
static int lpc_eth_attach(struct rtems_bsdnet_ifconfig *config) static int lpc_eth_attach(struct rtems_bsdnet_ifconfig *config)
{ {
rtems_status_code sc = RTEMS_SUCCESSFUL;
lpc_eth_driver_entry *e = &lpc_eth_driver_data; lpc_eth_driver_entry *e = &lpc_eth_driver_data;
struct ifnet *ifp = &e->arpcom.ac_if; struct ifnet *ifp = &e->arpcom.ac_if;
char *unit_name = NULL; char *unit_name = NULL;
@@ -1446,18 +1446,8 @@ static int lpc_eth_attach(struct rtems_bsdnet_ifconfig *config)
); );
config->xbuf_count = (int) e->tx_unit_count; config->xbuf_count = (int) e->tx_unit_count;
/* Disable interrupts */ /* Remember interrupt number */
lpc_eth->intenable = 0; e->interrupt_number = config->irno;
/* Install interrupt handler */
sc = rtems_interrupt_handler_install(
config->irno,
"Ethernet",
RTEMS_INTERRUPT_UNIQUE,
lpc_eth_interrupt_handler,
e
);
RTEMS_CLEANUP_SC(sc, cleanup, "install interrupt handler");
/* Copy MAC address */ /* Copy MAC address */
memcpy(e->arpcom.ac_enaddr, config->hardware_address, ETHER_ADDR_LEN); memcpy(e->arpcom.ac_enaddr, config->hardware_address, ETHER_ADDR_LEN);
@@ -1515,8 +1505,23 @@ static int lpc_eth_attach(struct rtems_bsdnet_ifconfig *config)
ifp->if_snd.ifq_maxlen = ifqmaxlen; ifp->if_snd.ifq_maxlen = ifqmaxlen;
ifp->if_timer = 0; ifp->if_timer = 0;
/* Create tasks */
e->receive_task = rtems_bsdnet_newproc(
"ntrx",
4096,
lpc_eth_receive_task,
e
);
e->transmit_task = rtems_bsdnet_newproc(
"nttx",
4096,
lpc_eth_transmit_task,
e
);
/* Change status */ /* Change status */
e->state = LPC_ETH_INITIALIZED; ifp->if_flags |= IFF_RUNNING;
e->state = LPC_ETH_STATE_DOWN;
/* Attach the interface */ /* Attach the interface */
if_attach(ifp); if_attach(ifp);