minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-08 11:36:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

drivers/qe: Change QE RISC ALLOCATION to support 4 RISCs

Browse Source 
Also define the QE_RISC_ALLOCATION_RISCs to MACROs instead of using enum, and
define MAX_QE_RISC for QE based silicons.

Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
Acked-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
Haiying Wang 2009-05-21 15:34:14 -04:00 committed by Kumar Gala
parent b3d7f20f43
commit 7211fbfa18
5 changed files with 52 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/qe/qe.c
View File

@ -258,9 +258,6 @@ int qe_set_mii_clk_src(int ucc_num)
return 0; return 0;
} }
/* The maximum number of RISCs we support */
#define MAX_QE_RISC 2
/* Firmware information stored here for qe_get_firmware_info() */ /* Firmware information stored here for qe_get_firmware_info() */
static struct qe_firmware_info qe_firmware_info; static struct qe_firmware_info qe_firmware_info;

17
drivers/qe/qe.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2006 Freescale Semiconductor, Inc. * Copyright (C) 2006-2009 Freescale Semiconductor, Inc.
* *
* Dave Liu <daveliu@freescale.com> * Dave Liu <daveliu@freescale.com>
* based on source code of Shlomi Gridish * based on source code of Shlomi Gridish
@ -46,11 +46,16 @@ typedef struct qe_snum {
/* QE RISC allocation /* QE RISC allocation
*/ */
typedef enum qe_risc_allocation { #define QE_RISC_ALLOCATION_RISC1 0x1 /* RISC 1 */
QE_RISC_ALLOCATION_RISC1 = 1, /* RISC 1 */ #define QE_RISC_ALLOCATION_RISC2 0x2 /* RISC 2 */
QE_RISC_ALLOCATION_RISC2 = 2, /* RISC 2 */ #define QE_RISC_ALLOCATION_RISC3 0x4 /* RISC 3 */
QE_RISC_ALLOCATION_RISC1_AND_RISC2 = 3 /* RISC 1 or RISC 2 */ #define QE_RISC_ALLOCATION_RISC4 0x8 /* RISC 4 */
} qe_risc_allocation_e; #define QE_RISC_ALLOCATION_RISC1_AND_RISC2 (QE_RISC_ALLOCATION_RISC1 | \
QE_RISC_ALLOCATION_RISC2)
#define QE_RISC_ALLOCATION_FOUR_RISCS (QE_RISC_ALLOCATION_RISC1 | \
QE_RISC_ALLOCATION_RISC2 | \
QE_RISC_ALLOCATION_RISC3 | \
QE_RISC_ALLOCATION_RISC4)
/* QE CECR commands for UCC fast. /* QE CECR commands for UCC fast.
*/ */

32
drivers/qe/uec.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2006 Freescale Semiconductor, Inc. * Copyright (C) 2006-2009 Freescale Semiconductor, Inc.
* *
* Dave Liu <daveliu@freescale.com> * Dave Liu <daveliu@freescale.com>
* *
@ -46,8 +46,13 @@ static uec_info_t eth1_uec_info = {
.num_threads_tx = UEC_NUM_OF_THREADS_4, .num_threads_tx = UEC_NUM_OF_THREADS_4,
.num_threads_rx = UEC_NUM_OF_THREADS_4, .num_threads_rx = UEC_NUM_OF_THREADS_4,
#endif #endif
#if (MAX_QE_RISC == 4)
.risc_tx = QE_RISC_ALLOCATION_FOUR_RISCS,
.risc_rx = QE_RISC_ALLOCATION_FOUR_RISCS,
#else
.risc_tx = QE_RISC_ALLOCATION_RISC1_AND_RISC2, .risc_tx = QE_RISC_ALLOCATION_RISC1_AND_RISC2,
.risc_rx = QE_RISC_ALLOCATION_RISC1_AND_RISC2, .risc_rx = QE_RISC_ALLOCATION_RISC1_AND_RISC2,
#endif
.tx_bd_ring_len = 16, .tx_bd_ring_len = 16,
.rx_bd_ring_len = 16, .rx_bd_ring_len = 16,
.phy_address = CONFIG_SYS_UEC1_PHY_ADDR, .phy_address = CONFIG_SYS_UEC1_PHY_ADDR,
@ -69,8 +74,13 @@ static uec_info_t eth2_uec_info = {
.num_threads_tx = UEC_NUM_OF_THREADS_4, .num_threads_tx = UEC_NUM_OF_THREADS_4,
.num_threads_rx = UEC_NUM_OF_THREADS_4, .num_threads_rx = UEC_NUM_OF_THREADS_4,
#endif #endif
#if (MAX_QE_RISC == 4)
.risc_tx = QE_RISC_ALLOCATION_FOUR_RISCS,
.risc_rx = QE_RISC_ALLOCATION_FOUR_RISCS,
#else
.risc_tx = QE_RISC_ALLOCATION_RISC1_AND_RISC2, .risc_tx = QE_RISC_ALLOCATION_RISC1_AND_RISC2,
.risc_rx = QE_RISC_ALLOCATION_RISC1_AND_RISC2, .risc_rx = QE_RISC_ALLOCATION_RISC1_AND_RISC2,
#endif
.tx_bd_ring_len = 16, .tx_bd_ring_len = 16,
.rx_bd_ring_len = 16, .rx_bd_ring_len = 16,
.phy_address = CONFIG_SYS_UEC2_PHY_ADDR, .phy_address = CONFIG_SYS_UEC2_PHY_ADDR,
@ -92,8 +102,13 @@ static uec_info_t eth3_uec_info = {
.num_threads_tx = UEC_NUM_OF_THREADS_4, .num_threads_tx = UEC_NUM_OF_THREADS_4,
.num_threads_rx = UEC_NUM_OF_THREADS_4, .num_threads_rx = UEC_NUM_OF_THREADS_4,
#endif #endif
#if (MAX_QE_RISC == 4)
.risc_tx = QE_RISC_ALLOCATION_FOUR_RISCS,
.risc_rx = QE_RISC_ALLOCATION_FOUR_RISCS,
#else
.risc_tx = QE_RISC_ALLOCATION_RISC1_AND_RISC2, .risc_tx = QE_RISC_ALLOCATION_RISC1_AND_RISC2,
.risc_rx = QE_RISC_ALLOCATION_RISC1_AND_RISC2, .risc_rx = QE_RISC_ALLOCATION_RISC1_AND_RISC2,
#endif
.tx_bd_ring_len = 16, .tx_bd_ring_len = 16,
.rx_bd_ring_len = 16, .rx_bd_ring_len = 16,
.phy_address = CONFIG_SYS_UEC3_PHY_ADDR, .phy_address = CONFIG_SYS_UEC3_PHY_ADDR,
@ -115,8 +130,13 @@ static uec_info_t eth4_uec_info = {
.num_threads_tx = UEC_NUM_OF_THREADS_4, .num_threads_tx = UEC_NUM_OF_THREADS_4,
.num_threads_rx = UEC_NUM_OF_THREADS_4, .num_threads_rx = UEC_NUM_OF_THREADS_4,
#endif #endif
#if (MAX_QE_RISC == 4)
.risc_tx = QE_RISC_ALLOCATION_FOUR_RISCS,
.risc_rx = QE_RISC_ALLOCATION_FOUR_RISCS,
#else
.risc_tx = QE_RISC_ALLOCATION_RISC1_AND_RISC2, .risc_tx = QE_RISC_ALLOCATION_RISC1_AND_RISC2,
.risc_rx = QE_RISC_ALLOCATION_RISC1_AND_RISC2, .risc_rx = QE_RISC_ALLOCATION_RISC1_AND_RISC2,
#endif
.tx_bd_ring_len = 16, .tx_bd_ring_len = 16,
.rx_bd_ring_len = 16, .rx_bd_ring_len = 16,
.phy_address = CONFIG_SYS_UEC4_PHY_ADDR, .phy_address = CONFIG_SYS_UEC4_PHY_ADDR,
@ -138,8 +158,13 @@ static uec_info_t eth5_uec_info = {
.num_threads_tx = UEC_NUM_OF_THREADS_4, .num_threads_tx = UEC_NUM_OF_THREADS_4,
.num_threads_rx = UEC_NUM_OF_THREADS_4, .num_threads_rx = UEC_NUM_OF_THREADS_4,
#endif #endif
#if (MAX_QE_RISC == 4)
.risc_tx = QE_RISC_ALLOCATION_FOUR_RISCS,
.risc_rx = QE_RISC_ALLOCATION_FOUR_RISCS,
#else
.risc_tx = QE_RISC_ALLOCATION_RISC1_AND_RISC2, .risc_tx = QE_RISC_ALLOCATION_RISC1_AND_RISC2,
.risc_rx = QE_RISC_ALLOCATION_RISC1_AND_RISC2, .risc_rx = QE_RISC_ALLOCATION_RISC1_AND_RISC2,
#endif
.tx_bd_ring_len = 16, .tx_bd_ring_len = 16,
.rx_bd_ring_len = 16, .rx_bd_ring_len = 16,
.phy_address = CONFIG_SYS_UEC5_PHY_ADDR, .phy_address = CONFIG_SYS_UEC5_PHY_ADDR,
@ -161,8 +186,13 @@ static uec_info_t eth6_uec_info = {
.num_threads_tx = UEC_NUM_OF_THREADS_4, .num_threads_tx = UEC_NUM_OF_THREADS_4,
.num_threads_rx = UEC_NUM_OF_THREADS_4, .num_threads_rx = UEC_NUM_OF_THREADS_4,
#endif #endif
#if (MAX_QE_RISC == 4)
.risc_tx = QE_RISC_ALLOCATION_FOUR_RISCS,
.risc_rx = QE_RISC_ALLOCATION_FOUR_RISCS,
#else
.risc_tx = QE_RISC_ALLOCATION_RISC1_AND_RISC2, .risc_tx = QE_RISC_ALLOCATION_RISC1_AND_RISC2,
.risc_rx = QE_RISC_ALLOCATION_RISC1_AND_RISC2, .risc_rx = QE_RISC_ALLOCATION_RISC1_AND_RISC2,
#endif
.tx_bd_ring_len = 16, .tx_bd_ring_len = 16,
.rx_bd_ring_len = 16, .rx_bd_ring_len = 16,
.phy_address = CONFIG_SYS_UEC6_PHY_ADDR, .phy_address = CONFIG_SYS_UEC6_PHY_ADDR,

4
drivers/qe/uec.h
View File

@ -654,8 +654,8 @@ typedef struct uec_info {
ucc_fast_info_t uf_info; ucc_fast_info_t uf_info;
uec_num_of_threads_e num_threads_tx; uec_num_of_threads_e num_threads_tx;
uec_num_of_threads_e num_threads_rx; uec_num_of_threads_e num_threads_rx;
qe_risc_allocation_e risc_tx; unsigned int risc_tx;
qe_risc_allocation_e risc_rx; unsigned int risc_rx;
u16 rx_bd_ring_len; u16 rx_bd_ring_len;
u16 tx_bd_ring_len; u16 tx_bd_ring_len;
u8 phy_address; u8 phy_address;

8
include/asm-ppc/immap_qe.h
View File

@ -607,4 +607,12 @@ extern qe_map_t *qe_immr;
#define QE_MURAM_SIZE 0x4000UL #define QE_MURAM_SIZE 0x4000UL
#endif #endif
#if defined(CONFIG_MPC8323)
#define MAX_QE_RISC 1
#elif defined(CONFIG_MPC8569)
#define MAX_QE_RISC 4
#else
#define MAX_QE_RISC 2
#endif
#endif /* __IMMAP_QE_H__ */ #endif /* __IMMAP_QE_H__ */