[rtems commit] LEON3: Network initialization code updated to new AMBAPP layer
gedare at rtems.org
gedare at rtems.org
Wed Apr 18 01:59:50 UTC 2012
Module: rtems
Branch: master
Commit: fc6f872d3f1296085e874154f3381dbae49886ac
Changeset: http://git.rtems.org/rtems/commit/?id=fc6f872d3f1296085e874154f3381dbae49886ac
Author: Daniel Hellstrom <daniel at gaisler.com>
Date: Tue Apr 17 16:25:41 2012 +0200
LEON3: Network initialization code updated to new AMBAPP layer
Updated SMC91111, GRETH and open_eth driver registration
code to use new AMBAPP Layer.
Signed-off-by: Daniel Hellstrom <daniel at gaisler.com>
---
.../lib/libbsp/sparc/leon3/leon_greth/leon_greth.c | 16 ++++---
.../sparc/leon3/leon_open_eth/leon_open_eth.c | 35 ++++++++---------
.../sparc/leon3/leon_smc91111/leon_smc91111.c | 40 ++++++++++++-------
3 files changed, 50 insertions(+), 41 deletions(-)
diff --git a/c/src/lib/libbsp/sparc/leon3/leon_greth/leon_greth.c b/c/src/lib/libbsp/sparc/leon3/leon_greth/leon_greth.c
index 5641575..4c4c0b1 100644
--- a/c/src/lib/libbsp/sparc/leon3/leon_greth/leon_greth.c
+++ b/c/src/lib/libbsp/sparc/leon3/leon_greth/leon_greth.c
@@ -31,17 +31,19 @@ int rtems_leon_greth_driver_attach(
int attach
)
{
- int device_found = 0;
unsigned int base_addr = 0; /* avoid warnings */
unsigned int eth_irq = 0; /* avoid warnings */
- amba_apb_device apbgreth;
+ struct ambapp_dev *adev;
+ struct ambapp_apb_info *apb;
/* Scan for MAC AHB slave interface */
- device_found = amba_find_apbslv(&amba_conf,VENDOR_GAISLER,GAISLER_ETHMAC,&apbgreth);
- if (device_found == 1)
- {
- base_addr = apbgreth.start;
- eth_irq = apbgreth.irq;
+ 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->irq;
/* clear control register and reset NIC */
*(volatile int *) base_addr = 0;
diff --git a/c/src/lib/libbsp/sparc/leon3/leon_open_eth/leon_open_eth.c b/c/src/lib/libbsp/sparc/leon3/leon_open_eth/leon_open_eth.c
index 5799f83..a6bb848 100644
--- a/c/src/lib/libbsp/sparc/leon3/leon_open_eth/leon_open_eth.c
+++ b/c/src/lib/libbsp/sparc/leon3/leon_open_eth/leon_open_eth.c
@@ -31,31 +31,27 @@ int rtems_leon_open_eth_driver_attach(
int attach
)
{
- int device_found = 0;
- int i;
- unsigned int conf, iobar;
unsigned int base_addr = 0; /* avoid warnings */
unsigned int eth_irq = 0; /* avoid warnings */
-
+ struct ambapp_dev *adev;
+ struct ambapp_ahb_info *ahb;
/* Scan for MAC AHB slave interface */
- for (i = 0; i < amba_conf.ahbslv.devnr; i++)
- {
- conf = amba_get_confword(amba_conf.ahbslv, i, 0);
- if (((amba_vendor(conf) == VENDOR_OPENCORES) && (amba_device(conf) == OPENCORES_ETHMAC)) ||
- ((amba_vendor(conf) == VENDOR_GAISLER) && (amba_device(conf) == GAISLER_ETHAHB)))
- {
- iobar = amba_ahb_get_membar(amba_conf.ahbslv, i, 0);
- base_addr = amba_iobar_start(LEON3_IO_AREA, iobar);
- eth_irq = amba_irq(conf);
- device_found = 1;
- break;
- }
+ adev = (void *)ambapp_for_each(&ambapp_plb, (OPTIONS_ALL|OPTIONS_AHB_SLVS),
+ VENDOR_OPENCORES, OPENCORES_ETHMAC,
+ ambapp_find_by_idx, NULL);
+ if (!adev) {
+ adev = (void *)ambapp_for_each(&ambapp_plb, (OPTIONS_ALL|OPTIONS_AHB_SLVS),
+ VENDOR_GAISLER, GAISLER_ETHAHB,
+ ambapp_find_by_idx, NULL);
}
-
- if (device_found)
+ if (adev)
{
+ ahb = DEV_TO_AHB(adev);
+ base_addr = ahb->start[0];
+ eth_irq = ahb->irq;
+
/* clear control register and reset NIC */
*(volatile int *) base_addr = 0;
*(volatile int *) base_addr = 0x800;
@@ -65,7 +61,8 @@ int rtems_leon_open_eth_driver_attach(
leon_open_eth_configuration.txd_count = TDA_COUNT;
leon_open_eth_configuration.rxd_count = RDA_COUNT;
/* enable 100 MHz operation only if cpu frequency >= 50 MHz */
- if (LEON3_Timer_Regs->scaler_reload >= 49) leon_open_eth_configuration.en100MHz = 1;
+ if (LEON3_Timer_Regs->scaler_reload >= 49)
+ leon_open_eth_configuration.en100MHz = 1;
if (rtems_open_eth_driver_attach( config, &leon_open_eth_configuration )) {
LEON_Clear_interrupt(eth_irq);
LEON_Unmask_interrupt(eth_irq);
diff --git a/c/src/lib/libbsp/sparc/leon3/leon_smc91111/leon_smc91111.c b/c/src/lib/libbsp/sparc/leon3/leon_smc91111/leon_smc91111.c
index 841c4b6..9e582fb 100644
--- a/c/src/lib/libbsp/sparc/leon3/leon_smc91111/leon_smc91111.c
+++ b/c/src/lib/libbsp/sparc/leon3/leon_smc91111/leon_smc91111.c
@@ -1,11 +1,14 @@
-/*
- * $Id$
+/* LEON3 BSP SMC91111 registration and low-level initialization
+ *
+ * The license and distribution terms for this file may be
+ * found in the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
*/
#include <bsp.h>
#include <libchip/smc91111exp.h>
#include <rtems/bspIo.h>
-
+#include <ambapp.h>
#define SMC91111_BASE_ADDR (void*)0x20000300
#define SMC91111_BASE_IRQ 4
@@ -32,21 +35,29 @@ rtems_smc91111_driver_attach_leon3 (struct rtems_bsdnet_ifconfig *config,
{
unsigned long addr_mctrl = 0;
LEON3_IOPORT_Regs_Map *io;
+ struct ambapp_apb_info apbpio;
+ struct ambapp_apb_info apbmctrl;
- amba_apb_device apbpio;
- amba_ahb_device apbmctrl;
-
- if ( amba_find_apbslv(&amba_conf,VENDOR_GAISLER,GAISLER_PIOPORT,&apbpio) != 1 ){
+ if (ambapp_find_apbslv(&ambapp_plb, VENDOR_GAISLER, GAISLER_GPIO, &apbpio)
+ != 1) {
printk("SMC9111_leon3: didn't find PIO\n");
return 0;
}
- /* Find LEON2 memory controller */
- if ( amba_find_ahbslv(&amba_conf,VENDOR_ESA,ESA_MCTRL,&apbmctrl) != 1 ){
- /* LEON2 memory controller not found, search for fault tolerant memory controller */
- if ( amba_find_ahbslv(&amba_conf,VENDOR_GAISLER,GAISLER_FTMCTRL,&apbmctrl) != 1 ) {
- printk("SMC9111_leon3: didn't find any memory controller\n");
- return 0;
+ /* In order to access the SMC controller the memory controller must have
+ * I/O bus enabled. Find first memory controller.
+ */
+ if (ambapp_find_apbslv(&ambapp_plb, VENDOR_ESA, ESA_MCTRL, &apbmctrl) != 1) {
+ if (ambapp_find_apbslv(&ambapp_plb, VENDOR_GAISLER, GAISLER_FTMCTRL,
+ &apbmctrl) != 1) {
+ if (ambapp_find_apbslv(&ambapp_plb, VENDOR_GAISLER, GAISLER_FTSRCTRL,
+ &apbmctrl) != 1) {
+ if (ambapp_find_apbslv(&ambapp_plb, VENDOR_GAISLER, GAISLER_FTSRCTRL8,
+ &apbmctrl) != 1) {
+ printk("SMC9111_leon3: didn't find any memory controller\n");
+ return 0;
+ }
+ }
}
}
@@ -68,6 +79,5 @@ rtems_smc91111_driver_attach_leon3 (struct rtems_bsdnet_ifconfig *config,
/* Setup memory controller I/O waitstates */
*((volatile unsigned int *) addr_mctrl) |= 0x10f80000; /* enable I/O area access */
- return _rtems_smc91111_driver_attach (config,
- &leon_scmv91111_configuration);
+ return _rtems_smc91111_driver_attach(config, &leon_scmv91111_configuration);
};
More information about the vc
mailing list