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

Add networking support for griscv bsp

Browse Source 
* Only GRETH device supported for now
	* Fix endian problem in GRETH driver
	* Remove SPARC assembly from greth.c
	* Builds with both autoconf and waf
This commit is contained in:
Jiri Gaisler
2020-10-24 16:43:49 +02:00
parent 7f0379c8dd
commit b4c29b54e7
8 changed files with 117 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bsps/riscv/griscv/console/console.c
View File

@@ -64,7 +64,7 @@ static int find_matching_apbuart(struct ambapp_dev *dev, int index, void *arg)
/* Extract needed information of one APBUART */
apbuarts[uarts].regs = (struct apbuart_regs *)apb->start;
apbuarts[uarts].irq = apb->irq;
apbuarts[uarts].irq = apb->common.irq;
/* Get APBUART core frequency, it is assumed that it is the same
* as Bus frequency where the UART is situated
*/

14
bsps/riscv/griscv/include/bsp.h
View File

@@ -75,6 +75,20 @@ extern void BSP_shared_interrupt_mask(int irq);
extern void BSP_shared_interrupt_clear(int irq);
extern void BSP_shared_interrupt_unmask(int irq);
/*
* Network driver configuration for greth
*/
struct rtems_bsdnet_ifconfig;
extern int rtems_griscv_greth_driver_attach(
struct rtems_bsdnet_ifconfig *config,
int attach
);
#define RTEMS_BSP_NETWORK_DRIVER_NAME "gr_eth1"
#define RTEMS_BSP_NETWORK_DRIVER_ATTACH rtems_griscv_greth_driver_attach
#define GRETH_SUPPORTED
#define CPU_U32_FIX
#ifdef __cplusplus
}
#endif

59
bsps/riscv/griscv/net/griscv_greth.c Normal file
View File

@@ -0,0 +1,59 @@
/*
* LEON3 Opencores Ethernet MAC Configuration Information
*
* COPYRIGHT (c) 2004.
* Gaisler Research
*
* The license and distribution terms for this file may be
* found in the file LICENSE in this distribution or at
* http://www.rtems.org/license/LICENSE.
*/
#include <machine/rtems-bsd-kernel-space.h>
#include <bsp.h>
#include <amba.h>
#include <grlib/ambapp.h>
#include <libchip/greth.h>
/*#if (GRETH_DEBUG & GRETH_DEBUG_PRINT_REGISTERS)*/
#include <stdio.h>
/*#endif*/
/*
* Default sizes of transmit and receive descriptor areas
*/
#define RDA_COUNT 32
#define TDA_COUNT 32
greth_configuration_t griscv_greth_configuration;
int rtems_griscv_greth_driver_attach(
struct rtems_bsdnet_ifconfig *config,
int attach
)
{
unsigned int base_addr = 0; /* avoid warnings */
unsigned int eth_irq = 0; /* avoid warnings */
struct ambapp_dev *adev;
struct ambapp_apb_info *apb;
/* Scan for MAC AHB slave interface */
adev = (void *)ambapp_for_each(&ambapp_plb, (OPTIONS_ALL|OPTIONS_APB_SLVS),
VENDOR_GAISLER, GAISLER_ETHMAC,
ambapp_find_by_idx, NULL);
if (adev) {
apb = DEV_TO_APB(adev);
base_addr = apb->start;
eth_irq = apb->common.irq;
/* clear control register and reset NIC */
*(volatile int *) base_addr = 0;
*(volatile int *) base_addr = GRETH_CTRL_RST;
*(volatile int *) base_addr = 0;
griscv_greth_configuration.base_address = (void*)base_addr;
griscv_greth_configuration.vector = eth_irq; /* on LEON vector is IRQ no. */
griscv_greth_configuration.txd_count = TDA_COUNT;
griscv_greth_configuration.rxd_count = RDA_COUNT;
rtems_greth_driver_attach(config, &griscv_greth_configuration);
}
return 0;
}

24
bsps/shared/grlib/net/greth.c
View File

@@ -25,6 +25,7 @@
#include <rtems/bspIo.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <stdarg.h>
#include <rtems/error.h>
#include <rtems/rtems_bsdnet.h>
@@ -721,10 +722,13 @@ void ipalign(struct mbuf *m)
unsigned int tmp = 0;
if ((((int) m->m_data) & 2) && (m->m_len)) {
#if CPU_LITTLE_ENDIAN == TRUE
memmove((caddr_t)(((int) m->m_data) + 2), m->m_data, m->m_len);
#else
last = (unsigned int *) ((((int) m->m_data) + m->m_len + 8) & ~3);
first = (unsigned int *) (((int) m->m_data) & ~3);
/* tmp = *first << 16; */
asm volatile (" lda [%1] 1, %0\n" : "=r"(tmp) : "r"(first) );
tmp = GRETH_MEM_LOAD(first);
tmp = tmp << 16;
first++;
do {
@@ -733,12 +737,12 @@ void ipalign(struct mbuf *m)
** Load with forced cache miss
* data = *first;
*/
asm volatile (" lda [%1] 1, %0\n" : "=r"(data) : "r"(first) );
data = GRETH_MEM_LOAD(first);
*first = tmp | (data >> 16);
tmp = data << 16;
first++;
} while (first <= last);
#endif
m->m_data = (caddr_t)(((int) m->m_data) + 2);
}
}
@@ -756,7 +760,6 @@ greth_Daemon (void *arg)
SPIN_IRQFLAGS(flags);
int first;
int tmp;
unsigned int addr;
for (;;)
{
@@ -836,14 +839,11 @@ again:
#ifdef CPU_U32_FIX
if(!dp->gbit_mac) {
/* OVERRIDE CACHED ETHERNET HEADER FOR NON-SNOOPING SYSTEMS */
addr = (unsigned int)eh;
asm volatile (" lda [%1] 1, %0\n" : "=r"(tmp) : "r"(addr) );
addr+=4;
asm volatile (" lda [%1] 1, %0\n" : "=r"(tmp) : "r"(addr) );
addr+=4;
asm volatile (" lda [%1] 1, %0\n" : "=r"(tmp) : "r"(addr) );
addr+=4;
asm volatile (" lda [%1] 1, %0\n" : "=r"(tmp) : "r"(addr) );
tmp = GRETH_MEM_LOAD((uintptr_t)eh);
tmp = GRETH_MEM_LOAD(4+(uintptr_t)eh);
tmp = GRETH_MEM_LOAD(8+(uintptr_t)eh);
tmp = GRETH_MEM_LOAD(12+(uintptr_t)eh);
(void)tmp;
ipalign(m); /* Align packet on 32-bit boundary */
}

6
bsps/shared/net/greth2.c
View File

@@ -21,6 +21,7 @@
#include <rtems/bspIo.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <stdarg.h>
#include <rtems/error.h>
#include <rtems/rtems_bsdnet.h>
@@ -514,6 +515,9 @@ void ipalign(struct mbuf *m)
unsigned int tmp;
if ((((int) m->m_data) & 2) && (m->m_len)) {
#if CPU_LITTLE_ENDIAN == TRUE
memmove((caddr_t)(((int) m->m_data) + 2), m->m_data, m->m_len);
#else
last = (unsigned int *) ((((int) m->m_data) + m->m_len + 8) & ~3);
first = (unsigned int *) (((int) m->m_data) & ~3);
tmp = GRETH_MEM_LOAD(first);
@@ -529,7 +533,7 @@ void ipalign(struct mbuf *m)
tmp = data << 16;
first++;
} while (first <= last);
#endif
m->m_data = (caddr_t)(((int) m->m_data) + 2);
}
}

6
c/src/lib/libbsp/riscv/griscv/Makefile.am
View File

@@ -64,6 +64,12 @@ if HAS_SMP
librtemsbsp_a_SOURCES += ../../../../../../bsps/riscv/griscv/start/bspsmp.c
endif
if HAS_NETWORKING
if !HAS_SMP
librtemsbsp_a_SOURCES += ../../../../../../bsps/riscv/griscv/net/griscv_greth.c
endif
endif
include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
include $(srcdir)/../../../../../../bsps/shared/grlib-sources.am
include $(srcdir)/../../../../../../bsps/shared/shared-sources.am

2
spec/build/bsps/riscv/griscv/grp.yml
View File

@@ -23,6 +23,8 @@ links:
uid: abi
- role: build-dependency
uid: obj
- role: build-dependency
uid: objnetnosmp
- role: build-dependency
uid: objsmp
- role: build-dependency

18
spec/build/bsps/riscv/griscv/objnetnosmp.yml Normal file
View File

@@ -0,0 +1,18 @@
SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
build-type: objects
cflags: []
copyrights:
- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
cppflags: []
cxxflags: []
enabled-by:
- and:
- RTEMS_NETWORKING
- not: RTEMS_SMP
includes:
- cpukit/libnetworking
install: []
links: []
source:
- bsps/riscv/griscv/net/griscv_greth.c
type: build