Skip to content

L
linux-davinci
Commit 18a8e864 authored by Li Yang's avatar Li Yang Committed by Jeff Garzik
Browse files
Options

[PATCH] ucc_geth: changes to ucc_geth driver as a result of qe_lib changes and bugfixes 

changes due to qe_lib changes include:

o removed inclusion of platform header file
o removed platform_device code, replaced with of_device
o removed typedefs
o uint -> u32 conversions
o removed following defines:
  QE_SIZEOF_BD, BD_BUFFER_ARG, BD_BUFFER_CLEAR, BD_BUFFER,
  BD_STATUS_AND_LENGTH_SET, BD_STATUS_AND_LENGTH, and BD_BUFFER_SET
  because they hid sizeof/in_be32/out_be32 operations from the reader.
o removed irrelevant comments, added others to resemble removed BD_ defines
o const'd and uncasted all get_property() assignments

bugfixes, courtesy of Scott Wood, include:

- Read phy_address as a u32, not u8.
- Match on type == "network" as well as compatible == "ucc_geth", as
  device_is_compatible() will only compare up to the length of the
  test string, allowing "ucc_geth_phy" to match as well.
- fixes the MAC setting code in ucc_geth.c.  The old code was overwriting and dereferencing random stack contents.
Signed-off-by: default avatarLi Yang <leoli@freescale.com>
Signed-off-by: default avatarKim Phillips <kim.phillips@freescale.com>
Signed-off-by: default avatarScott Wood <scottwood@freescale.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 470ea7eb
Hide whitespace changes
Inline Side-by-side
Showing with 475 additions and 436 deletions
drivers/net/Kconfig
View file @ 18a8e864
...@@ -2288,7 +2288,7 @@ config UGETH_TX_ON_DEMOND ...@@ -2288,7 +2288,7 @@ config UGETH_TX_ON_DEMOND
config UGETH_HAS_GIGA config UGETH_HAS_GIGA
bool bool
depends on UCC_GETH && MPC836x depends on UCC_GETH && PPC_MPC836x
config MV643XX_ETH config MV643XX_ETH
tristate "MV-643XX Ethernet support" tristate "MV-643XX Ethernet support"
......
drivers/net/ucc_geth.c
View file @ 18a8e864
...@@ -2,14 +2,11 @@ ...@@ -2,14 +2,11 @@
* Copyright (C) Freescale Semicondutor, Inc. 2006. All rights reserved. * Copyright (C) Freescale Semicondutor, Inc. 2006. All rights reserved.
* *
* Author: Shlomi Gridish <gridish@freescale.com> * Author: Shlomi Gridish <gridish@freescale.com>
* Li Yang <leoli@freescale.com>
* *
* Description: * Description:
* QE UCC Gigabit Ethernet Driver * QE UCC Gigabit Ethernet Driver
* *
* Changelog:
* Jul 6, 2006 Li Yang <LeoLi@freescale.com>
* - Rearrange code and style fixes
*
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the * under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your * Free Software Foundation; either version 2 of the License, or (at your
...@@ -31,9 +28,9 @@ ...@@ -31,9 +28,9 @@
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/fsl_devices.h> #include <linux/fsl_devices.h>
#include <linux/ethtool.h> #include <linux/ethtool.h>
#include <linux/platform_device.h>
#include <linux/mii.h> #include <linux/mii.h>
#include <asm/of_device.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/io.h> #include <asm/io.h>
...@@ -70,7 +67,7 @@ ...@@ -70,7 +67,7 @@
static DEFINE_SPINLOCK(ugeth_lock); static DEFINE_SPINLOCK(ugeth_lock);
static ucc_geth_info_t ugeth_primary_info = { static struct ucc_geth_info ugeth_primary_info = {
.uf_info = { .uf_info = {
.bd_mem_part = MEM_PART_SYSTEM, .bd_mem_part = MEM_PART_SYSTEM,
.rtsm = UCC_FAST_SEND_IDLES_BETWEEN_FRAMES, .rtsm = UCC_FAST_SEND_IDLES_BETWEEN_FRAMES,
...@@ -163,7 +160,7 @@ static ucc_geth_info_t ugeth_primary_info = { ...@@ -163,7 +160,7 @@ static ucc_geth_info_t ugeth_primary_info = {
.riscRx = QE_RISC_ALLOCATION_RISC1_AND_RISC2, .riscRx = QE_RISC_ALLOCATION_RISC1_AND_RISC2,
}; };
static ucc_geth_info_t ugeth_info[8]; static struct ucc_geth_info ugeth_info[8];
#ifdef DEBUG #ifdef DEBUG
static void mem_disp(u8 *addr, int size) static void mem_disp(u8 *addr, int size)
...@@ -219,8 +216,8 @@ static struct list_head *dequeue(struct list_head *lh) ...@@ -219,8 +216,8 @@ static struct list_head *dequeue(struct list_head *lh)
} }
} }
static int get_interface_details(enet_interface_e enet_interface, static int get_interface_details(enum enet_interface enet_interface,
enet_speed_e *speed, enum enet_speed *speed,
int *r10m, int *r10m,
int *rmm, int *rmm,
int *rpm, int *rpm,
...@@ -283,7 +280,7 @@ static int get_interface_details(enet_interface_e enet_interface, ...@@ -283,7 +280,7 @@ static int get_interface_details(enet_interface_e enet_interface,
return 0; return 0;
} }
static struct sk_buff *get_new_skb(ucc_geth_private_t *ugeth, u8 *bd) static struct sk_buff *get_new_skb(struct ucc_geth_private *ugeth, u8 *bd)
{ {
struct sk_buff *skb = NULL; struct sk_buff *skb = NULL;
...@@ -303,21 +300,19 @@ static struct sk_buff *get_new_skb(ucc_geth_private_t *ugeth, u8 *bd) ...@@ -303,21 +300,19 @@ static struct sk_buff *get_new_skb(ucc_geth_private_t *ugeth, u8 *bd)
skb->dev = ugeth->dev; skb->dev = ugeth->dev;
BD_BUFFER_SET(bd, out_be32(&((struct qe_bd *)bd)->buf,
dma_map_single(NULL, dma_map_single(NULL,
skb->data, skb->data,
ugeth->ug_info->uf_info.max_rx_buf_length + ugeth->ug_info->uf_info.max_rx_buf_length +
UCC_GETH_RX_DATA_BUF_ALIGNMENT, UCC_GETH_RX_DATA_BUF_ALIGNMENT,
DMA_FROM_DEVICE)); DMA_FROM_DEVICE));
BD_STATUS_AND_LENGTH_SET(bd, out_be32((u32 *)bd, (R_E | R_I | (in_be32((u32 *)bd) & R_W)));
(R_E | R_I |
(BD_STATUS_AND_LENGTH(bd) & R_W)));
return skb; return skb;
} }
static int rx_bd_buffer_set(ucc_geth_private_t *ugeth, u8 rxQ) static int rx_bd_buffer_set(struct ucc_geth_private *ugeth, u8 rxQ)
{ {
u8 *bd; u8 *bd;
u32 bd_status; u32 bd_status;
...@@ -328,7 +323,7 @@ static int rx_bd_buffer_set(ucc_geth_private_t *ugeth, u8 rxQ) ...@@ -328,7 +323,7 @@ static int rx_bd_buffer_set(ucc_geth_private_t *ugeth, u8 rxQ)
i = 0; i = 0;
do { do {
bd_status = BD_STATUS_AND_LENGTH(bd); bd_status = in_be32((u32*)bd);
skb = get_new_skb(ugeth, bd); skb = get_new_skb(ugeth, bd);
if (!skb) /* If can not allocate data buffer, if (!skb) /* If can not allocate data buffer,
...@@ -338,19 +333,19 @@ static int rx_bd_buffer_set(ucc_geth_private_t *ugeth, u8 rxQ) ...@@ -338,19 +333,19 @@ static int rx_bd_buffer_set(ucc_geth_private_t *ugeth, u8 rxQ)
ugeth->rx_skbuff[rxQ][i] = skb; ugeth->rx_skbuff[rxQ][i] = skb;
/* advance the BD pointer */ /* advance the BD pointer */
bd += UCC_GETH_SIZE_OF_BD; bd += sizeof(struct qe_bd);
i++; i++;
} while (!(bd_status & R_W)); } while (!(bd_status & R_W));
return 0; return 0;
} }
static int fill_init_enet_entries(ucc_geth_private_t *ugeth, static int fill_init_enet_entries(struct ucc_geth_private *ugeth,
volatile u32 *p_start, volatile u32 *p_start,
u8 num_entries, u8 num_entries,
u32 thread_size, u32 thread_size,
u32 thread_alignment, u32 thread_alignment,
qe_risc_allocation_e risc, enum qe_risc_allocation risc,
int skip_page_for_first_entry) int skip_page_for_first_entry)
{ {
u32 init_enet_offset; u32 init_enet_offset;
...@@ -383,10 +378,10 @@ static int fill_init_enet_entries(ucc_geth_private_t *ugeth, ...@@ -383,10 +378,10 @@ static int fill_init_enet_entries(ucc_geth_private_t *ugeth,
return 0; return 0;
} }
static int return_init_enet_entries(ucc_geth_private_t *ugeth, static int return_init_enet_entries(struct ucc_geth_private *ugeth,
volatile u32 *p_start, volatile u32 *p_start,
u8 num_entries, u8 num_entries,
qe_risc_allocation_e risc, enum qe_risc_allocation risc,
int skip_page_for_first_entry) int skip_page_for_first_entry)
{ {
u32 init_enet_offset; u32 init_enet_offset;
...@@ -416,11 +411,11 @@ static int return_init_enet_entries(ucc_geth_private_t *ugeth, ...@@ -416,11 +411,11 @@ static int return_init_enet_entries(ucc_geth_private_t *ugeth,
} }
#ifdef DEBUG #ifdef DEBUG
static int dump_init_enet_entries(ucc_geth_private_t *ugeth, static int dump_init_enet_entries(struct ucc_geth_private *ugeth,
volatile u32 *p_start, volatile u32 *p_start,
u8 num_entries, u8 num_entries,
u32 thread_size, u32 thread_size,
qe_risc_allocation_e risc, enum qe_risc_allocation risc,
int skip_page_for_first_entry) int skip_page_for_first_entry)
{ {
u32 init_enet_offset; u32 init_enet_offset;
...@@ -456,14 +451,14 @@ static int dump_init_enet_entries(ucc_geth_private_t *ugeth, ...@@ -456,14 +451,14 @@ static int dump_init_enet_entries(ucc_geth_private_t *ugeth,
#endif #endif
#ifdef CONFIG_UGETH_FILTERING #ifdef CONFIG_UGETH_FILTERING
static enet_addr_container_t *get_enet_addr_container(void) static struct enet_addr_container *get_enet_addr_container(void)
{ {
enet_addr_container_t *enet_addr_cont; struct enet_addr_container *enet_addr_cont;
/* allocate memory */ /* allocate memory */
enet_addr_cont = kmalloc(sizeof(enet_addr_container_t), GFP_KERNEL); enet_addr_cont = kmalloc(sizeof(struct enet_addr_container), GFP_KERNEL);
if (!enet_addr_cont) { if (!enet_addr_cont) {
ugeth_err("%s: No memory for enet_addr_container_t object.", ugeth_err("%s: No memory for enet_addr_container object.",
__FUNCTION__); __FUNCTION__);
return NULL; return NULL;
} }
...@@ -472,45 +467,43 @@ static enet_addr_container_t *get_enet_addr_container(void) ...@@ -472,45 +467,43 @@ static enet_addr_container_t *get_enet_addr_container(void)
} }
#endif /* CONFIG_UGETH_FILTERING */ #endif /* CONFIG_UGETH_FILTERING */
static void put_enet_addr_container(enet_addr_container_t *enet_addr_cont) static void put_enet_addr_container(struct enet_addr_container *enet_addr_cont)
{ {
kfree(enet_addr_cont); kfree(enet_addr_cont);
} }
static int set_mac_addr(__be16 __iomem *reg, u8 *mac)
{
out_be16(&reg[0], ((u16)mac[5] << 8) | mac[4]);
out_be16(&reg[1], ((u16)mac[3] << 8) | mac[2]);
out_be16(&reg[2], ((u16)mac[1] << 8) | mac[0]);
}
#ifdef CONFIG_UGETH_FILTERING #ifdef CONFIG_UGETH_FILTERING
static int hw_add_addr_in_paddr(ucc_geth_private_t *ugeth, static int hw_add_addr_in_paddr(struct ucc_geth_private *ugeth,
enet_addr_t *p_enet_addr, u8 paddr_num) u8 *p_enet_addr, u8 paddr_num)
{ {
ucc_geth_82xx_address_filtering_pram_t *p_82xx_addr_filt; struct ucc_geth_82xx_address_filtering_pram *p_82xx_addr_filt;
if (!(paddr_num < NUM_OF_PADDRS)) { if (!(paddr_num < NUM_OF_PADDRS)) {
ugeth_warn("%s: Illagel paddr_num.", __FUNCTION__); ugeth_warn("%s: Illegal paddr_num.", __FUNCTION__);
return -EINVAL; return -EINVAL;
} }
p_82xx_addr_filt = p_82xx_addr_filt =
(ucc_geth_82xx_address_filtering_pram_t *) ugeth->p_rx_glbl_pram-> (struct ucc_geth_82xx_address_filtering_pram *) ugeth->p_rx_glbl_pram->
addressfiltering; addressfiltering;
/* Ethernet frames are defined in Little Endian mode, */ /* Ethernet frames are defined in Little Endian mode, */
/* therefore to insert the address we reverse the bytes. */ /* therefore to insert the address we reverse the bytes. */
out_be16(&p_82xx_addr_filt->paddr[paddr_num].h, set_mac_addr(&p_82xx_addr_filt->paddr[paddr_num].h, p_enet_addr);
(u16) (((u16) (((u16) ((*p_enet_addr)[5])) << 8)) |
(u16) (*p_enet_addr)[4]));
out_be16(&p_82xx_addr_filt->paddr[paddr_num].m,
(u16) (((u16) (((u16) ((*p_enet_addr)[3])) << 8)) |
(u16) (*p_enet_addr)[2]));
out_be16(&p_82xx_addr_filt->paddr[paddr_num].l,
(u16) (((u16) (((u16) ((*p_enet_addr)[1])) << 8)) |
(u16) (*p_enet_addr)[0]));
return 0; return 0;
} }
#endif /* CONFIG_UGETH_FILTERING */ #endif /* CONFIG_UGETH_FILTERING */
static int hw_clear_addr_in_paddr(ucc_geth_private_t *ugeth, u8 paddr_num) static int hw_clear_addr_in_paddr(struct ucc_geth_private *ugeth, u8 paddr_num)
{ {
ucc_geth_82xx_address_filtering_pram_t *p_82xx_addr_filt; struct ucc_geth_82xx_address_filtering_pram *p_82xx_addr_filt;
if (!(paddr_num < NUM_OF_PADDRS)) { if (!(paddr_num < NUM_OF_PADDRS)) {
ugeth_warn("%s: Illagel paddr_num.", __FUNCTION__); ugeth_warn("%s: Illagel paddr_num.", __FUNCTION__);
...@@ -518,7 +511,7 @@ static int hw_clear_addr_in_paddr(ucc_geth_private_t *ugeth, u8 paddr_num) ...@@ -518,7 +511,7 @@ static int hw_clear_addr_in_paddr(ucc_geth_private_t *ugeth, u8 paddr_num)
} }
p_82xx_addr_filt = p_82xx_addr_filt =
(ucc_geth_82xx_address_filtering_pram_t *) ugeth->p_rx_glbl_pram-> (struct ucc_geth_82xx_address_filtering_pram *) ugeth->p_rx_glbl_pram->
addressfiltering; addressfiltering;
/* Writing address ff.ff.ff.ff.ff.ff disables address /* Writing address ff.ff.ff.ff.ff.ff disables address
...@@ -530,14 +523,14 @@ static int hw_clear_addr_in_paddr(ucc_geth_private_t *ugeth, u8 paddr_num) ...@@ -530,14 +523,14 @@ static int hw_clear_addr_in_paddr(ucc_geth_private_t *ugeth, u8 paddr_num)
return 0; return 0;
} }
static void hw_add_addr_in_hash(ucc_geth_private_t *ugeth, static void hw_add_addr_in_hash(struct ucc_geth_private *ugeth,
enet_addr_t *p_enet_addr) u8 *p_enet_addr)
{ {
ucc_geth_82xx_address_filtering_pram_t *p_82xx_addr_filt; struct ucc_geth_82xx_address_filtering_pram *p_82xx_addr_filt;
u32 cecr_subblock; u32 cecr_subblock;
p_82xx_addr_filt = p_82xx_addr_filt =
(ucc_geth_82xx_address_filtering_pram_t *) ugeth->p_rx_glbl_pram-> (struct ucc_geth_82xx_address_filtering_pram *) ugeth->p_rx_glbl_pram->
addressfiltering; addressfiltering;
cecr_subblock = cecr_subblock =
...@@ -546,25 +539,18 @@ static void hw_add_addr_in_hash(ucc_geth_private_t *ugeth, ...@@ -546,25 +539,18 @@ static void hw_add_addr_in_hash(ucc_geth_private_t *ugeth,
/* Ethernet frames are defined in Little Endian mode, /* Ethernet frames are defined in Little Endian mode,
therefor to insert */ therefor to insert */
/* the address to the hash (Big Endian mode), we reverse the bytes.*/ /* the address to the hash (Big Endian mode), we reverse the bytes.*/
out_be16(&p_82xx_addr_filt->taddr.h,
(u16) (((u16) (((u16) ((*p_enet_addr)[5])) << 8)) | set_mac_addr(&p_82xx_addr_filt->taddr.h, p_enet_addr);
(u16) (*p_enet_addr)[4]));
out_be16(&p_82xx_addr_filt->taddr.m,
(u16) (((u16) (((u16) ((*p_enet_addr)[3])) << 8)) |
(u16) (*p_enet_addr)[2]));
out_be16(&p_82xx_addr_filt->taddr.l,
(u16) (((u16) (((u16) ((*p_enet_addr)[1])) << 8)) |
(u16) (*p_enet_addr)[0]));
qe_issue_cmd(QE_SET_GROUP_ADDRESS, cecr_subblock, qe_issue_cmd(QE_SET_GROUP_ADDRESS, cecr_subblock,
(u8) QE_CR_PROTOCOL_ETHERNET, 0); QE_CR_PROTOCOL_ETHERNET, 0);
} }
#ifdef CONFIG_UGETH_MAGIC_PACKET #ifdef CONFIG_UGETH_MAGIC_PACKET
static void magic_packet_detection_enable(ucc_geth_private_t *ugeth) static void magic_packet_detection_enable(struct ucc_geth_private *ugeth)
{ {
ucc_fast_private_t *uccf; struct ucc_fast_private *uccf;
ucc_geth_t *ug_regs; struct ucc_geth *ug_regs;
u32 maccfg2, uccm; u32 maccfg2, uccm;
uccf = ugeth->uccf; uccf = ugeth->uccf;
...@@ -581,10 +567,10 @@ static void magic_packet_detection_enable(ucc_geth_private_t *ugeth) ...@@ -581,10 +567,10 @@ static void magic_packet_detection_enable(ucc_geth_private_t *ugeth)
out_be32(&ug_regs->maccfg2, maccfg2); out_be32(&ug_regs->maccfg2, maccfg2);
} }
static void magic_packet_detection_disable(ucc_geth_private_t *ugeth) static void magic_packet_detection_disable(struct ucc_geth_private *ugeth)
{ {
ucc_fast_private_t *uccf; struct ucc_fast_private *uccf;
ucc_geth_t *ug_regs; struct ucc_geth *ug_regs;
u32 maccfg2, uccm; u32 maccfg2, uccm;
uccf = ugeth->uccf; uccf = ugeth->uccf;
...@@ -602,26 +588,26 @@ static void magic_packet_detection_disable(ucc_geth_private_t *ugeth) ...@@ -602,26 +588,26 @@ static void magic_packet_detection_disable(ucc_geth_private_t *ugeth)
} }
#endif /* MAGIC_PACKET */ #endif /* MAGIC_PACKET */
static inline int compare_addr(enet_addr_t *addr1, enet_addr_t *addr2) static inline int compare_addr(u8 **addr1, u8 **addr2)
{ {
return memcmp(addr1, addr2, ENET_NUM_OCTETS_PER_ADDRESS); return memcmp(addr1, addr2, ENET_NUM_OCTETS_PER_ADDRESS);
} }
#ifdef DEBUG #ifdef DEBUG
static void get_statistics(ucc_geth_private_t *ugeth, static void get_statistics(struct ucc_geth_private *ugeth,
ucc_geth_tx_firmware_statistics_t * struct ucc_geth_tx_firmware_statistics *
tx_firmware_statistics, tx_firmware_statistics,
ucc_geth_rx_firmware_statistics_t * struct ucc_geth_rx_firmware_statistics *
rx_firmware_statistics, rx_firmware_statistics,
ucc_geth_hardware_statistics_t *hardware_statistics) struct ucc_geth_hardware_statistics *hardware_statistics)
{ {
ucc_fast_t *uf_regs; struct ucc_fast *uf_regs;
ucc_geth_t *ug_regs; struct ucc_geth *ug_regs;
ucc_geth_tx_firmware_statistics_pram_t *p_tx_fw_statistics_pram; struct ucc_geth_tx_firmware_statistics_pram *p_tx_fw_statistics_pram;
ucc_geth_rx_firmware_statistics_pram_t *p_rx_fw_statistics_pram; struct ucc_geth_rx_firmware_statistics_pram *p_rx_fw_statistics_pram;
ug_regs = ugeth->ug_regs; ug_regs = ugeth->ug_regs;
uf_regs = (ucc_fast_t *) ug_regs; uf_regs = (struct ucc_fast *) ug_regs;
p_tx_fw_statistics_pram = ugeth->p_tx_fw_statistics_pram; p_tx_fw_statistics_pram = ugeth->p_tx_fw_statistics_pram;
p_rx_fw_statistics_pram = ugeth->p_rx_fw_statistics_pram; p_rx_fw_statistics_pram = ugeth->p_rx_fw_statistics_pram;
...@@ -727,7 +713,7 @@ static void get_statistics(ucc_geth_private_t *ugeth, ...@@ -727,7 +713,7 @@ static void get_statistics(ucc_geth_private_t *ugeth,
} }
} }
static void dump_bds(ucc_geth_private_t *ugeth) static void dump_bds(struct ucc_geth_private *ugeth)
{ {
int i; int i;
int length; int length;
...@@ -736,7 +722,7 @@ static void dump_bds(ucc_geth_private_t *ugeth) ...@@ -736,7 +722,7 @@ static void dump_bds(ucc_geth_private_t *ugeth)
if (ugeth->p_tx_bd_ring[i]) { if (ugeth->p_tx_bd_ring[i]) {
length = length =
(ugeth->ug_info->bdRingLenTx[i] * (ugeth->ug_info->bdRingLenTx[i] *
UCC_GETH_SIZE_OF_BD); sizeof(struct qe_bd));
ugeth_info("TX BDs[%d]", i); ugeth_info("TX BDs[%d]", i);
mem_disp(ugeth->p_tx_bd_ring[i], length); mem_disp(ugeth->p_tx_bd_ring[i], length);
} }
...@@ -745,14 +731,14 @@ static void dump_bds(ucc_geth_private_t *ugeth) ...@@ -745,14 +731,14 @@ static void dump_bds(ucc_geth_private_t *ugeth)
if (ugeth->p_rx_bd_ring[i]) { if (ugeth->p_rx_bd_ring[i]) {
length = length =
(ugeth->ug_info->bdRingLenRx[i] * (ugeth->ug_info->bdRingLenRx[i] *
UCC_GETH_SIZE_OF_BD); sizeof(struct qe_bd));
ugeth_info("RX BDs[%d]", i); ugeth_info("RX BDs[%d]", i);
mem_disp(ugeth->p_rx_bd_ring[i], length); mem_disp(ugeth->p_rx_bd_ring[i], length);
} }
} }
} }
static void dump_regs(ucc_geth_private_t *ugeth) static void dump_regs(struct ucc_geth_private *ugeth)
{ {
int i; int i;
...@@ -893,7 +879,7 @@ static void dump_regs(ucc_geth_private_t *ugeth) ...@@ -893,7 +879,7 @@ static void dump_regs(ucc_geth_private_t *ugeth)
ugeth_info("Base address: 0x%08x", ugeth_info("Base address: 0x%08x",
(u32) & ugeth->p_thread_data_tx[i]); (u32) & ugeth->p_thread_data_tx[i]);
mem_disp((u8 *) & ugeth->p_thread_data_tx[i], mem_disp((u8 *) & ugeth->p_thread_data_tx[i],
sizeof(ucc_geth_thread_data_tx_t)); sizeof(struct ucc_geth_thread_data_tx));
} }
} }
if (ugeth->p_thread_data_rx) { if (ugeth->p_thread_data_rx) {
...@@ -927,7 +913,7 @@ static void dump_regs(ucc_geth_private_t *ugeth) ...@@ -927,7 +913,7 @@ static void dump_regs(ucc_geth_private_t *ugeth)
ugeth_info("Base address: 0x%08x", ugeth_info("Base address: 0x%08x",
(u32) & ugeth->p_thread_data_rx[i]); (u32) & ugeth->p_thread_data_rx[i]);
mem_disp((u8 *) & ugeth->p_thread_data_rx[i], mem_disp((u8 *) & ugeth->p_thread_data_rx[i],
sizeof(ucc_geth_thread_data_rx_t)); sizeof(struct ucc_geth_thread_data_rx));
} }
} }
if (ugeth->p_exf_glbl_param) { if (ugeth->p_exf_glbl_param) {
...@@ -1105,7 +1091,7 @@ static void dump_regs(ucc_geth_private_t *ugeth) ...@@ -1105,7 +1091,7 @@ static void dump_regs(ucc_geth_private_t *ugeth)
ugeth_info("Base address: 0x%08x", ugeth_info("Base address: 0x%08x",
(u32) & ugeth->p_send_q_mem_reg->sqqd[i]); (u32) & ugeth->p_send_q_mem_reg->sqqd[i]);
mem_disp((u8 *) & ugeth->p_send_q_mem_reg->sqqd[i], mem_disp((u8 *) & ugeth->p_send_q_mem_reg->sqqd[i],
sizeof(ucc_geth_send_queue_qd_t)); sizeof(struct ucc_geth_send_queue_qd));
} }
} }
if (ugeth->p_scheduler) { if (ugeth->p_scheduler) {
...@@ -1187,7 +1173,7 @@ static void dump_regs(ucc_geth_private_t *ugeth) ...@@ -1187,7 +1173,7 @@ static void dump_regs(ucc_geth_private_t *ugeth)
qe_muram_addr(in_be32 qe_muram_addr(in_be32
(&ugeth->p_rx_bd_qs_tbl[i]. (&ugeth->p_rx_bd_qs_tbl[i].
bdbaseptr)), bdbaseptr)),
sizeof(ucc_geth_rx_prefetched_bds_t)); sizeof(struct ucc_geth_rx_prefetched_bds));
} }
} }
if (ugeth->p_init_enet_param_shadow) { if (ugeth->p_init_enet_param_shadow) {
...@@ -1198,7 +1184,7 @@ static void dump_regs(ucc_geth_private_t *ugeth) ...@@ -1198,7 +1184,7 @@ static void dump_regs(ucc_geth_private_t *ugeth)
mem_disp((u8 *) ugeth->p_init_enet_param_shadow, mem_disp((u8 *) ugeth->p_init_enet_param_shadow,
sizeof(*ugeth->p_init_enet_param_shadow)); sizeof(*ugeth->p_init_enet_param_shadow));
size = sizeof(ucc_geth_thread_rx_pram_t); size = sizeof(struct ucc_geth_thread_rx_pram);
if (ugeth->ug_info->rxExtendedFiltering) { if (ugeth->ug_info->rxExtendedFiltering) {
size += size +=
THREAD_RX_PRAM_ADDITIONAL_FOR_EXTENDED_FILTERING; THREAD_RX_PRAM_ADDITIONAL_FOR_EXTENDED_FILTERING;
...@@ -1216,7 +1202,7 @@ static void dump_regs(ucc_geth_private_t *ugeth) ...@@ -1216,7 +1202,7 @@ static void dump_regs(ucc_geth_private_t *ugeth)
&(ugeth->p_init_enet_param_shadow-> &(ugeth->p_init_enet_param_shadow->
txthread[0]), txthread[0]),
ENET_INIT_PARAM_MAX_ENTRIES_TX, ENET_INIT_PARAM_MAX_ENTRIES_TX,
sizeof(ucc_geth_thread_tx_pram_t), sizeof(struct ucc_geth_thread_tx_pram),
ugeth->ug_info->riscTx, 0); ugeth->ug_info->riscTx, 0);
dump_init_enet_entries(ugeth, dump_init_enet_entries(ugeth,
&(ugeth->p_init_enet_param_shadow-> &(ugeth->p_init_enet_param_shadow->
...@@ -1578,12 +1564,12 @@ static int init_min_frame_len(u16 min_frame_length, ...@@ -1578,12 +1564,12 @@ static int init_min_frame_len(u16 min_frame_length,
return 0; return 0;
} }
static int adjust_enet_interface(ucc_geth_private_t *ugeth) static int adjust_enet_interface(struct ucc_geth_private *ugeth)
{ {
ucc_geth_info_t *ug_info; struct ucc_geth_info *ug_info;
ucc_geth_t *ug_regs; struct ucc_geth *ug_regs;
ucc_fast_t *uf_regs; struct ucc_fast *uf_regs;
enet_speed_e speed; enum enet_speed speed;
int ret_val, rpm = 0, tbi = 0, r10m = 0, rmm = int ret_val, rpm = 0, tbi = 0, r10m = 0, rmm =
0, limited_to_full_duplex = 0; 0, limited_to_full_duplex = 0;
u32 upsmr, maccfg2, utbipar, tbiBaseAddress; u32 upsmr, maccfg2, utbipar, tbiBaseAddress;
...@@ -1691,8 +1677,8 @@ static int adjust_enet_interface(ucc_geth_private_t *ugeth) ...@@ -1691,8 +1677,8 @@ static int adjust_enet_interface(ucc_geth_private_t *ugeth)
*/ */
static void adjust_link(struct net_device *dev) static void adjust_link(struct net_device *dev)
{ {
ucc_geth_private_t *ugeth = netdev_priv(dev); struct ucc_geth_private *ugeth = netdev_priv(dev);
ucc_geth_t *ug_regs; struct ucc_geth *ug_regs;
u32 tempval; u32 tempval;
struct ugeth_mii_info *mii_info = ugeth->mii_info; struct ugeth_mii_info *mii_info = ugeth->mii_info;
...@@ -1722,7 +1708,7 @@ static void adjust_link(struct net_device *dev) ...@@ -1722,7 +1708,7 @@ static void adjust_link(struct net_device *dev)
if (mii_info->speed != ugeth->oldspeed) { if (mii_info->speed != ugeth->oldspeed) {
switch (mii_info->speed) { switch (mii_info->speed) {
case 1000: case 1000:
#ifdef CONFIG_MPC836x #ifdef CONFIG_PPC_MPC836x
/* FIXME: This code is for 100Mbs BUG fixing, /* FIXME: This code is for 100Mbs BUG fixing,
remove this when it is fixed!!! */ remove this when it is fixed!!! */
if (ugeth->ug_info->enet_interface == if (ugeth->ug_info->enet_interface ==
...@@ -1768,7 +1754,7 @@ remove this when it is fixed!!! */ ...@@ -1768,7 +1754,7 @@ remove this when it is fixed!!! */
break; break;
case 100: case 100:
case 10: case 10:
#ifdef CONFIG_MPC836x #ifdef CONFIG_PPC_MPC836x
/* FIXME: This code is for 100Mbs BUG fixing, /* FIXME: This code is for 100Mbs BUG fixing,
remove this lines when it will be fixed!!! */ remove this lines when it will be fixed!!! */
ugeth->ug_info->enet_interface = ENET_100_RGMII; ugeth->ug_info->enet_interface = ENET_100_RGMII;
...@@ -1827,9 +1813,9 @@ remove this lines when it will be fixed!!! */ ...@@ -1827,9 +1813,9 @@ remove this lines when it will be fixed!!! */
*/ */
static int init_phy(struct net_device *dev) static int init_phy(struct net_device *dev)
{ {
ucc_geth_private_t *ugeth = netdev_priv(dev); struct ucc_geth_private *ugeth = netdev_priv(dev);
struct phy_info *curphy; struct phy_info *curphy;
ucc_mii_mng_t *mii_regs; struct ucc_mii_mng *mii_regs;
struct ugeth_mii_info *mii_info; struct ugeth_mii_info *mii_info;
int err; int err;
...@@ -1914,17 +1900,17 @@ static int init_phy(struct net_device *dev) ...@@ -1914,17 +1900,17 @@ static int init_phy(struct net_device *dev)
} }
#ifdef CONFIG_UGETH_TX_ON_DEMOND #ifdef CONFIG_UGETH_TX_ON_DEMOND
static int ugeth_transmit_on_demand(ucc_geth_private_t *ugeth) static int ugeth_transmit_on_demand(struct ucc_geth_private *ugeth)
{ {
ucc_fast_transmit_on_demand(ugeth->uccf); struct ucc_fastransmit_on_demand(ugeth->uccf);
return 0; return 0;
} }
#endif #endif
static int ugeth_graceful_stop_tx(ucc_geth_private_t *ugeth) static int ugeth_graceful_stop_tx(struct ucc_geth_private *ugeth)
{ {
ucc_fast_private_t *uccf; struct ucc_fast_private *uccf;
u32 cecr_subblock; u32 cecr_subblock;
u32 temp; u32 temp;
...@@ -1940,7 +1926,7 @@ static int ugeth_graceful_stop_tx(ucc_geth_private_t *ugeth) ...@@ -1940,7 +1926,7 @@ static int ugeth_graceful_stop_tx(ucc_geth_private_t *ugeth)
cecr_subblock = cecr_subblock =
ucc_fast_get_qe_cr_subblock(ugeth->ug_info->uf_info.ucc_num); ucc_fast_get_qe_cr_subblock(ugeth->ug_info->uf_info.ucc_num);
qe_issue_cmd(QE_GRACEFUL_STOP_TX, cecr_subblock, qe_issue_cmd(QE_GRACEFUL_STOP_TX, cecr_subblock,
(u8) QE_CR_PROTOCOL_ETHERNET, 0); QE_CR_PROTOCOL_ETHERNET, 0);
/* Wait for command to complete */ /* Wait for command to complete */
do { do {
...@@ -1952,9 +1938,9 @@ static int ugeth_graceful_stop_tx(ucc_geth_private_t *ugeth) ...@@ -1952,9 +1938,9 @@ static int ugeth_graceful_stop_tx(ucc_geth_private_t *ugeth)
return 0; return 0;
} }
static int ugeth_graceful_stop_rx(ucc_geth_private_t * ugeth) static int ugeth_graceful_stop_rx(struct ucc_geth_private * ugeth)
{ {
ucc_fast_private_t *uccf; struct ucc_fast_private *uccf;
u32 cecr_subblock; u32 cecr_subblock;
u8 temp; u8 temp;
...@@ -1973,7 +1959,7 @@ static int ugeth_graceful_stop_rx(ucc_geth_private_t * ugeth) ...@@ -1973,7 +1959,7 @@ static int ugeth_graceful_stop_rx(ucc_geth_private_t * ugeth)
ucc_fast_get_qe_cr_subblock(ugeth->ug_info->uf_info. ucc_fast_get_qe_cr_subblock(ugeth->ug_info->uf_info.
ucc_num); ucc_num);
qe_issue_cmd(QE_GRACEFUL_STOP_RX, cecr_subblock, qe_issue_cmd(QE_GRACEFUL_STOP_RX, cecr_subblock,
(u8) QE_CR_PROTOCOL_ETHERNET, 0); QE_CR_PROTOCOL_ETHERNET, 0);
temp = ugeth->p_rx_glbl_pram->rxgstpack; temp = ugeth->p_rx_glbl_pram->rxgstpack;
} while (!(temp & GRACEFUL_STOP_ACKNOWLEDGE_RX)); } while (!(temp & GRACEFUL_STOP_ACKNOWLEDGE_RX));
...@@ -1983,41 +1969,40 @@ static int ugeth_graceful_stop_rx(ucc_geth_private_t * ugeth) ...@@ -1983,41 +1969,40 @@ static int ugeth_graceful_stop_rx(ucc_geth_private_t * ugeth)
return 0; return 0;
} }
static int ugeth_restart_tx(ucc_geth_private_t *ugeth) static int ugeth_restart_tx(struct ucc_geth_private *ugeth)
{ {
ucc_fast_private_t *uccf; struct ucc_fast_private *uccf;
u32 cecr_subblock; u32 cecr_subblock;
uccf = ugeth->uccf; uccf = ugeth->uccf;
cecr_subblock = cecr_subblock =
ucc_fast_get_qe_cr_subblock(ugeth->ug_info->uf_info.ucc_num); ucc_fast_get_qe_cr_subblock(ugeth->ug_info->uf_info.ucc_num);
qe_issue_cmd(QE_RESTART_TX, cecr_subblock, (u8) QE_CR_PROTOCOL_ETHERNET, qe_issue_cmd(QE_RESTART_TX, cecr_subblock, QE_CR_PROTOCOL_ETHERNET, 0);
0);
uccf->stopped_tx = 0; uccf->stopped_tx = 0;
return 0; return 0;
} }
static int ugeth_restart_rx(ucc_geth_private_t *ugeth) static int ugeth_restart_rx(struct ucc_geth_private *ugeth)
{ {
ucc_fast_private_t *uccf; struct ucc_fast_private *uccf;
u32 cecr_subblock; u32 cecr_subblock;
uccf = ugeth->uccf; uccf = ugeth->uccf;
cecr_subblock = cecr_subblock =
ucc_fast_get_qe_cr_subblock(ugeth->ug_info->uf_info.ucc_num); ucc_fast_get_qe_cr_subblock(ugeth->ug_info->uf_info.ucc_num);
qe_issue_cmd(QE_RESTART_RX, cecr_subblock, (u8) QE_CR_PROTOCOL_ETHERNET, qe_issue_cmd(QE_RESTART_RX, cecr_subblock, QE_CR_PROTOCOL_ETHERNET,
0); 0);
uccf->stopped_rx = 0; uccf->stopped_rx = 0;
return 0; return 0;
} }
static int ugeth_enable(ucc_geth_private_t *ugeth, comm_dir_e mode) static int ugeth_enable(struct ucc_geth_private *ugeth, enum comm_dir mode)
{ {
ucc_fast_private_t *uccf; struct ucc_fast_private *uccf;
int enabled_tx, enabled_rx; int enabled_tx, enabled_rx;
uccf = ugeth->uccf; uccf = ugeth->uccf;
...@@ -2044,9 +2029,9 @@ static int ugeth_enable(ucc_geth_private_t *ugeth, comm_dir_e mode) ...@@ -2044,9 +2029,9 @@ static int ugeth_enable(ucc_geth_private_t *ugeth, comm_dir_e mode)
} }
static int ugeth_disable(ucc_geth_private_t * ugeth, comm_dir_e mode) static int ugeth_disable(struct ucc_geth_private * ugeth, enum comm_dir mode)
{ {
ucc_fast_private_t *uccf; struct ucc_fast_private *uccf;
uccf = ugeth->uccf; uccf = ugeth->uccf;
...@@ -2069,7 +2054,7 @@ static int ugeth_disable(ucc_geth_private_t * ugeth, comm_dir_e mode) ...@@ -2069,7 +2054,7 @@ static int ugeth_disable(ucc_geth_private_t * ugeth, comm_dir_e mode)
return 0; return 0;
} }
static void ugeth_dump_regs(ucc_geth_private_t *ugeth) static void ugeth_dump_regs(struct ucc_geth_private *ugeth)
{ {
#ifdef DEBUG #ifdef DEBUG
ucc_fast_dump_regs(ugeth->uccf); ucc_fast_dump_regs(ugeth->uccf);
...@@ -2079,9 +2064,9 @@ static void ugeth_dump_regs(ucc_geth_private_t *ugeth) ...@@ -2079,9 +2064,9 @@ static void ugeth_dump_regs(ucc_geth_private_t *ugeth)
} }
#ifdef CONFIG_UGETH_FILTERING #ifdef CONFIG_UGETH_FILTERING
static int ugeth_ext_filtering_serialize_tad(ucc_geth_tad_params_t * static int ugeth_ext_filtering_serialize_tad(struct ucc_geth_tad_params *
p_UccGethTadParams, p_UccGethTadParams,
qe_fltr_tad_t *qe_fltr_tad) struct qe_fltr_tad *qe_fltr_tad)
{ {
u16 temp; u16 temp;
...@@ -2119,11 +2104,11 @@ static int ugeth_ext_filtering_serialize_tad(ucc_geth_tad_params_t * ...@@ -2119,11 +2104,11 @@ static int ugeth_ext_filtering_serialize_tad(ucc_geth_tad_params_t *
return 0; return 0;
} }
static enet_addr_container_t static struct enet_addr_container_t
*ugeth_82xx_filtering_get_match_addr_in_hash(ucc_geth_private_t *ugeth, *ugeth_82xx_filtering_get_match_addr_in_hash(struct ucc_geth_private *ugeth,
enet_addr_t *p_enet_addr) struct enet_addr *p_enet_addr)
{ {
enet_addr_container_t *enet_addr_cont; struct enet_addr_container *enet_addr_cont;
struct list_head *p_lh; struct list_head *p_lh;
u16 i, num; u16 i, num;
int32_t j; int32_t j;
...@@ -2144,7 +2129,7 @@ static enet_addr_container_t ...@@ -2144,7 +2129,7 @@ static enet_addr_container_t
for (i = 0; i < num; i++) { for (i = 0; i < num; i++) {
enet_addr_cont = enet_addr_cont =
(enet_addr_container_t *) (struct enet_addr_container *)
ENET_ADDR_CONT_ENTRY(dequeue(p_lh)); ENET_ADDR_CONT_ENTRY(dequeue(p_lh));
for (j = ENET_NUM_OCTETS_PER_ADDRESS - 1; j >= 0; j--) { for (j = ENET_NUM_OCTETS_PER_ADDRESS - 1; j >= 0; j--) {
if ((*p_enet_addr)[j] != (enet_addr_cont->address)[j]) if ((*p_enet_addr)[j] != (enet_addr_cont->address)[j])
...@@ -2157,11 +2142,11 @@ static enet_addr_container_t ...@@ -2157,11 +2142,11 @@ static enet_addr_container_t
return NULL; return NULL;
} }
static int ugeth_82xx_filtering_add_addr_in_hash(ucc_geth_private_t *ugeth, static int ugeth_82xx_filtering_add_addr_in_hash(struct ucc_geth_private *ugeth,
enet_addr_t *p_enet_addr) struct enet_addr *p_enet_addr)
{ {
ucc_geth_enet_address_recognition_location_e location; enum ucc_geth_enet_address_recognition_location location;
enet_addr_container_t *enet_addr_cont; struct enet_addr_container *enet_addr_cont;
struct list_head *p_lh; struct list_head *p_lh;
u8 i; u8 i;
u32 limit; u32 limit;
...@@ -2196,18 +2181,17 @@ static int ugeth_82xx_filtering_add_addr_in_hash(ucc_geth_private_t *ugeth, ...@@ -2196,18 +2181,17 @@ static int ugeth_82xx_filtering_add_addr_in_hash(ucc_geth_private_t *ugeth,
enqueue(p_lh, &enet_addr_cont->node); /* Put it back */ enqueue(p_lh, &enet_addr_cont->node); /* Put it back */
++(*p_counter); ++(*p_counter);
hw_add_addr_in_hash(ugeth, &(enet_addr_cont->address)); hw_add_addr_in_hash(ugeth, enet_addr_cont->address);
return 0; return 0;
} }
static int ugeth_82xx_filtering_clear_addr_in_hash(ucc_geth_private_t *ugeth, static int ugeth_82xx_filtering_clear_addr_in_hash(struct ucc_geth_private *ugeth,
enet_addr_t *p_enet_addr) struct enet_addr *p_enet_addr)
{ {
ucc_geth_82xx_address_filtering_pram_t *p_82xx_addr_filt; struct ucc_geth_82xx_address_filtering_pram *p_82xx_addr_filt;
enet_addr_container_t *enet_addr_cont; struct enet_addr_container *enet_addr_cont;
ucc_fast_private_t *uccf; struct ucc_fast_private *uccf;
comm_dir_e comm_dir; enum comm_dir comm_dir;
u16 i, num; u16 i, num;
struct list_head *p_lh; struct list_head *p_lh;
u32 *addr_h, *addr_l; u32 *addr_h, *addr_l;
...@@ -2216,7 +2200,7 @@ static int ugeth_82xx_filtering_clear_addr_in_hash(ucc_geth_private_t *ugeth, ...@@ -2216,7 +2200,7 @@ static int ugeth_82xx_filtering_clear_addr_in_hash(ucc_geth_private_t *ugeth,
uccf = ugeth->uccf; uccf = ugeth->uccf;
p_82xx_addr_filt = p_82xx_addr_filt =
(ucc_geth_82xx_address_filtering_pram_t *) ugeth->p_rx_glbl_pram-> (struct ucc_geth_82xx_address_filtering_pram *) ugeth->p_rx_glbl_pram->
addressfiltering; addressfiltering;
if (! if (!
...@@ -2256,9 +2240,9 @@ static int ugeth_82xx_filtering_clear_addr_in_hash(ucc_geth_private_t *ugeth, ...@@ -2256,9 +2240,9 @@ static int ugeth_82xx_filtering_clear_addr_in_hash(ucc_geth_private_t *ugeth,
num = --(*p_counter); num = --(*p_counter);
for (i = 0; i < num; i++) { for (i = 0; i < num; i++) {
enet_addr_cont = enet_addr_cont =
(enet_addr_container_t *) (struct enet_addr_container *)
ENET_ADDR_CONT_ENTRY(dequeue(p_lh)); ENET_ADDR_CONT_ENTRY(dequeue(p_lh));
hw_add_addr_in_hash(ugeth, &(enet_addr_cont->address)); hw_add_addr_in_hash(ugeth, enet_addr_cont->address);
enqueue(p_lh, &enet_addr_cont->node); /* Put it back */ enqueue(p_lh, &enet_addr_cont->node); /* Put it back */
} }
...@@ -2269,14 +2253,14 @@ static int ugeth_82xx_filtering_clear_addr_in_hash(ucc_geth_private_t *ugeth, ...@@ -2269,14 +2253,14 @@ static int ugeth_82xx_filtering_clear_addr_in_hash(ucc_geth_private_t *ugeth,
} }
#endif /* CONFIG_UGETH_FILTERING */ #endif /* CONFIG_UGETH_FILTERING */
static int ugeth_82xx_filtering_clear_all_addr_in_hash(ucc_geth_private_t * static int ugeth_82xx_filtering_clear_all_addr_in_hash(struct ucc_geth_private *
ugeth, ugeth,
enet_addr_type_e enum enet_addr_type
enet_addr_type) enet_addr_type)
{ {
ucc_geth_82xx_address_filtering_pram_t *p_82xx_addr_filt; struct ucc_geth_82xx_address_filtering_pram *p_82xx_addr_filt;
ucc_fast_private_t *uccf; struct ucc_fast_private *uccf;
comm_dir_e comm_dir; enum comm_dir comm_dir;
struct list_head *p_lh; struct list_head *p_lh;
u16 i, num; u16 i, num;
u32 *addr_h, *addr_l; u32 *addr_h, *addr_l;
...@@ -2285,7 +2269,7 @@ static int ugeth_82xx_filtering_clear_all_addr_in_hash(ucc_geth_private_t * ...@@ -2285,7 +2269,7 @@ static int ugeth_82xx_filtering_clear_all_addr_in_hash(ucc_geth_private_t *
uccf = ugeth->uccf; uccf = ugeth->uccf;
p_82xx_addr_filt = p_82xx_addr_filt =
(ucc_geth_82xx_address_filtering_pram_t *) ugeth->p_rx_glbl_pram-> (struct ucc_geth_82xx_address_filtering_pram *) ugeth->p_rx_glbl_pram->
addressfiltering; addressfiltering;
if (enet_addr_type == ENET_ADDR_TYPE_GROUP) { if (enet_addr_type == ENET_ADDR_TYPE_GROUP) {
...@@ -2331,8 +2315,8 @@ static int ugeth_82xx_filtering_clear_all_addr_in_hash(ucc_geth_private_t * ...@@ -2331,8 +2315,8 @@ static int ugeth_82xx_filtering_clear_all_addr_in_hash(ucc_geth_private_t *
} }
#ifdef CONFIG_UGETH_FILTERING #ifdef CONFIG_UGETH_FILTERING
static int ugeth_82xx_filtering_add_addr_in_paddr(ucc_geth_private_t *ugeth, static int ugeth_82xx_filtering_add_addr_in_paddr(struct ucc_geth_private *ugeth,
enet_addr_t *p_enet_addr, struct enet_addr *p_enet_addr,
u8 paddr_num) u8 paddr_num)
{ {
int i; int i;
...@@ -2352,14 +2336,14 @@ static int ugeth_82xx_filtering_add_addr_in_paddr(ucc_geth_private_t *ugeth, ...@@ -2352,14 +2336,14 @@ static int ugeth_82xx_filtering_add_addr_in_paddr(ucc_geth_private_t *ugeth,
} }
#endif /* CONFIG_UGETH_FILTERING */ #endif /* CONFIG_UGETH_FILTERING */
static int ugeth_82xx_filtering_clear_addr_in_paddr(ucc_geth_private_t *ugeth, static int ugeth_82xx_filtering_clear_addr_in_paddr(struct ucc_geth_private *ugeth,
u8 paddr_num) u8 paddr_num)
{ {
ugeth->indAddrRegUsed[paddr_num] = 0; /* mark this paddr as not used */ ugeth->indAddrRegUsed[paddr_num] = 0; /* mark this paddr as not used */
return hw_clear_addr_in_paddr(ugeth, paddr_num);/* clear in hardware */ return hw_clear_addr_in_paddr(ugeth, paddr_num);/* clear in hardware */
} }
static void ucc_geth_memclean(ucc_geth_private_t *ugeth) static void ucc_geth_memclean(struct ucc_geth_private *ugeth)
{ {
u16 i, j; u16 i, j;
u8 *bd; u8 *bd;
...@@ -2433,8 +2417,8 @@ static void ucc_geth_memclean(ucc_geth_private_t *ugeth) ...@@ -2433,8 +2417,8 @@ static void ucc_geth_memclean(ucc_geth_private_t *ugeth)
for (j = 0; j < ugeth->ug_info->bdRingLenTx[i]; j++) { for (j = 0; j < ugeth->ug_info->bdRingLenTx[i]; j++) {
if (ugeth->tx_skbuff[i][j]) { if (ugeth->tx_skbuff[i][j]) {
dma_unmap_single(NULL, dma_unmap_single(NULL,
BD_BUFFER_ARG(bd), ((qe_bd_t *)bd)->buf,
(BD_STATUS_AND_LENGTH(bd) & (in_be32((u32 *)bd) &
BD_LENGTH_MASK), BD_LENGTH_MASK),
DMA_TO_DEVICE); DMA_TO_DEVICE);
dev_kfree_skb_any(ugeth->tx_skbuff[i][j]); dev_kfree_skb_any(ugeth->tx_skbuff[i][j]);
...@@ -2460,18 +2444,17 @@ static void ucc_geth_memclean(ucc_geth_private_t *ugeth) ...@@ -2460,18 +2444,17 @@ static void ucc_geth_memclean(ucc_geth_private_t *ugeth)
bd = ugeth->p_rx_bd_ring[i]; bd = ugeth->p_rx_bd_ring[i];
for (j = 0; j < ugeth->ug_info->bdRingLenRx[i]; j++) { for (j = 0; j < ugeth->ug_info->bdRingLenRx[i]; j++) {
if (ugeth->rx_skbuff[i][j]) { if (ugeth->rx_skbuff[i][j]) {
dma_unmap_single(NULL, BD_BUFFER(bd), dma_unmap_single(NULL,
ugeth->ug_info-> ((struct qe_bd *)bd)->buf,
uf_info. ugeth->ug_info->
max_rx_buf_length + uf_info.max_rx_buf_length +
UCC_GETH_RX_DATA_BUF_ALIGNMENT, UCC_GETH_RX_DATA_BUF_ALIGNMENT,
DMA_FROM_DEVICE); DMA_FROM_DEVICE);
dev_kfree_skb_any(
dev_kfree_skb_any(ugeth-> ugeth->rx_skbuff[i][j]);
rx_skbuff[i][j]);
ugeth->rx_skbuff[i][j] = NULL; ugeth->rx_skbuff[i][j] = NULL;
} }
bd += UCC_GETH_SIZE_OF_BD; bd += sizeof(struct qe_bd);
} }
kfree(ugeth->rx_skbuff[i]); kfree(ugeth->rx_skbuff[i]);
...@@ -2496,11 +2479,11 @@ static void ucc_geth_memclean(ucc_geth_private_t *ugeth) ...@@ -2496,11 +2479,11 @@ static void ucc_geth_memclean(ucc_geth_private_t *ugeth)
static void ucc_geth_set_multi(struct net_device *dev) static void ucc_geth_set_multi(struct net_device *dev)
{ {
ucc_geth_private_t *ugeth; struct ucc_geth_private *ugeth;
struct dev_mc_list *dmi; struct dev_mc_list *dmi;
ucc_fast_t *uf_regs; struct ucc_fast *uf_regs;
ucc_geth_82xx_address_filtering_pram_t *p_82xx_addr_filt; struct ucc_geth_82xx_address_filtering_pram *p_82xx_addr_filt;
enet_addr_t tempaddr; u8 tempaddr[6];
u8 *mcptr, *tdptr; u8 *mcptr, *tdptr;
int i, j; int i, j;
...@@ -2517,7 +2500,7 @@ static void ucc_geth_set_multi(struct net_device *dev) ...@@ -2517,7 +2500,7 @@ static void ucc_geth_set_multi(struct net_device *dev)
uf_regs->upsmr &= ~UPSMR_PRO; uf_regs->upsmr &= ~UPSMR_PRO;
p_82xx_addr_filt = p_82xx_addr_filt =
(ucc_geth_82xx_address_filtering_pram_t *) ugeth-> (struct ucc_geth_82xx_address_filtering_pram *) ugeth->
p_rx_glbl_pram->addressfiltering; p_rx_glbl_pram->addressfiltering;
if (dev->flags & IFF_ALLMULTI) { if (dev->flags & IFF_ALLMULTI) {
...@@ -2546,23 +2529,22 @@ static void ucc_geth_set_multi(struct net_device *dev) ...@@ -2546,23 +2529,22 @@ static void ucc_geth_set_multi(struct net_device *dev)
* copy bytes MSB first from dmi_addr. * copy bytes MSB first from dmi_addr.
*/ */
mcptr = (u8 *) dmi->dmi_addr + 5; mcptr = (u8 *) dmi->dmi_addr + 5;
tdptr = (u8 *) & tempaddr; tdptr = (u8 *) tempaddr;
for (j = 0; j < 6; j++) for (j = 0; j < 6; j++)
*tdptr++ = *mcptr--; *tdptr++ = *mcptr--;
/* Ask CPM to run CRC and set bit in /* Ask CPM to run CRC and set bit in
* filter mask. * filter mask.
*/ */
hw_add_addr_in_hash(ugeth, &tempaddr); hw_add_addr_in_hash(ugeth, tempaddr);
} }
} }
} }
} }
static void ucc_geth_stop(ucc_geth_private_t *ugeth) static void ucc_geth_stop(struct ucc_geth_private *ugeth)
{ {
ucc_geth_t *ug_regs = ugeth->ug_regs; struct ucc_geth *ug_regs = ugeth->ug_regs;
u32 tempval; u32 tempval;
ugeth_vdbg("%s: IN", __FUNCTION__); ugeth_vdbg("%s: IN", __FUNCTION__);
...@@ -2605,15 +2587,15 @@ static void ucc_geth_stop(ucc_geth_private_t *ugeth) ...@@ -2605,15 +2587,15 @@ static void ucc_geth_stop(ucc_geth_private_t *ugeth)
ucc_geth_memclean(ugeth); ucc_geth_memclean(ugeth);
} }
static int ucc_geth_startup(ucc_geth_private_t *ugeth) static int ucc_geth_startup(struct ucc_geth_private *ugeth)
{ {
ucc_geth_82xx_address_filtering_pram_t *p_82xx_addr_filt; struct ucc_geth_82xx_address_filtering_pram *p_82xx_addr_filt;
ucc_geth_init_pram_t *p_init_enet_pram; struct ucc_geth_init_pram *p_init_enet_pram;
ucc_fast_private_t *uccf; struct ucc_fast_private *uccf;
ucc_geth_info_t *ug_info; struct ucc_geth_info *ug_info;
ucc_fast_info_t *uf_info; struct ucc_fast_info *uf_info;
ucc_fast_t *uf_regs; struct ucc_fast *uf_regs;
ucc_geth_t *ug_regs; struct ucc_geth *ug_regs;
int ret_val = -EINVAL; int ret_val = -EINVAL;
u32 remoder = UCC_GETH_REMODER_INIT; u32 remoder = UCC_GETH_REMODER_INIT;
u32 init_enet_pram_offset, cecr_subblock, command, maccfg1; u32 init_enet_pram_offset, cecr_subblock, command, maccfg1;
...@@ -2788,7 +2770,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) ...@@ -2788,7 +2770,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
UCC_GETH_VLAN_OPERATION_NON_TAGGED_NOP); UCC_GETH_VLAN_OPERATION_NON_TAGGED_NOP);
uf_regs = uccf->uf_regs; uf_regs = uccf->uf_regs;
ug_regs = (ucc_geth_t *) (uccf->uf_regs); ug_regs = (struct ucc_geth *) (uccf->uf_regs);
ugeth->ug_regs = ug_regs; ugeth->ug_regs = ug_regs;
init_default_reg_vals(&uf_regs->upsmr, init_default_reg_vals(&uf_regs->upsmr,
...@@ -2869,10 +2851,10 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) ...@@ -2869,10 +2851,10 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
/* Allocate in multiple of /* Allocate in multiple of
UCC_GETH_TX_BD_RING_SIZE_MEMORY_ALIGNMENT, UCC_GETH_TX_BD_RING_SIZE_MEMORY_ALIGNMENT,
according to spec */ according to spec */
length = ((ug_info->bdRingLenTx[j] * UCC_GETH_SIZE_OF_BD) length = ((ug_info->bdRingLenTx[j] * sizeof(struct qe_bd))
/ UCC_GETH_TX_BD_RING_SIZE_MEMORY_ALIGNMENT) / UCC_GETH_TX_BD_RING_SIZE_MEMORY_ALIGNMENT)
* UCC_GETH_TX_BD_RING_SIZE_MEMORY_ALIGNMENT; * UCC_GETH_TX_BD_RING_SIZE_MEMORY_ALIGNMENT;
if ((ug_info->bdRingLenTx[j] * UCC_GETH_SIZE_OF_BD) % if ((ug_info->bdRingLenTx[j] * sizeof(struct qe_bd)) %
UCC_GETH_TX_BD_RING_SIZE_MEMORY_ALIGNMENT) UCC_GETH_TX_BD_RING_SIZE_MEMORY_ALIGNMENT)
length += UCC_GETH_TX_BD_RING_SIZE_MEMORY_ALIGNMENT; length += UCC_GETH_TX_BD_RING_SIZE_MEMORY_ALIGNMENT;
if (uf_info->bd_mem_part == MEM_PART_SYSTEM) { if (uf_info->bd_mem_part == MEM_PART_SYSTEM) {
...@@ -2904,13 +2886,13 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) ...@@ -2904,13 +2886,13 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
} }
/* Zero unused end of bd ring, according to spec */ /* Zero unused end of bd ring, according to spec */
memset(ugeth->p_tx_bd_ring[j] + memset(ugeth->p_tx_bd_ring[j] +
ug_info->bdRingLenTx[j] * UCC_GETH_SIZE_OF_BD, 0, ug_info->bdRingLenTx[j] * sizeof(struct qe_bd), 0,
length - ug_info->bdRingLenTx[j] * UCC_GETH_SIZE_OF_BD); length - ug_info->bdRingLenTx[j] * sizeof(struct qe_bd));
} }
/* Allocate Rx bds */ /* Allocate Rx bds */
for (j = 0; j < ug_info->numQueuesRx; j++) { for (j = 0; j < ug_info->numQueuesRx; j++) {
length = ug_info->bdRingLenRx[j] * UCC_GETH_SIZE_OF_BD; length = ug_info->bdRingLenRx[j] * sizeof(struct qe_bd);
if (uf_info->bd_mem_part == MEM_PART_SYSTEM) { if (uf_info->bd_mem_part == MEM_PART_SYSTEM) {
u32 align = 4; u32 align = 4;
if (UCC_GETH_RX_BD_RING_ALIGNMENT > 4) if (UCC_GETH_RX_BD_RING_ALIGNMENT > 4)
...@@ -2960,12 +2942,15 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) ...@@ -2960,12 +2942,15 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
ugeth->skb_curtx[j] = ugeth->skb_dirtytx[j] = 0; ugeth->skb_curtx[j] = ugeth->skb_dirtytx[j] = 0;
bd = ugeth->confBd[j] = ugeth->txBd[j] = ugeth->p_tx_bd_ring[j]; bd = ugeth->confBd[j] = ugeth->txBd[j] = ugeth->p_tx_bd_ring[j];
for (i = 0; i < ug_info->bdRingLenTx[j]; i++) { for (i = 0; i < ug_info->bdRingLenTx[j]; i++) {
BD_BUFFER_CLEAR(bd); /* clear bd buffer */
BD_STATUS_AND_LENGTH_SET(bd, 0); out_be32(&((struct qe_bd *)bd)->buf, 0);
bd += UCC_GETH_SIZE_OF_BD; /* set bd status and length */
out_be32((u32 *)bd, 0);
bd += sizeof(struct qe_bd);
} }
bd -= UCC_GETH_SIZE_OF_BD; bd -= sizeof(struct qe_bd);
BD_STATUS_AND_LENGTH_SET(bd, T_W);/* for last BD set Wrap bit */ /* set bd status and length */
out_be32((u32 *)bd, T_W); /* for last BD set Wrap bit */
} }
/* Init Rx bds */ /* Init Rx bds */
...@@ -2989,12 +2974,15 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) ...@@ -2989,12 +2974,15 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
ugeth->skb_currx[j] = 0; ugeth->skb_currx[j] = 0;
bd = ugeth->rxBd[j] = ugeth->p_rx_bd_ring[j]; bd = ugeth->rxBd[j] = ugeth->p_rx_bd_ring[j];
for (i = 0; i < ug_info->bdRingLenRx[j]; i++) { for (i = 0; i < ug_info->bdRingLenRx[j]; i++) {
BD_STATUS_AND_LENGTH_SET(bd, R_I); /* set bd status and length */
BD_BUFFER_CLEAR(bd); out_be32((u32 *)bd, R_I);
bd += UCC_GETH_SIZE_OF_BD; /* clear bd buffer */
out_be32(&((struct qe_bd *)bd)->buf, 0);
bd += sizeof(struct qe_bd);
} }
bd -= UCC_GETH_SIZE_OF_BD; bd -= sizeof(struct qe_bd);
BD_STATUS_AND_LENGTH_SET(bd, R_W);/* for last BD set Wrap bit */ /* set bd status and length */
out_be32((u32 *)bd, R_W); /* for last BD set Wrap bit */
} }
/* /*
...@@ -3003,7 +2991,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) ...@@ -3003,7 +2991,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
/* Tx global PRAM */ /* Tx global PRAM */
/* Allocate global tx parameter RAM page */ /* Allocate global tx parameter RAM page */
ugeth->tx_glbl_pram_offset = ugeth->tx_glbl_pram_offset =
qe_muram_alloc(sizeof(ucc_geth_tx_global_pram_t), qe_muram_alloc(sizeof(struct ucc_geth_tx_global_pram),
UCC_GETH_TX_GLOBAL_PRAM_ALIGNMENT); UCC_GETH_TX_GLOBAL_PRAM_ALIGNMENT);
if (IS_MURAM_ERR(ugeth->tx_glbl_pram_offset)) { if (IS_MURAM_ERR(ugeth->tx_glbl_pram_offset)) {
ugeth_err ugeth_err
...@@ -3013,10 +3001,10 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) ...@@ -3013,10 +3001,10 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
return -ENOMEM; return -ENOMEM;
} }
ugeth->p_tx_glbl_pram = ugeth->p_tx_glbl_pram =
(ucc_geth_tx_global_pram_t *) qe_muram_addr(ugeth-> (struct ucc_geth_tx_global_pram *) qe_muram_addr(ugeth->
tx_glbl_pram_offset); tx_glbl_pram_offset);
/* Zero out p_tx_glbl_pram */ /* Zero out p_tx_glbl_pram */
memset(ugeth->p_tx_glbl_pram, 0, sizeof(ucc_geth_tx_global_pram_t)); memset(ugeth->p_tx_glbl_pram, 0, sizeof(struct ucc_geth_tx_global_pram));
/* Fill global PRAM */ /* Fill global PRAM */
...@@ -3024,7 +3012,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) ...@@ -3024,7 +3012,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
/* Size varies with number of Tx threads */ /* Size varies with number of Tx threads */
ugeth->thread_dat_tx_offset = ugeth->thread_dat_tx_offset =
qe_muram_alloc(numThreadsTxNumerical * qe_muram_alloc(numThreadsTxNumerical *
sizeof(ucc_geth_thread_data_tx_t) + sizeof(struct ucc_geth_thread_data_tx) +
32 * (numThreadsTxNumerical == 1), 32 * (numThreadsTxNumerical == 1),
UCC_GETH_THREAD_DATA_ALIGNMENT); UCC_GETH_THREAD_DATA_ALIGNMENT);
if (IS_MURAM_ERR(ugeth->thread_dat_tx_offset)) { if (IS_MURAM_ERR(ugeth->thread_dat_tx_offset)) {
...@@ -3036,7 +3024,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) ...@@ -3036,7 +3024,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
} }
ugeth->p_thread_data_tx = ugeth->p_thread_data_tx =
(ucc_geth_thread_data_tx_t *) qe_muram_addr(ugeth-> (struct ucc_geth_thread_data_tx *) qe_muram_addr(ugeth->
thread_dat_tx_offset); thread_dat_tx_offset);
out_be32(&ugeth->p_tx_glbl_pram->tqptr, ugeth->thread_dat_tx_offset); out_be32(&ugeth->p_tx_glbl_pram->tqptr, ugeth->thread_dat_tx_offset);
...@@ -3053,7 +3041,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) ...@@ -3053,7 +3041,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
/* Size varies with number of Tx queues */ /* Size varies with number of Tx queues */
ugeth->send_q_mem_reg_offset = ugeth->send_q_mem_reg_offset =
qe_muram_alloc(ug_info->numQueuesTx * qe_muram_alloc(ug_info->numQueuesTx *
sizeof(ucc_geth_send_queue_qd_t), sizeof(struct ucc_geth_send_queue_qd),
UCC_GETH_SEND_QUEUE_QUEUE_DESCRIPTOR_ALIGNMENT); UCC_GETH_SEND_QUEUE_QUEUE_DESCRIPTOR_ALIGNMENT);
if (IS_MURAM_ERR(ugeth->send_q_mem_reg_offset)) { if (IS_MURAM_ERR(ugeth->send_q_mem_reg_offset)) {
ugeth_err ugeth_err
...@@ -3064,7 +3052,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) ...@@ -3064,7 +3052,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
} }
ugeth->p_send_q_mem_reg = ugeth->p_send_q_mem_reg =
(ucc_geth_send_queue_mem_region_t *) qe_muram_addr(ugeth-> (struct ucc_geth_send_queue_mem_region *) qe_muram_addr(ugeth->
send_q_mem_reg_offset); send_q_mem_reg_offset);
out_be32(&ugeth->p_tx_glbl_pram->sqptr, ugeth->send_q_mem_reg_offset); out_be32(&ugeth->p_tx_glbl_pram->sqptr, ugeth->send_q_mem_reg_offset);
...@@ -3073,7 +3061,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) ...@@ -3073,7 +3061,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
for (i = 0; i < ug_info->numQueuesTx; i++) { for (i = 0; i < ug_info->numQueuesTx; i++) {
endOfRing = endOfRing =
ugeth->p_tx_bd_ring[i] + (ug_info->bdRingLenTx[i] - ugeth->p_tx_bd_ring[i] + (ug_info->bdRingLenTx[i] -
1) * UCC_GETH_SIZE_OF_BD; 1) * sizeof(struct qe_bd);
if (ugeth->ug_info->uf_info.bd_mem_part == MEM_PART_SYSTEM) { if (ugeth->ug_info->uf_info.bd_mem_part == MEM_PART_SYSTEM) {
out_be32(&ugeth->p_send_q_mem_reg->sqqd[i].bd_ring_base, out_be32(&ugeth->p_send_q_mem_reg->sqqd[i].bd_ring_base,
(u32) virt_to_phys(ugeth->p_tx_bd_ring[i])); (u32) virt_to_phys(ugeth->p_tx_bd_ring[i]));
...@@ -3096,7 +3084,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) ...@@ -3096,7 +3084,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
if (ug_info->numQueuesTx > 1) { if (ug_info->numQueuesTx > 1) {
/* scheduler exists only if more than 1 tx queue */ /* scheduler exists only if more than 1 tx queue */
ugeth->scheduler_offset = ugeth->scheduler_offset =
qe_muram_alloc(sizeof(ucc_geth_scheduler_t), qe_muram_alloc(sizeof(struct ucc_geth_scheduler),
UCC_GETH_SCHEDULER_ALIGNMENT); UCC_GETH_SCHEDULER_ALIGNMENT);
if (IS_MURAM_ERR(ugeth->scheduler_offset)) { if (IS_MURAM_ERR(ugeth->scheduler_offset)) {
ugeth_err ugeth_err
...@@ -3107,12 +3095,12 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) ...@@ -3107,12 +3095,12 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
} }
ugeth->p_scheduler = ugeth->p_scheduler =
(ucc_geth_scheduler_t *) qe_muram_addr(ugeth-> (struct ucc_geth_scheduler *) qe_muram_addr(ugeth->
scheduler_offset); scheduler_offset);
out_be32(&ugeth->p_tx_glbl_pram->schedulerbasepointer, out_be32(&ugeth->p_tx_glbl_pram->schedulerbasepointer,
ugeth->scheduler_offset); ugeth->scheduler_offset);
/* Zero out p_scheduler */ /* Zero out p_scheduler */
memset(ugeth->p_scheduler, 0, sizeof(ucc_geth_scheduler_t)); memset(ugeth->p_scheduler, 0, sizeof(struct ucc_geth_scheduler));
/* Set values in scheduler */ /* Set values in scheduler */
out_be32(&ugeth->p_scheduler->mblinterval, out_be32(&ugeth->p_scheduler->mblinterval,
...@@ -3144,7 +3132,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) ...@@ -3144,7 +3132,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
statisticsMode & UCC_GETH_STATISTICS_GATHERING_MODE_FIRMWARE_TX) { statisticsMode & UCC_GETH_STATISTICS_GATHERING_MODE_FIRMWARE_TX) {
ugeth->tx_fw_statistics_pram_offset = ugeth->tx_fw_statistics_pram_offset =
qe_muram_alloc(sizeof qe_muram_alloc(sizeof
(ucc_geth_tx_firmware_statistics_pram_t), (struct ucc_geth_tx_firmware_statistics_pram),
UCC_GETH_TX_STATISTICS_ALIGNMENT); UCC_GETH_TX_STATISTICS_ALIGNMENT);
if (IS_MURAM_ERR(ugeth->tx_fw_statistics_pram_offset)) { if (IS_MURAM_ERR(ugeth->tx_fw_statistics_pram_offset)) {
ugeth_err ugeth_err
...@@ -3154,11 +3142,11 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) ...@@ -3154,11 +3142,11 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
return -ENOMEM; return -ENOMEM;
} }
ugeth->p_tx_fw_statistics_pram = ugeth->p_tx_fw_statistics_pram =
(ucc_geth_tx_firmware_statistics_pram_t *) (struct ucc_geth_tx_firmware_statistics_pram *)
qe_muram_addr(ugeth->tx_fw_statistics_pram_offset); qe_muram_addr(ugeth->tx_fw_statistics_pram_offset);
/* Zero out p_tx_fw_statistics_pram */ /* Zero out p_tx_fw_statistics_pram */
memset(ugeth->p_tx_fw_statistics_pram, memset(ugeth->p_tx_fw_statistics_pram,
0, sizeof(ucc_geth_tx_firmware_statistics_pram_t)); 0, sizeof(struct ucc_geth_tx_firmware_statistics_pram));
} }
/* temoder */ /* temoder */
...@@ -3183,7 +3171,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) ...@@ -3183,7 +3171,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
/* Rx global PRAM */ /* Rx global PRAM */
/* Allocate global rx parameter RAM page */ /* Allocate global rx parameter RAM page */
ugeth->rx_glbl_pram_offset = ugeth->rx_glbl_pram_offset =
qe_muram_alloc(sizeof(ucc_geth_rx_global_pram_t), qe_muram_alloc(sizeof(struct ucc_geth_rx_global_pram),
UCC_GETH_RX_GLOBAL_PRAM_ALIGNMENT); UCC_GETH_RX_GLOBAL_PRAM_ALIGNMENT);
if (IS_MURAM_ERR(ugeth->rx_glbl_pram_offset)) { if (IS_MURAM_ERR(ugeth->rx_glbl_pram_offset)) {
ugeth_err ugeth_err
...@@ -3193,10 +3181,10 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) ...@@ -3193,10 +3181,10 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
return -ENOMEM; return -ENOMEM;
} }
ugeth->p_rx_glbl_pram = ugeth->p_rx_glbl_pram =
(ucc_geth_rx_global_pram_t *) qe_muram_addr(ugeth-> (struct ucc_geth_rx_global_pram *) qe_muram_addr(ugeth->
rx_glbl_pram_offset); rx_glbl_pram_offset);
/* Zero out p_rx_glbl_pram */ /* Zero out p_rx_glbl_pram */
memset(ugeth->p_rx_glbl_pram, 0, sizeof(ucc_geth_rx_global_pram_t)); memset(ugeth->p_rx_glbl_pram, 0, sizeof(struct ucc_geth_rx_global_pram));
/* Fill global PRAM */ /* Fill global PRAM */
...@@ -3204,7 +3192,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) ...@@ -3204,7 +3192,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
/* Size varies with number of Rx threads */ /* Size varies with number of Rx threads */
ugeth->thread_dat_rx_offset = ugeth->thread_dat_rx_offset =
qe_muram_alloc(numThreadsRxNumerical * qe_muram_alloc(numThreadsRxNumerical *
sizeof(ucc_geth_thread_data_rx_t), sizeof(struct ucc_geth_thread_data_rx),
UCC_GETH_THREAD_DATA_ALIGNMENT); UCC_GETH_THREAD_DATA_ALIGNMENT);
if (IS_MURAM_ERR(ugeth->thread_dat_rx_offset)) { if (IS_MURAM_ERR(ugeth->thread_dat_rx_offset)) {
ugeth_err ugeth_err
...@@ -3215,7 +3203,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) ...@@ -3215,7 +3203,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
} }
ugeth->p_thread_data_rx = ugeth->p_thread_data_rx =
(ucc_geth_thread_data_rx_t *) qe_muram_addr(ugeth-> (struct ucc_geth_thread_data_rx *) qe_muram_addr(ugeth->
thread_dat_rx_offset); thread_dat_rx_offset);
out_be32(&ugeth->p_rx_glbl_pram->rqptr, ugeth->thread_dat_rx_offset); out_be32(&ugeth->p_rx_glbl_pram->rqptr, ugeth->thread_dat_rx_offset);
...@@ -3227,7 +3215,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) ...@@ -3227,7 +3215,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
statisticsMode & UCC_GETH_STATISTICS_GATHERING_MODE_FIRMWARE_RX) { statisticsMode & UCC_GETH_STATISTICS_GATHERING_MODE_FIRMWARE_RX) {
ugeth->rx_fw_statistics_pram_offset = ugeth->rx_fw_statistics_pram_offset =
qe_muram_alloc(sizeof qe_muram_alloc(sizeof
(ucc_geth_rx_firmware_statistics_pram_t), (struct ucc_geth_rx_firmware_statistics_pram),
UCC_GETH_RX_STATISTICS_ALIGNMENT); UCC_GETH_RX_STATISTICS_ALIGNMENT);
if (IS_MURAM_ERR(ugeth->rx_fw_statistics_pram_offset)) { if (IS_MURAM_ERR(ugeth->rx_fw_statistics_pram_offset)) {
ugeth_err ugeth_err
...@@ -3237,11 +3225,11 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) ...@@ -3237,11 +3225,11 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
return -ENOMEM; return -ENOMEM;
} }
ugeth->p_rx_fw_statistics_pram = ugeth->p_rx_fw_statistics_pram =
(ucc_geth_rx_firmware_statistics_pram_t *) (struct ucc_geth_rx_firmware_statistics_pram *)
qe_muram_addr(ugeth->rx_fw_statistics_pram_offset); qe_muram_addr(ugeth->rx_fw_statistics_pram_offset);
/* Zero out p_rx_fw_statistics_pram */ /* Zero out p_rx_fw_statistics_pram */
memset(ugeth->p_rx_fw_statistics_pram, 0, memset(ugeth->p_rx_fw_statistics_pram, 0,
sizeof(ucc_geth_rx_firmware_statistics_pram_t)); sizeof(struct ucc_geth_rx_firmware_statistics_pram));
} }
/* intCoalescingPtr */ /* intCoalescingPtr */
...@@ -3249,7 +3237,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) ...@@ -3249,7 +3237,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
/* Size varies with number of Rx queues */ /* Size varies with number of Rx queues */
ugeth->rx_irq_coalescing_tbl_offset = ugeth->rx_irq_coalescing_tbl_offset =
qe_muram_alloc(ug_info->numQueuesRx * qe_muram_alloc(ug_info->numQueuesRx *
sizeof(ucc_geth_rx_interrupt_coalescing_entry_t), sizeof(struct ucc_geth_rx_interrupt_coalescing_entry),
UCC_GETH_RX_INTERRUPT_COALESCING_ALIGNMENT); UCC_GETH_RX_INTERRUPT_COALESCING_ALIGNMENT);
if (IS_MURAM_ERR(ugeth->rx_irq_coalescing_tbl_offset)) { if (IS_MURAM_ERR(ugeth->rx_irq_coalescing_tbl_offset)) {
ugeth_err ugeth_err
...@@ -3260,7 +3248,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) ...@@ -3260,7 +3248,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
} }
ugeth->p_rx_irq_coalescing_tbl = ugeth->p_rx_irq_coalescing_tbl =
(ucc_geth_rx_interrupt_coalescing_table_t *) (struct ucc_geth_rx_interrupt_coalescing_table *)
qe_muram_addr(ugeth->rx_irq_coalescing_tbl_offset); qe_muram_addr(ugeth->rx_irq_coalescing_tbl_offset);
out_be32(&ugeth->p_rx_glbl_pram->intcoalescingptr, out_be32(&ugeth->p_rx_glbl_pram->intcoalescingptr,
ugeth->rx_irq_coalescing_tbl_offset); ugeth->rx_irq_coalescing_tbl_offset);
...@@ -3300,7 +3288,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) ...@@ -3300,7 +3288,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
l3qt = 0; l3qt = 0;
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)
l3qt |= (ug_info->l3qt[j + i] << (28 - 4 * i)); l3qt |= (ug_info->l3qt[j + i] << (28 - 4 * i));
out_be32(&ugeth->p_rx_glbl_pram->l3qt[j], l3qt); out_be32(&ugeth->p_rx_glbl_pram->l3qt[j/8], l3qt);
} }
/* vlantype */ /* vlantype */
...@@ -3316,8 +3304,8 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) ...@@ -3316,8 +3304,8 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
/* Size varies with number of Rx queues */ /* Size varies with number of Rx queues */
ugeth->rx_bd_qs_tbl_offset = ugeth->rx_bd_qs_tbl_offset =
qe_muram_alloc(ug_info->numQueuesRx * qe_muram_alloc(ug_info->numQueuesRx *
(sizeof(ucc_geth_rx_bd_queues_entry_t) + (sizeof(struct ucc_geth_rx_bd_queues_entry) +
sizeof(ucc_geth_rx_prefetched_bds_t)), sizeof(struct ucc_geth_rx_prefetched_bds)),
UCC_GETH_RX_BD_QUEUES_ALIGNMENT); UCC_GETH_RX_BD_QUEUES_ALIGNMENT);
if (IS_MURAM_ERR(ugeth->rx_bd_qs_tbl_offset)) { if (IS_MURAM_ERR(ugeth->rx_bd_qs_tbl_offset)) {
ugeth_err ugeth_err
...@@ -3328,14 +3316,14 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) ...@@ -3328,14 +3316,14 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
} }
ugeth->p_rx_bd_qs_tbl = ugeth->p_rx_bd_qs_tbl =
(ucc_geth_rx_bd_queues_entry_t *) qe_muram_addr(ugeth-> (struct ucc_geth_rx_bd_queues_entry *) qe_muram_addr(ugeth->
rx_bd_qs_tbl_offset); rx_bd_qs_tbl_offset);
out_be32(&ugeth->p_rx_glbl_pram->rbdqptr, ugeth->rx_bd_qs_tbl_offset); out_be32(&ugeth->p_rx_glbl_pram->rbdqptr, ugeth->rx_bd_qs_tbl_offset);
/* Zero out p_rx_bd_qs_tbl */ /* Zero out p_rx_bd_qs_tbl */
memset(ugeth->p_rx_bd_qs_tbl, memset(ugeth->p_rx_bd_qs_tbl,
0, 0,
ug_info->numQueuesRx * (sizeof(ucc_geth_rx_bd_queues_entry_t) + ug_info->numQueuesRx * (sizeof(struct ucc_geth_rx_bd_queues_entry) +
sizeof(ucc_geth_rx_prefetched_bds_t))); sizeof(struct ucc_geth_rx_prefetched_bds)));
/* Setup the table */ /* Setup the table */
/* Assume BD rings are already established */ /* Assume BD rings are already established */
...@@ -3406,7 +3394,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) ...@@ -3406,7 +3394,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
/* Allocate memory for extended filtering Mode Global /* Allocate memory for extended filtering Mode Global
Parameters */ Parameters */
ugeth->exf_glbl_param_offset = ugeth->exf_glbl_param_offset =
qe_muram_alloc(sizeof(ucc_geth_exf_global_pram_t), qe_muram_alloc(sizeof(struct ucc_geth_exf_global_pram),
UCC_GETH_RX_EXTENDED_FILTERING_GLOBAL_PARAMETERS_ALIGNMENT); UCC_GETH_RX_EXTENDED_FILTERING_GLOBAL_PARAMETERS_ALIGNMENT);
if (IS_MURAM_ERR(ugeth->exf_glbl_param_offset)) { if (IS_MURAM_ERR(ugeth->exf_glbl_param_offset)) {
ugeth_err ugeth_err
...@@ -3417,7 +3405,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) ...@@ -3417,7 +3405,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
} }
ugeth->p_exf_glbl_param = ugeth->p_exf_glbl_param =
(ucc_geth_exf_global_pram_t *) qe_muram_addr(ugeth-> (struct ucc_geth_exf_global_pram *) qe_muram_addr(ugeth->
exf_glbl_param_offset); exf_glbl_param_offset);
out_be32(&ugeth->p_rx_glbl_pram->exfGlobalParam, out_be32(&ugeth->p_rx_glbl_pram->exfGlobalParam,
ugeth->exf_glbl_param_offset); ugeth->exf_glbl_param_offset);
...@@ -3439,7 +3427,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) ...@@ -3439,7 +3427,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
INIT_LIST_HEAD(&ugeth->ind_hash_q); INIT_LIST_HEAD(&ugeth->ind_hash_q);
} }
p_82xx_addr_filt = p_82xx_addr_filt =
(ucc_geth_82xx_address_filtering_pram_t *) ugeth-> (struct ucc_geth_82xx_address_filtering_pram *) ugeth->
p_rx_glbl_pram->addressfiltering; p_rx_glbl_pram->addressfiltering;
ugeth_82xx_filtering_clear_all_addr_in_hash(ugeth, ugeth_82xx_filtering_clear_all_addr_in_hash(ugeth,
...@@ -3462,7 +3450,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) ...@@ -3462,7 +3450,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
* allocated resources can be released when the channel is freed. * allocated resources can be released when the channel is freed.
*/ */
if (!(ugeth->p_init_enet_param_shadow = if (!(ugeth->p_init_enet_param_shadow =
(ucc_geth_init_pram_t *) kmalloc(sizeof(ucc_geth_init_pram_t), (struct ucc_geth_init_pram *) kmalloc(sizeof(struct ucc_geth_init_pram),
GFP_KERNEL))) { GFP_KERNEL))) {
ugeth_err ugeth_err
("%s: Can not allocate memory for" ("%s: Can not allocate memory for"
...@@ -3472,7 +3460,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) ...@@ -3472,7 +3460,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
} }
/* Zero out *p_init_enet_param_shadow */ /* Zero out *p_init_enet_param_shadow */
memset((char *)ugeth->p_init_enet_param_shadow, memset((char *)ugeth->p_init_enet_param_shadow,
0, sizeof(ucc_geth_init_pram_t)); 0, sizeof(struct ucc_geth_init_pram));
/* Fill shadow InitEnet command parameter structure */ /* Fill shadow InitEnet command parameter structure */
...@@ -3506,7 +3494,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) ...@@ -3506,7 +3494,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
} }
ugeth->p_init_enet_param_shadow->largestexternallookupkeysize = ugeth->p_init_enet_param_shadow->largestexternallookupkeysize =
ug_info->largestexternallookupkeysize; ug_info->largestexternallookupkeysize;
size = sizeof(ucc_geth_thread_rx_pram_t); size = sizeof(struct ucc_geth_thread_rx_pram);
if (ug_info->rxExtendedFiltering) { if (ug_info->rxExtendedFiltering) {
size += THREAD_RX_PRAM_ADDITIONAL_FOR_EXTENDED_FILTERING; size += THREAD_RX_PRAM_ADDITIONAL_FOR_EXTENDED_FILTERING;
if (ug_info->largestexternallookupkeysize == if (ug_info->largestexternallookupkeysize ==
...@@ -3537,7 +3525,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) ...@@ -3537,7 +3525,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
fill_init_enet_entries(ugeth, fill_init_enet_entries(ugeth,
&(ugeth->p_init_enet_param_shadow-> &(ugeth->p_init_enet_param_shadow->
txthread[0]), numThreadsTxNumerical, txthread[0]), numThreadsTxNumerical,
sizeof(ucc_geth_thread_tx_pram_t), sizeof(struct ucc_geth_thread_tx_pram),
UCC_GETH_THREAD_TX_PRAM_ALIGNMENT, UCC_GETH_THREAD_TX_PRAM_ALIGNMENT,
ug_info->riscTx, 0)) != 0) { ug_info->riscTx, 0)) != 0) {
ugeth_err("%s: Can not fill p_init_enet_param_shadow.", ugeth_err("%s: Can not fill p_init_enet_param_shadow.",
...@@ -3557,7 +3545,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) ...@@ -3557,7 +3545,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
} }
/* Allocate InitEnet command parameter structure */ /* Allocate InitEnet command parameter structure */
init_enet_pram_offset = qe_muram_alloc(sizeof(ucc_geth_init_pram_t), 4); init_enet_pram_offset = qe_muram_alloc(sizeof(struct ucc_geth_init_pram), 4);
if (IS_MURAM_ERR(init_enet_pram_offset)) { if (IS_MURAM_ERR(init_enet_pram_offset)) {
ugeth_err ugeth_err
("%s: Can not allocate DPRAM memory for p_init_enet_pram.", ("%s: Can not allocate DPRAM memory for p_init_enet_pram.",
...@@ -3566,7 +3554,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) ...@@ -3566,7 +3554,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
return -ENOMEM; return -ENOMEM;
} }
p_init_enet_pram = p_init_enet_pram =
(ucc_geth_init_pram_t *) qe_muram_addr(init_enet_pram_offset); (struct ucc_geth_init_pram *) qe_muram_addr(init_enet_pram_offset);
/* Copy shadow InitEnet command parameter structure into PRAM */ /* Copy shadow InitEnet command parameter structure into PRAM */
p_init_enet_pram->resinit1 = ugeth->p_init_enet_param_shadow->resinit1; p_init_enet_pram->resinit1 = ugeth->p_init_enet_param_shadow->resinit1;
...@@ -3591,7 +3579,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) ...@@ -3591,7 +3579,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
/* Issue QE command */ /* Issue QE command */
cecr_subblock = cecr_subblock =
ucc_fast_get_qe_cr_subblock(ugeth->ug_info->uf_info.ucc_num); ucc_fast_get_qe_cr_subblock(ugeth->ug_info->uf_info.ucc_num);
qe_issue_cmd(command, cecr_subblock, (u8) QE_CR_PROTOCOL_ETHERNET, qe_issue_cmd(command, cecr_subblock, QE_CR_PROTOCOL_ETHERNET,
init_enet_pram_offset); init_enet_pram_offset);
/* Free InitEnet command parameter */ /* Free InitEnet command parameter */
...@@ -3603,7 +3591,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) ...@@ -3603,7 +3591,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
/* returns a net_device_stats structure pointer */ /* returns a net_device_stats structure pointer */
static struct net_device_stats *ucc_geth_get_stats(struct net_device *dev) static struct net_device_stats *ucc_geth_get_stats(struct net_device *dev)
{ {
ucc_geth_private_t *ugeth = netdev_priv(dev); struct ucc_geth_private *ugeth = netdev_priv(dev);
return &(ugeth->stats); return &(ugeth->stats);
} }
...@@ -3614,7 +3602,7 @@ static struct net_device_stats *ucc_geth_get_stats(struct net_device *dev) ...@@ -3614,7 +3602,7 @@ static struct net_device_stats *ucc_geth_get_stats(struct net_device *dev)
* starting over will fix the problem. */ * starting over will fix the problem. */
static void ucc_geth_timeout(struct net_device *dev) static void ucc_geth_timeout(struct net_device *dev)
{ {
ucc_geth_private_t *ugeth = netdev_priv(dev); struct ucc_geth_private *ugeth = netdev_priv(dev);
ugeth_vdbg("%s: IN", __FUNCTION__); ugeth_vdbg("%s: IN", __FUNCTION__);
...@@ -3634,7 +3622,7 @@ static void ucc_geth_timeout(struct net_device *dev) ...@@ -3634,7 +3622,7 @@ static void ucc_geth_timeout(struct net_device *dev)
/* It is pointed to by the dev->hard_start_xmit function pointer */ /* It is pointed to by the dev->hard_start_xmit function pointer */
static int ucc_geth_start_xmit(struct sk_buff *skb, struct net_device *dev) static int ucc_geth_start_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
ucc_geth_private_t *ugeth = netdev_priv(dev); struct ucc_geth_private *ugeth = netdev_priv(dev);
u8 *bd; /* BD pointer */ u8 *bd; /* BD pointer */
u32 bd_status; u32 bd_status;
u8 txQ = 0; u8 txQ = 0;
...@@ -3647,7 +3635,7 @@ static int ucc_geth_start_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -3647,7 +3635,7 @@ static int ucc_geth_start_xmit(struct sk_buff *skb, struct net_device *dev)
/* Start from the next BD that should be filled */ /* Start from the next BD that should be filled */
bd = ugeth->txBd[txQ]; bd = ugeth->txBd[txQ];
bd_status = BD_STATUS_AND_LENGTH(bd); bd_status = in_be32((u32 *)bd);
/* Save the skb pointer so we can free it later */ /* Save the skb pointer so we can free it later */
ugeth->tx_skbuff[txQ][ugeth->skb_curtx[txQ]] = skb; ugeth->tx_skbuff[txQ][ugeth->skb_curtx[txQ]] = skb;
...@@ -3657,20 +3645,21 @@ static int ucc_geth_start_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -3657,20 +3645,21 @@ static int ucc_geth_start_xmit(struct sk_buff *skb, struct net_device *dev)
1) & TX_RING_MOD_MASK(ugeth->ug_info->bdRingLenTx[txQ]); 1) & TX_RING_MOD_MASK(ugeth->ug_info->bdRingLenTx[txQ]);
/* set up the buffer descriptor */ /* set up the buffer descriptor */
BD_BUFFER_SET(bd, out_be32(&((struct qe_bd *)bd)->buf,
dma_map_single(NULL, skb->data, skb->len, DMA_TO_DEVICE)); dma_map_single(NULL, skb->data, skb->len, DMA_TO_DEVICE));
//printk(KERN_DEBUG"skb->data is 0x%x\n",skb->data); /* printk(KERN_DEBUG"skb->data is 0x%x\n",skb->data); */
bd_status = (bd_status & T_W) | T_R | T_I | T_L | skb->len; bd_status = (bd_status & T_W) | T_R | T_I | T_L | skb->len;
BD_STATUS_AND_LENGTH_SET(bd, bd_status); /* set bd status and length */
out_be32((u32 *)bd, bd_status);
dev->trans_start = jiffies; dev->trans_start = jiffies;
/* Move to next BD in the ring */ /* Move to next BD in the ring */
if (!(bd_status & T_W)) if (!(bd_status & T_W))
ugeth->txBd[txQ] = bd + UCC_GETH_SIZE_OF_BD; ugeth->txBd[txQ] = bd + sizeof(struct qe_bd);
else else
ugeth->txBd[txQ] = ugeth->p_tx_bd_ring[txQ]; ugeth->txBd[txQ] = ugeth->p_tx_bd_ring[txQ];
...@@ -3695,7 +3684,7 @@ static int ucc_geth_start_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -3695,7 +3684,7 @@ static int ucc_geth_start_xmit(struct sk_buff *skb, struct net_device *dev)
return 0; return 0;
} }
static int ucc_geth_rx(ucc_geth_private_t *ugeth, u8 rxQ, int rx_work_limit) static int ucc_geth_rx(struct ucc_geth_private *ugeth, u8 rxQ, int rx_work_limit)
{ {
struct sk_buff *skb; struct sk_buff *skb;
u8 *bd; u8 *bd;
...@@ -3709,11 +3698,11 @@ static int ucc_geth_rx(ucc_geth_private_t *ugeth, u8 rxQ, int rx_work_limit) ...@@ -3709,11 +3698,11 @@ static int ucc_geth_rx(ucc_geth_private_t *ugeth, u8 rxQ, int rx_work_limit)
/* collect received buffers */ /* collect received buffers */
bd = ugeth->rxBd[rxQ]; bd = ugeth->rxBd[rxQ];
bd_status = BD_STATUS_AND_LENGTH(bd); bd_status = in_be32((u32 *)bd);
/* while there are received buffers and BD is full (~R_E) */ /* while there are received buffers and BD is full (~R_E) */
while (!((bd_status & (R_E)) || (--rx_work_limit < 0))) { while (!((bd_status & (R_E)) || (--rx_work_limit < 0))) {
bdBuffer = (u8 *) BD_BUFFER(bd); bdBuffer = (u8 *) in_be32(&((struct qe_bd *)bd)->buf);
length = (u16) ((bd_status & BD_LENGTH_MASK) - 4); length = (u16) ((bd_status & BD_LENGTH_MASK) - 4);
skb = ugeth->rx_skbuff[rxQ][ugeth->skb_currx[rxQ]]; skb = ugeth->rx_skbuff[rxQ][ugeth->skb_currx[rxQ]];
...@@ -3768,9 +3757,9 @@ static int ucc_geth_rx(ucc_geth_private_t *ugeth, u8 rxQ, int rx_work_limit) ...@@ -3768,9 +3757,9 @@ static int ucc_geth_rx(ucc_geth_private_t *ugeth, u8 rxQ, int rx_work_limit)
if (bd_status & R_W) if (bd_status & R_W)
bd = ugeth->p_rx_bd_ring[rxQ]; bd = ugeth->p_rx_bd_ring[rxQ];
else else
bd += UCC_GETH_SIZE_OF_BD; bd += sizeof(struct qe_bd);
bd_status = BD_STATUS_AND_LENGTH(bd); bd_status = in_be32((u32 *)bd);
} }
ugeth->rxBd[rxQ] = bd; ugeth->rxBd[rxQ] = bd;
...@@ -3781,12 +3770,12 @@ static int ucc_geth_rx(ucc_geth_private_t *ugeth, u8 rxQ, int rx_work_limit) ...@@ -3781,12 +3770,12 @@ static int ucc_geth_rx(ucc_geth_private_t *ugeth, u8 rxQ, int rx_work_limit)
static int ucc_geth_tx(struct net_device *dev, u8 txQ) static int ucc_geth_tx(struct net_device *dev, u8 txQ)
{ {
/* Start from the next BD that should be filled */ /* Start from the next BD that should be filled */
ucc_geth_private_t *ugeth = netdev_priv(dev); struct ucc_geth_private *ugeth = netdev_priv(dev);
u8 *bd; /* BD pointer */ u8 *bd; /* BD pointer */
u32 bd_status; u32 bd_status;
bd = ugeth->confBd[txQ]; bd = ugeth->confBd[txQ];
bd_status = BD_STATUS_AND_LENGTH(bd); bd_status = in_be32((u32 *)bd);
/* Normal processing. */ /* Normal processing. */
while ((bd_status & T_R) == 0) { while ((bd_status & T_R) == 0) {
...@@ -3813,7 +3802,7 @@ static int ucc_geth_tx(struct net_device *dev, u8 txQ) ...@@ -3813,7 +3802,7 @@ static int ucc_geth_tx(struct net_device *dev, u8 txQ)
/* Advance the confirmation BD pointer */ /* Advance the confirmation BD pointer */
if (!(bd_status & T_W)) if (!(bd_status & T_W))
ugeth->confBd[txQ] += UCC_GETH_SIZE_OF_BD; ugeth->confBd[txQ] += sizeof(struct qe_bd);
else else
ugeth->confBd[txQ] = ugeth->p_tx_bd_ring[txQ]; ugeth->confBd[txQ] = ugeth->p_tx_bd_ring[txQ];
} }
...@@ -3823,7 +3812,7 @@ static int ucc_geth_tx(struct net_device *dev, u8 txQ) ...@@ -3823,7 +3812,7 @@ static int ucc_geth_tx(struct net_device *dev, u8 txQ)
#ifdef CONFIG_UGETH_NAPI #ifdef CONFIG_UGETH_NAPI
static int ucc_geth_poll(struct net_device *dev, int *budget) static int ucc_geth_poll(struct net_device *dev, int *budget)
{ {
ucc_geth_private_t *ugeth = netdev_priv(dev); struct ucc_geth_private *ugeth = netdev_priv(dev);
int howmany; int howmany;
int rx_work_limit = *budget; int rx_work_limit = *budget;
u8 rxQ = 0; u8 rxQ = 0;
...@@ -3847,9 +3836,9 @@ static int ucc_geth_poll(struct net_device *dev, int *budget) ...@@ -3847,9 +3836,9 @@ static int ucc_geth_poll(struct net_device *dev, int *budget)
static irqreturn_t ucc_geth_irq_handler(int irq, void *info) static irqreturn_t ucc_geth_irq_handler(int irq, void *info)
{ {
struct net_device *dev = (struct net_device *)info; struct net_device *dev = (struct net_device *)info;
ucc_geth_private_t *ugeth = netdev_priv(dev); struct ucc_geth_private *ugeth = netdev_priv(dev);
ucc_fast_private_t *uccf; struct ucc_fast_private *uccf;
ucc_geth_info_t *ug_info; struct ucc_geth_info *ug_info;
register u32 ucce = 0; register u32 ucce = 0;
register u32 bit_mask = UCCE_RXBF_SINGLE_MASK; register u32 bit_mask = UCCE_RXBF_SINGLE_MASK;
register u32 tx_mask = UCCE_TXBF_SINGLE_MASK; register u32 tx_mask = UCCE_TXBF_SINGLE_MASK;
...@@ -3912,7 +3901,7 @@ static irqreturn_t ucc_geth_irq_handler(int irq, void *info) ...@@ -3912,7 +3901,7 @@ static irqreturn_t ucc_geth_irq_handler(int irq, void *info)
static irqreturn_t phy_interrupt(int irq, void *dev_id) static irqreturn_t phy_interrupt(int irq, void *dev_id)
{ {
struct net_device *dev = (struct net_device *)dev_id; struct net_device *dev = (struct net_device *)dev_id;
ucc_geth_private_t *ugeth = netdev_priv(dev); struct ucc_geth_private *ugeth = netdev_priv(dev);
ugeth_vdbg("%s: IN", __FUNCTION__); ugeth_vdbg("%s: IN", __FUNCTION__);
...@@ -3932,8 +3921,8 @@ static irqreturn_t phy_interrupt(int irq, void *dev_id) ...@@ -3932,8 +3921,8 @@ static irqreturn_t phy_interrupt(int irq, void *dev_id)
static void ugeth_phy_change(void *data) static void ugeth_phy_change(void *data)
{ {
struct net_device *dev = (struct net_device *)data; struct net_device *dev = (struct net_device *)data;
ucc_geth_private_t *ugeth = netdev_priv(dev); struct ucc_geth_private *ugeth = netdev_priv(dev);
ucc_geth_t *ug_regs; struct ucc_geth *ug_regs;
int result = 0; int result = 0;
ugeth_vdbg("%s: IN", __FUNCTION__); ugeth_vdbg("%s: IN", __FUNCTION__);
...@@ -3963,7 +3952,7 @@ static void ugeth_phy_change(void *data) ...@@ -3963,7 +3952,7 @@ static void ugeth_phy_change(void *data)
static void ugeth_phy_timer(unsigned long data) static void ugeth_phy_timer(unsigned long data)
{ {
struct net_device *dev = (struct net_device *)data; struct net_device *dev = (struct net_device *)data;
ucc_geth_private_t *ugeth = netdev_priv(dev); struct ucc_geth_private *ugeth = netdev_priv(dev);
schedule_work(&ugeth->tq); schedule_work(&ugeth->tq);
...@@ -3979,7 +3968,7 @@ static void ugeth_phy_timer(unsigned long data) ...@@ -3979,7 +3968,7 @@ static void ugeth_phy_timer(unsigned long data)
static void ugeth_phy_startup_timer(unsigned long data) static void ugeth_phy_startup_timer(unsigned long data)
{ {
struct ugeth_mii_info *mii_info = (struct ugeth_mii_info *)data; struct ugeth_mii_info *mii_info = (struct ugeth_mii_info *)data;
ucc_geth_private_t *ugeth = netdev_priv(mii_info->dev); struct ucc_geth_private *ugeth = netdev_priv(mii_info->dev);
static int secondary = UGETH_AN_TIMEOUT; static int secondary = UGETH_AN_TIMEOUT;
int result; int result;
...@@ -4034,7 +4023,7 @@ static void ugeth_phy_startup_timer(unsigned long data) ...@@ -4034,7 +4023,7 @@ static void ugeth_phy_startup_timer(unsigned long data)
/* Returns 0 for success. */ /* Returns 0 for success. */
static int ucc_geth_open(struct net_device *dev) static int ucc_geth_open(struct net_device *dev)
{ {
ucc_geth_private_t *ugeth = netdev_priv(dev); struct ucc_geth_private *ugeth = netdev_priv(dev);
int err; int err;
ugeth_vdbg("%s: IN", __FUNCTION__); ugeth_vdbg("%s: IN", __FUNCTION__);
...@@ -4111,7 +4100,7 @@ static int ucc_geth_open(struct net_device *dev) ...@@ -4111,7 +4100,7 @@ static int ucc_geth_open(struct net_device *dev)
/* Stops the kernel queue, and halts the controller */ /* Stops the kernel queue, and halts the controller */
static int ucc_geth_close(struct net_device *dev) static int ucc_geth_close(struct net_device *dev)
{ {
ucc_geth_private_t *ugeth = netdev_priv(dev); struct ucc_geth_private *ugeth = netdev_priv(dev);
ugeth_vdbg("%s: IN", __FUNCTION__); ugeth_vdbg("%s: IN", __FUNCTION__);
...@@ -4130,30 +4119,53 @@ static int ucc_geth_close(struct net_device *dev) ...@@ -4130,30 +4119,53 @@ static int ucc_geth_close(struct net_device *dev)
const struct ethtool_ops ucc_geth_ethtool_ops = { }; const struct ethtool_ops ucc_geth_ethtool_ops = { };
static int ucc_geth_probe(struct device *device) static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *match)
{ {
struct platform_device *pdev = to_platform_device(device); struct device *device = &ofdev->dev;
struct ucc_geth_platform_data *ugeth_pdata; struct device_node *np = ofdev->node;
struct net_device *dev = NULL; struct net_device *dev = NULL;
struct ucc_geth_private *ugeth = NULL; struct ucc_geth_private *ugeth = NULL;
struct ucc_geth_info *ug_info; struct ucc_geth_info *ug_info;
int err; struct resource res;
struct device_node *phy;
int err, ucc_num, phy_interface;
static int mii_mng_configured = 0; static int mii_mng_configured = 0;
const phandle *ph;
const unsigned int *prop;
ugeth_vdbg("%s: IN", __FUNCTION__); ugeth_vdbg("%s: IN", __FUNCTION__);
ugeth_pdata = (struct ucc_geth_platform_data *)pdev->dev.platform_data; prop = get_property(np, "device-id", NULL);
ucc_num = *prop - 1;
if ((ucc_num < 0) || (ucc_num > 7))
return -ENODEV;
ug_info = &ugeth_info[ucc_num];
ug_info->uf_info.ucc_num = ucc_num;
prop = get_property(np, "rx-clock", NULL);
ug_info->uf_info.rx_clock = *prop;
prop = get_property(np, "tx-clock", NULL);
ug_info->uf_info.tx_clock = *prop;
err = of_address_to_resource(np, 0, &res);
if (err)
return -EINVAL;
ug_info->uf_info.regs = res.start;
ug_info->uf_info.irq = irq_of_parse_and_map(np, 0);
ph = get_property(np, "phy-handle", NULL);
phy = of_find_node_by_phandle(*ph);
ug_info = &ugeth_info[pdev->id]; if (phy == NULL)
ug_info->uf_info.ucc_num = pdev->id; return -ENODEV;
ug_info->uf_info.rx_clock = ugeth_pdata->rx_clock;
ug_info->uf_info.tx_clock = ugeth_pdata->tx_clock; prop = get_property(phy, "reg", NULL);
ug_info->uf_info.regs = ugeth_pdata->phy_reg_addr; ug_info->phy_address = *prop;
ug_info->uf_info.irq = platform_get_irq(pdev, 0); prop = get_property(phy, "interface", NULL);
ug_info->phy_address = ugeth_pdata->phy_id; ug_info->enet_interface = *prop;
ug_info->enet_interface = ugeth_pdata->phy_interface; ug_info->phy_interrupt = irq_of_parse_and_map(phy, 0);
ug_info->board_flags = ugeth_pdata->board_flags; ug_info->board_flags = (ug_info->phy_interrupt == NO_IRQ)?
ug_info->phy_interrupt = ugeth_pdata->phy_interrupt; 0:FSL_UGETH_BRD_HAS_PHY_INTR;
printk(KERN_INFO "ucc_geth: UCC%1d at 0x%8x (irq = %d) \n", printk(KERN_INFO "ucc_geth: UCC%1d at 0x%8x (irq = %d) \n",
ug_info->uf_info.ucc_num + 1, ug_info->uf_info.regs, ug_info->uf_info.ucc_num + 1, ug_info->uf_info.regs,
...@@ -4161,12 +4173,44 @@ static int ucc_geth_probe(struct device *device) ...@@ -4161,12 +4173,44 @@ static int ucc_geth_probe(struct device *device)
if (ug_info == NULL) { if (ug_info == NULL) {
ugeth_err("%s: [%d] Missing additional data!", __FUNCTION__, ugeth_err("%s: [%d] Missing additional data!", __FUNCTION__,
pdev->id); ucc_num);
return -ENODEV; return -ENODEV;
} }
/* FIXME: Work around for early chip rev. */
/* There's a bug in initial chip rev(s) in the RGMII ac */
/* timing. */
/* The following compensates by writing to the reserved */
/* QE Port Output Hold Registers (CPOH1?). */
prop = get_property(phy, "interface", NULL);
phy_interface = *prop;
if ((phy_interface == ENET_1000_RGMII) ||
(phy_interface == ENET_100_RGMII) ||
(phy_interface == ENET_10_RGMII)) {
struct device_node *soc;
phys_addr_t immrbase = -1;
u32 *tmp_reg;
u32 tmp_val;
soc = of_find_node_by_type(NULL, "soc");
if (soc) {
unsigned int size;
const void *prop = get_property(soc, "reg", &size);
immrbase = of_translate_address(soc, prop);
of_node_put(soc);
};
tmp_reg = (u32 *) ioremap(immrbase + 0x14A8, 0x4);
tmp_val = in_be32(tmp_reg);
if (ucc_num == 1)
out_be32(tmp_reg, tmp_val | 0x00003000);
else if (ucc_num == 2)
out_be32(tmp_reg, tmp_val | 0x0c000000);
iounmap(tmp_reg);
}
if (!mii_mng_configured) { if (!mii_mng_configured) {
ucc_set_qe_mux_mii_mng(ug_info->uf_info.ucc_num); ucc_set_qe_mux_mii_mng(ucc_num);
mii_mng_configured = 1; mii_mng_configured = 1;
} }
...@@ -4213,13 +4257,14 @@ static int ucc_geth_probe(struct device *device) ...@@ -4213,13 +4257,14 @@ static int ucc_geth_probe(struct device *device)
ugeth->ug_info = ug_info; ugeth->ug_info = ug_info;
ugeth->dev = dev; ugeth->dev = dev;
memcpy(dev->dev_addr, ugeth_pdata->mac_addr, 6); memcpy(dev->dev_addr, get_property(np, "mac-address", NULL), 6);
return 0; return 0;
} }
static int ucc_geth_remove(struct device *device) static int ucc_geth_remove(struct of_device* ofdev)
{ {
struct device *device = &ofdev->dev;
struct net_device *dev = dev_get_drvdata(device); struct net_device *dev = dev_get_drvdata(device);
struct ucc_geth_private *ugeth = netdev_priv(dev); struct ucc_geth_private *ugeth = netdev_priv(dev);
...@@ -4230,28 +4275,38 @@ static int ucc_geth_remove(struct device *device) ...@@ -4230,28 +4275,38 @@ static int ucc_geth_remove(struct device *device)
return 0; return 0;
} }
/* Structure for a device driver */ static struct of_device_id ucc_geth_match[] = {
static struct device_driver ucc_geth_driver = { {
.name = DRV_NAME, .type = "network",
.bus = &platform_bus_type, .compatible = "ucc_geth",
.probe = ucc_geth_probe, },
.remove = ucc_geth_remove, {},
};
MODULE_DEVICE_TABLE(of, ucc_geth_match);
static struct of_platform_driver ucc_geth_driver = {
.name = DRV_NAME,
.match_table = ucc_geth_match,
.probe = ucc_geth_probe,
.remove = ucc_geth_remove,
}; };
static int __init ucc_geth_init(void) static int __init ucc_geth_init(void)
{ {
int i; int i;
printk(KERN_INFO "ucc_geth: " DRV_DESC "\n"); printk(KERN_INFO "ucc_geth: " DRV_DESC "\n");
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)
memcpy(&(ugeth_info[i]), &ugeth_primary_info, memcpy(&(ugeth_info[i]), &ugeth_primary_info,
sizeof(ugeth_primary_info)); sizeof(ugeth_primary_info));
return driver_register(&ucc_geth_driver); return of_register_driver(&ucc_geth_driver);
} }
static void __exit ucc_geth_exit(void) static void __exit ucc_geth_exit(void)
{ {
driver_unregister(&ucc_geth_driver); of_unregister_driver(&ucc_geth_driver);
} }
module_init(ucc_geth_init); module_init(ucc_geth_init);
......
drivers/net/ucc_geth.h
View file @ 18a8e864
...@@ -36,24 +36,24 @@ ...@@ -36,24 +36,24 @@
#define ENET_INIT_PARAM_MAX_ENTRIES_RX 9 #define ENET_INIT_PARAM_MAX_ENTRIES_RX 9
#define ENET_INIT_PARAM_MAX_ENTRIES_TX 8 #define ENET_INIT_PARAM_MAX_ENTRIES_TX 8
typedef struct ucc_mii_mng { struct ucc_mii_mng {
u32 miimcfg; /* MII management configuration reg */ u32 miimcfg; /* MII management configuration reg */
u32 miimcom; /* MII management command reg */ u32 miimcom; /* MII management command reg */
u32 miimadd; /* MII management address reg */ u32 miimadd; /* MII management address reg */
u32 miimcon; /* MII management control reg */ u32 miimcon; /* MII management control reg */
u32 miimstat; /* MII management status reg */ u32 miimstat; /* MII management status reg */
u32 miimind; /* MII management indication reg */ u32 miimind; /* MII management indication reg */
} __attribute__ ((packed)) ucc_mii_mng_t; } __attribute__ ((packed));
typedef struct ucc_geth { struct ucc_geth {
ucc_fast_t uccf; struct ucc_fast uccf;
u32 maccfg1; /* mac configuration reg. 1 */ u32 maccfg1; /* mac configuration reg. 1 */
u32 maccfg2; /* mac configuration reg. 2 */ u32 maccfg2; /* mac configuration reg. 2 */
u32 ipgifg; /* interframe gap reg. */ u32 ipgifg; /* interframe gap reg. */
u32 hafdup; /* half-duplex reg. */ u32 hafdup; /* half-duplex reg. */
u8 res1[0x10]; u8 res1[0x10];
ucc_mii_mng_t miimng; /* MII management structure */ struct ucc_mii_mng miimng; /* MII management structure */
u32 ifctl; /* interface control reg */ u32 ifctl; /* interface control reg */
u32 ifstat; /* interface statux reg */ u32 ifstat; /* interface statux reg */
u32 macstnaddr1; /* mac station address part 1 reg */ u32 macstnaddr1; /* mac station address part 1 reg */
...@@ -111,7 +111,7 @@ typedef struct ucc_geth { ...@@ -111,7 +111,7 @@ typedef struct ucc_geth {
u32 scar; /* Statistics carry register */ u32 scar; /* Statistics carry register */
u32 scam; /* Statistics caryy mask register */ u32 scam; /* Statistics caryy mask register */
u8 res5[0x200 - 0x1c4]; u8 res5[0x200 - 0x1c4];
} __attribute__ ((packed)) ucc_geth_t; } __attribute__ ((packed));
/* UCC GETH TEMODR Register */ /* UCC GETH TEMODR Register */
#define TEMODER_TX_RMON_STATISTICS_ENABLE 0x0100 /* enable Tx statistics #define TEMODER_TX_RMON_STATISTICS_ENABLE 0x0100 /* enable Tx statistics
...@@ -508,39 +508,39 @@ typedef struct ucc_geth { ...@@ -508,39 +508,39 @@ typedef struct ucc_geth {
/* UCC GETH UDSR (Data Synchronization Register) */ /* UCC GETH UDSR (Data Synchronization Register) */
#define UDSR_MAGIC 0x067E #define UDSR_MAGIC 0x067E
typedef struct ucc_geth_thread_data_tx { struct ucc_geth_thread_data_tx {
u8 res0[104]; u8 res0[104];
} __attribute__ ((packed)) ucc_geth_thread_data_tx_t; } __attribute__ ((packed));
typedef struct ucc_geth_thread_data_rx { struct ucc_geth_thread_data_rx {
u8 res0[40]; u8 res0[40];
} __attribute__ ((packed)) ucc_geth_thread_data_rx_t; } __attribute__ ((packed));
/* Send Queue Queue-Descriptor */ /* Send Queue Queue-Descriptor */
typedef struct ucc_geth_send_queue_qd { struct ucc_geth_send_queue_qd {
u32 bd_ring_base; /* pointer to BD ring base address */ u32 bd_ring_base; /* pointer to BD ring base address */
u8 res0[0x8]; u8 res0[0x8];
u32 last_bd_completed_address;/* initialize to last entry in BD ring */ u32 last_bd_completed_address;/* initialize to last entry in BD ring */
u8 res1[0x30]; u8 res1[0x30];
} __attribute__ ((packed)) ucc_geth_send_queue_qd_t; } __attribute__ ((packed));
typedef struct ucc_geth_send_queue_mem_region { struct ucc_geth_send_queue_mem_region {
ucc_geth_send_queue_qd_t sqqd[NUM_TX_QUEUES]; struct ucc_geth_send_queue_qd sqqd[NUM_TX_QUEUES];
} __attribute__ ((packed)) ucc_geth_send_queue_mem_region_t; } __attribute__ ((packed));
typedef struct ucc_geth_thread_tx_pram { struct ucc_geth_thread_tx_pram {
u8 res0[64]; u8 res0[64];
} __attribute__ ((packed)) ucc_geth_thread_tx_pram_t; } __attribute__ ((packed));
typedef struct ucc_geth_thread_rx_pram { struct ucc_geth_thread_rx_pram {
u8 res0[128]; u8 res0[128];
} __attribute__ ((packed)) ucc_geth_thread_rx_pram_t; } __attribute__ ((packed));
#define THREAD_RX_PRAM_ADDITIONAL_FOR_EXTENDED_FILTERING 64 #define THREAD_RX_PRAM_ADDITIONAL_FOR_EXTENDED_FILTERING 64
#define THREAD_RX_PRAM_ADDITIONAL_FOR_EXTENDED_FILTERING_8 64 #define THREAD_RX_PRAM_ADDITIONAL_FOR_EXTENDED_FILTERING_8 64
#define THREAD_RX_PRAM_ADDITIONAL_FOR_EXTENDED_FILTERING_16 96 #define THREAD_RX_PRAM_ADDITIONAL_FOR_EXTENDED_FILTERING_16 96
typedef struct ucc_geth_scheduler { struct ucc_geth_scheduler {
u16 cpucount0; /* CPU packet counter */ u16 cpucount0; /* CPU packet counter */
u16 cpucount1; /* CPU packet counter */ u16 cpucount1; /* CPU packet counter */
u16 cecount0; /* QE packet counter */ u16 cecount0; /* QE packet counter */
...@@ -574,9 +574,9 @@ typedef struct ucc_geth_scheduler { ...@@ -574,9 +574,9 @@ typedef struct ucc_geth_scheduler {
/**< weight factor for queues */ /**< weight factor for queues */
u32 minw; /* temporary variable handled by QE */ u32 minw; /* temporary variable handled by QE */
u8 res1[0x70 - 0x64]; u8 res1[0x70 - 0x64];
} __attribute__ ((packed)) ucc_geth_scheduler_t; } __attribute__ ((packed));
typedef struct ucc_geth_tx_firmware_statistics_pram { struct ucc_geth_tx_firmware_statistics_pram {
u32 sicoltx; /* single collision */ u32 sicoltx; /* single collision */
u32 mulcoltx; /* multiple collision */ u32 mulcoltx; /* multiple collision */
u32 latecoltxfr; /* late collision */ u32 latecoltxfr; /* late collision */
...@@ -596,9 +596,9 @@ typedef struct ucc_geth_tx_firmware_statistics_pram { ...@@ -596,9 +596,9 @@ typedef struct ucc_geth_tx_firmware_statistics_pram {
and 1518 octets */ and 1518 octets */
u32 txpktsjumbo; /* total packets (including bad) between 1024 u32 txpktsjumbo; /* total packets (including bad) between 1024
and MAXLength octets */ and MAXLength octets */
} __attribute__ ((packed)) ucc_geth_tx_firmware_statistics_pram_t; } __attribute__ ((packed));
typedef struct ucc_geth_rx_firmware_statistics_pram { struct ucc_geth_rx_firmware_statistics_pram {
u32 frrxfcser; /* frames with crc error */ u32 frrxfcser; /* frames with crc error */
u32 fraligner; /* frames with alignment error */ u32 fraligner; /* frames with alignment error */
u32 inrangelenrxer; /* in range length error */ u32 inrangelenrxer; /* in range length error */
...@@ -630,33 +630,33 @@ typedef struct ucc_geth_rx_firmware_statistics_pram { ...@@ -630,33 +630,33 @@ typedef struct ucc_geth_rx_firmware_statistics_pram {
replaced */ replaced */
u32 insertvlan; /* total frames that had their VLAN tag u32 insertvlan; /* total frames that had their VLAN tag
inserted */ inserted */
} __attribute__ ((packed)) ucc_geth_rx_firmware_statistics_pram_t; } __attribute__ ((packed));
typedef struct ucc_geth_rx_interrupt_coalescing_entry { struct ucc_geth_rx_interrupt_coalescing_entry {
u32 interruptcoalescingmaxvalue; /* interrupt coalescing max u32 interruptcoalescingmaxvalue; /* interrupt coalescing max
value */ value */
u32 interruptcoalescingcounter; /* interrupt coalescing counter, u32 interruptcoalescingcounter; /* interrupt coalescing counter,
initialize to initialize to
interruptcoalescingmaxvalue */ interruptcoalescingmaxvalue */
} __attribute__ ((packed)) ucc_geth_rx_interrupt_coalescing_entry_t; } __attribute__ ((packed));
typedef struct ucc_geth_rx_interrupt_coalescing_table { struct ucc_geth_rx_interrupt_coalescing_table {
ucc_geth_rx_interrupt_coalescing_entry_t coalescingentry[NUM_RX_QUEUES]; struct ucc_geth_rx_interrupt_coalescing_entry coalescingentry[NUM_RX_QUEUES];
/**< interrupt coalescing entry */ /**< interrupt coalescing entry */
} __attribute__ ((packed)) ucc_geth_rx_interrupt_coalescing_table_t; } __attribute__ ((packed));
typedef struct ucc_geth_rx_prefetched_bds { struct ucc_geth_rx_prefetched_bds {
qe_bd_t bd[NUM_BDS_IN_PREFETCHED_BDS]; /* prefetched bd */ struct qe_bd bd[NUM_BDS_IN_PREFETCHED_BDS]; /* prefetched bd */
} __attribute__ ((packed)) ucc_geth_rx_prefetched_bds_t; } __attribute__ ((packed));
typedef struct ucc_geth_rx_bd_queues_entry { struct ucc_geth_rx_bd_queues_entry {
u32 bdbaseptr; /* BD base pointer */ u32 bdbaseptr; /* BD base pointer */
u32 bdptr; /* BD pointer */ u32 bdptr; /* BD pointer */
u32 externalbdbaseptr; /* external BD base pointer */ u32 externalbdbaseptr; /* external BD base pointer */
u32 externalbdptr; /* external BD pointer */ u32 externalbdptr; /* external BD pointer */
} __attribute__ ((packed)) ucc_geth_rx_bd_queues_entry_t; } __attribute__ ((packed));
typedef struct ucc_geth_tx_global_pram { struct ucc_geth_tx_global_pram {
u16 temoder; u16 temoder;
u8 res0[0x38 - 0x02]; u8 res0[0x38 - 0x02];
u32 sqptr; /* a base pointer to send queue memory region */ u32 sqptr; /* a base pointer to send queue memory region */
...@@ -670,15 +670,15 @@ typedef struct ucc_geth_tx_global_pram { ...@@ -670,15 +670,15 @@ typedef struct ucc_geth_tx_global_pram {
u32 tqptr; /* a base pointer to the Tx Queues Memory u32 tqptr; /* a base pointer to the Tx Queues Memory
Region */ Region */
u8 res2[0x80 - 0x74]; u8 res2[0x80 - 0x74];
} __attribute__ ((packed)) ucc_geth_tx_global_pram_t; } __attribute__ ((packed));
/* structure representing Extended Filtering Global Parameters in PRAM */ /* structure representing Extended Filtering Global Parameters in PRAM */
typedef struct ucc_geth_exf_global_pram { struct ucc_geth_exf_global_pram {
u32 l2pcdptr; /* individual address filter, high */ u32 l2pcdptr; /* individual address filter, high */
u8 res0[0x10 - 0x04]; u8 res0[0x10 - 0x04];
} __attribute__ ((packed)) ucc_geth_exf_global_pram_t; } __attribute__ ((packed));
typedef struct ucc_geth_rx_global_pram { struct ucc_geth_rx_global_pram {
u32 remoder; /* ethernet mode reg. */ u32 remoder; /* ethernet mode reg. */
u32 rqptr; /* base pointer to the Rx Queues Memory Region*/ u32 rqptr; /* base pointer to the Rx Queues Memory Region*/
u32 res0[0x1]; u32 res0[0x1];
...@@ -710,12 +710,12 @@ typedef struct ucc_geth_rx_global_pram { ...@@ -710,12 +710,12 @@ typedef struct ucc_geth_rx_global_pram {
u32 exfGlobalParam; /* base address for extended filtering global u32 exfGlobalParam; /* base address for extended filtering global
parameters */ parameters */
u8 res6[0x100 - 0xC4]; /* Initialize to zero */ u8 res6[0x100 - 0xC4]; /* Initialize to zero */
} __attribute__ ((packed)) ucc_geth_rx_global_pram_t; } __attribute__ ((packed));
#define GRACEFUL_STOP_ACKNOWLEDGE_RX 0x01 #define GRACEFUL_STOP_ACKNOWLEDGE_RX 0x01
/* structure representing InitEnet command */ /* structure representing InitEnet command */
typedef struct ucc_geth_init_pram { struct ucc_geth_init_pram {
u8 resinit1; u8 resinit1;
u8 resinit2; u8 resinit2;
u8 resinit3; u8 resinit3;
...@@ -729,7 +729,7 @@ typedef struct ucc_geth_init_pram { ...@@ -729,7 +729,7 @@ typedef struct ucc_geth_init_pram {
u32 txglobal; /* tx global */ u32 txglobal; /* tx global */
u32 txthread[ENET_INIT_PARAM_MAX_ENTRIES_TX]; /* tx threads */ u32 txthread[ENET_INIT_PARAM_MAX_ENTRIES_TX]; /* tx threads */
u8 res3[0x1]; u8 res3[0x1];
} __attribute__ ((packed)) ucc_geth_init_pram_t; } __attribute__ ((packed));
#define ENET_INIT_PARAM_RGF_SHIFT (32 - 4) #define ENET_INIT_PARAM_RGF_SHIFT (32 - 4)
#define ENET_INIT_PARAM_TGF_SHIFT (32 - 8) #define ENET_INIT_PARAM_TGF_SHIFT (32 - 8)
...@@ -746,27 +746,27 @@ typedef struct ucc_geth_init_pram { ...@@ -746,27 +746,27 @@ typedef struct ucc_geth_init_pram {
#define ENET_INIT_PARAM_MAGIC_RES_INIT5 0x0400 #define ENET_INIT_PARAM_MAGIC_RES_INIT5 0x0400
/* structure representing 82xx Address Filtering Enet Address in PRAM */ /* structure representing 82xx Address Filtering Enet Address in PRAM */
typedef struct ucc_geth_82xx_enet_address { struct ucc_geth_82xx_enet_address {
u8 res1[0x2]; u8 res1[0x2];
u16 h; /* address (MSB) */ u16 h; /* address (MSB) */
u16 m; /* address */ u16 m; /* address */
u16 l; /* address (LSB) */ u16 l; /* address (LSB) */
} __attribute__ ((packed)) ucc_geth_82xx_enet_address_t; } __attribute__ ((packed));
/* structure representing 82xx Address Filtering PRAM */ /* structure representing 82xx Address Filtering PRAM */
typedef struct ucc_geth_82xx_address_filtering_pram { struct ucc_geth_82xx_address_filtering_pram {
u32 iaddr_h; /* individual address filter, high */ u32 iaddr_h; /* individual address filter, high */
u32 iaddr_l; /* individual address filter, low */ u32 iaddr_l; /* individual address filter, low */
u32 gaddr_h; /* group address filter, high */ u32 gaddr_h; /* group address filter, high */
u32 gaddr_l; /* group address filter, low */ u32 gaddr_l; /* group address filter, low */
ucc_geth_82xx_enet_address_t taddr; struct ucc_geth_82xx_enet_address taddr;
ucc_geth_82xx_enet_address_t paddr[NUM_OF_PADDRS]; struct ucc_geth_82xx_enet_address paddr[NUM_OF_PADDRS];
u8 res0[0x40 - 0x38]; u8 res0[0x40 - 0x38];
} __attribute__ ((packed)) ucc_geth_82xx_address_filtering_pram_t; } __attribute__ ((packed));
/* GETH Tx firmware statistics structure, used when calling /* GETH Tx firmware statistics structure, used when calling
UCC_GETH_GetStatistics. */ UCC_GETH_GetStatistics. */
typedef struct ucc_geth_tx_firmware_statistics { struct ucc_geth_tx_firmware_statistics {
u32 sicoltx; /* single collision */ u32 sicoltx; /* single collision */
u32 mulcoltx; /* multiple collision */ u32 mulcoltx; /* multiple collision */
u32 latecoltxfr; /* late collision */ u32 latecoltxfr; /* late collision */
...@@ -786,11 +786,11 @@ typedef struct ucc_geth_tx_firmware_statistics { ...@@ -786,11 +786,11 @@ typedef struct ucc_geth_tx_firmware_statistics {
and 1518 octets */ and 1518 octets */
u32 txpktsjumbo; /* total packets (including bad) between 1024 u32 txpktsjumbo; /* total packets (including bad) between 1024
and MAXLength octets */ and MAXLength octets */
} __attribute__ ((packed)) ucc_geth_tx_firmware_statistics_t; } __attribute__ ((packed));
/* GETH Rx firmware statistics structure, used when calling /* GETH Rx firmware statistics structure, used when calling
UCC_GETH_GetStatistics. */ UCC_GETH_GetStatistics. */
typedef struct ucc_geth_rx_firmware_statistics { struct ucc_geth_rx_firmware_statistics {
u32 frrxfcser; /* frames with crc error */ u32 frrxfcser; /* frames with crc error */
u32 fraligner; /* frames with alignment error */ u32 fraligner; /* frames with alignment error */
u32 inrangelenrxer; /* in range length error */ u32 inrangelenrxer; /* in range length error */
...@@ -822,11 +822,11 @@ typedef struct ucc_geth_rx_firmware_statistics { ...@@ -822,11 +822,11 @@ typedef struct ucc_geth_rx_firmware_statistics {
replaced */ replaced */
u32 insertvlan; /* total frames that had their VLAN tag u32 insertvlan; /* total frames that had their VLAN tag
inserted */ inserted */
} __attribute__ ((packed)) ucc_geth_rx_firmware_statistics_t; } __attribute__ ((packed));
/* GETH hardware statistics structure, used when calling /* GETH hardware statistics structure, used when calling
UCC_GETH_GetStatistics. */ UCC_GETH_GetStatistics. */
typedef struct ucc_geth_hardware_statistics { struct ucc_geth_hardware_statistics {
u32 tx64; /* Total number of frames (including bad u32 tx64; /* Total number of frames (including bad
frames) transmitted that were exactly of the frames) transmitted that were exactly of the
minimal length (64 for un tagged, 68 for minimal length (64 for un tagged, 68 for
...@@ -871,7 +871,7 @@ typedef struct ucc_geth_hardware_statistics { ...@@ -871,7 +871,7 @@ typedef struct ucc_geth_hardware_statistics {
u32 rbca; /* Total number of frames received succesfully u32 rbca; /* Total number of frames received succesfully
that had destination address equal to the that had destination address equal to the
broadcast address */ broadcast address */
} __attribute__ ((packed)) ucc_geth_hardware_statistics_t; } __attribute__ ((packed));
/* UCC GETH Tx errors returned via TxConf callback */ /* UCC GETH Tx errors returned via TxConf callback */
#define TX_ERRORS_DEF 0x0200 #define TX_ERRORS_DEF 0x0200
...@@ -1013,21 +1013,21 @@ typedef struct ucc_geth_hardware_statistics { ...@@ -1013,21 +1013,21 @@ typedef struct ucc_geth_hardware_statistics {
(MIIMCFG_MANAGEMENT_CLOCK_DIVIDE_BY_112) (MIIMCFG_MANAGEMENT_CLOCK_DIVIDE_BY_112)
/* Ethernet speed */ /* Ethernet speed */
typedef enum enet_speed { enum enet_speed {
ENET_SPEED_10BT, /* 10 Base T */ ENET_SPEED_10BT, /* 10 Base T */
ENET_SPEED_100BT, /* 100 Base T */ ENET_SPEED_100BT, /* 100 Base T */
ENET_SPEED_1000BT /* 1000 Base T */ ENET_SPEED_1000BT /* 1000 Base T */
} enet_speed_e; };
/* Ethernet Address Type. */ /* Ethernet Address Type. */
typedef enum enet_addr_type { enum enet_addr_type {
ENET_ADDR_TYPE_INDIVIDUAL, ENET_ADDR_TYPE_INDIVIDUAL,
ENET_ADDR_TYPE_GROUP, ENET_ADDR_TYPE_GROUP,
ENET_ADDR_TYPE_BROADCAST ENET_ADDR_TYPE_BROADCAST
} enet_addr_type_e; };
/* TBI / MII Set Register */ /* TBI / MII Set Register */
typedef enum enet_tbi_mii_reg { enum enet_tbi_mii_reg {
ENET_TBI_MII_CR = 0x00, /* Control (CR ) */ ENET_TBI_MII_CR = 0x00, /* Control (CR ) */
ENET_TBI_MII_SR = 0x01, /* Status (SR ) */ ENET_TBI_MII_SR = 0x01, /* Status (SR ) */
ENET_TBI_MII_ANA = 0x04, /* AN advertisement (ANA ) */ ENET_TBI_MII_ANA = 0x04, /* AN advertisement (ANA ) */
...@@ -1040,10 +1040,10 @@ typedef enum enet_tbi_mii_reg { ...@@ -1040,10 +1040,10 @@ typedef enum enet_tbi_mii_reg {
ENET_TBI_MII_EXST = 0x0F, /* Extended status (EXST ) */ ENET_TBI_MII_EXST = 0x0F, /* Extended status (EXST ) */
ENET_TBI_MII_JD = 0x10, /* Jitter diagnostics (JD ) */ ENET_TBI_MII_JD = 0x10, /* Jitter diagnostics (JD ) */
ENET_TBI_MII_TBICON = 0x11 /* TBI control (TBICON ) */ ENET_TBI_MII_TBICON = 0x11 /* TBI control (TBICON ) */
} enet_tbi_mii_reg_e; };
/* UCC GETH 82xx Ethernet Address Recognition Location */ /* UCC GETH 82xx Ethernet Address Recognition Location */
typedef enum ucc_geth_enet_address_recognition_location { enum ucc_geth_enet_address_recognition_location {
UCC_GETH_ENET_ADDRESS_RECOGNITION_LOCATION_STATION_ADDRESS,/* station UCC_GETH_ENET_ADDRESS_RECOGNITION_LOCATION_STATION_ADDRESS,/* station
address */ address */
UCC_GETH_ENET_ADDRESS_RECOGNITION_LOCATION_PADDR_FIRST, /* additional UCC_GETH_ENET_ADDRESS_RECOGNITION_LOCATION_PADDR_FIRST, /* additional
...@@ -1065,10 +1065,10 @@ typedef enum ucc_geth_enet_address_recognition_location { ...@@ -1065,10 +1065,10 @@ typedef enum ucc_geth_enet_address_recognition_location {
UCC_GETH_ENET_ADDRESS_RECOGNITION_LOCATION_GROUP_HASH, /* group hash */ UCC_GETH_ENET_ADDRESS_RECOGNITION_LOCATION_GROUP_HASH, /* group hash */
UCC_GETH_ENET_ADDRESS_RECOGNITION_LOCATION_INDIVIDUAL_HASH /* individual UCC_GETH_ENET_ADDRESS_RECOGNITION_LOCATION_INDIVIDUAL_HASH /* individual
hash */ hash */
} ucc_geth_enet_address_recognition_location_e; };
/* UCC GETH vlan operation tagged */ /* UCC GETH vlan operation tagged */
typedef enum ucc_geth_vlan_operation_tagged { enum ucc_geth_vlan_operation_tagged {
UCC_GETH_VLAN_OPERATION_TAGGED_NOP = 0x0, /* Tagged - nop */ UCC_GETH_VLAN_OPERATION_TAGGED_NOP = 0x0, /* Tagged - nop */
UCC_GETH_VLAN_OPERATION_TAGGED_REPLACE_VID_PORTION_OF_Q_TAG UCC_GETH_VLAN_OPERATION_TAGGED_REPLACE_VID_PORTION_OF_Q_TAG
= 0x1, /* Tagged - replace vid portion of q tag */ = 0x1, /* Tagged - replace vid portion of q tag */
...@@ -1076,18 +1076,18 @@ typedef enum ucc_geth_vlan_operation_tagged { ...@@ -1076,18 +1076,18 @@ typedef enum ucc_geth_vlan_operation_tagged {
= 0x2, /* Tagged - if vid0 replace vid with default value */ = 0x2, /* Tagged - if vid0 replace vid with default value */
UCC_GETH_VLAN_OPERATION_TAGGED_EXTRACT_Q_TAG_FROM_FRAME UCC_GETH_VLAN_OPERATION_TAGGED_EXTRACT_Q_TAG_FROM_FRAME
= 0x3 /* Tagged - extract q tag from frame */ = 0x3 /* Tagged - extract q tag from frame */
} ucc_geth_vlan_operation_tagged_e; };
/* UCC GETH vlan operation non-tagged */ /* UCC GETH vlan operation non-tagged */
typedef enum ucc_geth_vlan_operation_non_tagged { enum ucc_geth_vlan_operation_non_tagged {
UCC_GETH_VLAN_OPERATION_NON_TAGGED_NOP = 0x0, /* Non tagged - nop */ UCC_GETH_VLAN_OPERATION_NON_TAGGED_NOP = 0x0, /* Non tagged - nop */
UCC_GETH_VLAN_OPERATION_NON_TAGGED_Q_TAG_INSERT = 0x1 /* Non tagged - UCC_GETH_VLAN_OPERATION_NON_TAGGED_Q_TAG_INSERT = 0x1 /* Non tagged -
q tag insert q tag insert
*/ */
} ucc_geth_vlan_operation_non_tagged_e; };
/* UCC GETH Rx Quality of Service Mode */ /* UCC GETH Rx Quality of Service Mode */
typedef enum ucc_geth_qos_mode { enum ucc_geth_qos_mode {
UCC_GETH_QOS_MODE_DEFAULT = 0x0, /* default queue */ UCC_GETH_QOS_MODE_DEFAULT = 0x0, /* default queue */
UCC_GETH_QOS_MODE_QUEUE_NUM_FROM_L2_CRITERIA = 0x1, /* queue UCC_GETH_QOS_MODE_QUEUE_NUM_FROM_L2_CRITERIA = 0x1, /* queue
determined determined
...@@ -1097,11 +1097,11 @@ typedef enum ucc_geth_qos_mode { ...@@ -1097,11 +1097,11 @@ typedef enum ucc_geth_qos_mode {
determined determined
by L3 by L3
criteria */ criteria */
} ucc_geth_qos_mode_e; };
/* UCC GETH Statistics Gathering Mode - These are bit flags, 'or' them together /* UCC GETH Statistics Gathering Mode - These are bit flags, 'or' them together
for combined functionality */ for combined functionality */
typedef enum ucc_geth_statistics_gathering_mode { enum ucc_geth_statistics_gathering_mode {
UCC_GETH_STATISTICS_GATHERING_MODE_NONE = 0x00000000, /* No UCC_GETH_STATISTICS_GATHERING_MODE_NONE = 0x00000000, /* No
statistics statistics
gathering */ gathering */
...@@ -1122,10 +1122,10 @@ typedef enum ucc_geth_statistics_gathering_mode { ...@@ -1122,10 +1122,10 @@ typedef enum ucc_geth_statistics_gathering_mode {
statistics statistics
gathering gathering
*/ */
} ucc_geth_statistics_gathering_mode_e; };
/* UCC GETH Pad and CRC Mode - Note, Padding without CRC is not possible */ /* UCC GETH Pad and CRC Mode - Note, Padding without CRC is not possible */
typedef enum ucc_geth_maccfg2_pad_and_crc_mode { enum ucc_geth_maccfg2_pad_and_crc_mode {
UCC_GETH_PAD_AND_CRC_MODE_NONE UCC_GETH_PAD_AND_CRC_MODE_NONE
= MACCFG2_PAD_AND_CRC_MODE_NONE, /* Neither Padding = MACCFG2_PAD_AND_CRC_MODE_NONE, /* Neither Padding
short frames short frames
...@@ -1135,61 +1135,59 @@ typedef enum ucc_geth_maccfg2_pad_and_crc_mode { ...@@ -1135,61 +1135,59 @@ typedef enum ucc_geth_maccfg2_pad_and_crc_mode {
CRC only */ CRC only */
UCC_GETH_PAD_AND_CRC_MODE_PAD_AND_CRC = UCC_GETH_PAD_AND_CRC_MODE_PAD_AND_CRC =
MACCFG2_PAD_AND_CRC_MODE_PAD_AND_CRC MACCFG2_PAD_AND_CRC_MODE_PAD_AND_CRC
} ucc_geth_maccfg2_pad_and_crc_mode_e; };
/* UCC GETH upsmr Flow Control Mode */ /* UCC GETH upsmr Flow Control Mode */
typedef enum ucc_geth_flow_control_mode { enum ucc_geth_flow_control_mode {
UPSMR_AUTOMATIC_FLOW_CONTROL_MODE_NONE = 0x00000000, /* No automatic UPSMR_AUTOMATIC_FLOW_CONTROL_MODE_NONE = 0x00000000, /* No automatic
flow control flow control
*/ */
UPSMR_AUTOMATIC_FLOW_CONTROL_MODE_PAUSE_WHEN_EMERGENCY UPSMR_AUTOMATIC_FLOW_CONTROL_MODE_PAUSE_WHEN_EMERGENCY
= 0x00004000 /* Send pause frame when RxFIFO reaches its = 0x00004000 /* Send pause frame when RxFIFO reaches its
emergency threshold */ emergency threshold */
} ucc_geth_flow_control_mode_e; };
/* UCC GETH number of threads */ /* UCC GETH number of threads */
typedef enum ucc_geth_num_of_threads { enum ucc_geth_num_of_threads {
UCC_GETH_NUM_OF_THREADS_1 = 0x1, /* 1 */ UCC_GETH_NUM_OF_THREADS_1 = 0x1, /* 1 */
UCC_GETH_NUM_OF_THREADS_2 = 0x2, /* 2 */ UCC_GETH_NUM_OF_THREADS_2 = 0x2, /* 2 */
UCC_GETH_NUM_OF_THREADS_4 = 0x0, /* 4 */ UCC_GETH_NUM_OF_THREADS_4 = 0x0, /* 4 */
UCC_GETH_NUM_OF_THREADS_6 = 0x3, /* 6 */ UCC_GETH_NUM_OF_THREADS_6 = 0x3, /* 6 */
UCC_GETH_NUM_OF_THREADS_8 = 0x4 /* 8 */ UCC_GETH_NUM_OF_THREADS_8 = 0x4 /* 8 */
} ucc_geth_num_of_threads_e; };
/* UCC GETH number of station addresses */ /* UCC GETH number of station addresses */
typedef enum ucc_geth_num_of_station_addresses { enum ucc_geth_num_of_station_addresses {
UCC_GETH_NUM_OF_STATION_ADDRESSES_1, /* 1 */ UCC_GETH_NUM_OF_STATION_ADDRESSES_1, /* 1 */
UCC_GETH_NUM_OF_STATION_ADDRESSES_5 /* 5 */ UCC_GETH_NUM_OF_STATION_ADDRESSES_5 /* 5 */
} ucc_geth_num_of_station_addresses_e; };
typedef u8 enet_addr_t[ENET_NUM_OCTETS_PER_ADDRESS];
/* UCC GETH 82xx Ethernet Address Container */ /* UCC GETH 82xx Ethernet Address Container */
typedef struct enet_addr_container { struct enet_addr_container {
enet_addr_t address; /* ethernet address */ u8 address[ENET_NUM_OCTETS_PER_ADDRESS]; /* ethernet address */
ucc_geth_enet_address_recognition_location_e location; /* location in enum ucc_geth_enet_address_recognition_location location; /* location in
82xx address 82xx address
recognition recognition
hardware */ hardware */
struct list_head node; struct list_head node;
} enet_addr_container_t; };
#define ENET_ADDR_CONT_ENTRY(ptr) list_entry(ptr, enet_addr_container_t, node) #define ENET_ADDR_CONT_ENTRY(ptr) list_entry(ptr, struct enet_addr_container, node)
/* UCC GETH Termination Action Descriptor (TAD) structure. */ /* UCC GETH Termination Action Descriptor (TAD) structure. */
typedef struct ucc_geth_tad_params { struct ucc_geth_tad_params {
int rx_non_dynamic_extended_features_mode; int rx_non_dynamic_extended_features_mode;
int reject_frame; int reject_frame;
ucc_geth_vlan_operation_tagged_e vtag_op; enum ucc_geth_vlan_operation_tagged vtag_op;
ucc_geth_vlan_operation_non_tagged_e vnontag_op; enum ucc_geth_vlan_operation_non_tagged vnontag_op;
ucc_geth_qos_mode_e rqos; enum ucc_geth_qos_mode rqos;
u8 vpri; u8 vpri;
u16 vid; u16 vid;
} ucc_geth_tad_params_t; };
/* GETH protocol initialization structure */ /* GETH protocol initialization structure */
typedef struct ucc_geth_info { struct ucc_geth_info {
ucc_fast_info_t uf_info; struct ucc_fast_info uf_info;
u8 numQueuesTx; u8 numQueuesTx;
u8 numQueuesRx; u8 numQueuesRx;
int ipCheckSumCheck; int ipCheckSumCheck;
...@@ -1251,51 +1249,51 @@ typedef struct ucc_geth_info { ...@@ -1251,51 +1249,51 @@ typedef struct ucc_geth_info {
u8 iphoffset[TX_IP_OFFSET_ENTRY_MAX]; u8 iphoffset[TX_IP_OFFSET_ENTRY_MAX];
u16 bdRingLenTx[NUM_TX_QUEUES]; u16 bdRingLenTx[NUM_TX_QUEUES];
u16 bdRingLenRx[NUM_RX_QUEUES]; u16 bdRingLenRx[NUM_RX_QUEUES];
enet_interface_e enet_interface; enum enet_interface enet_interface;
ucc_geth_num_of_station_addresses_e numStationAddresses; enum ucc_geth_num_of_station_addresses numStationAddresses;
qe_fltr_largest_external_tbl_lookup_key_size_e enum qe_fltr_largest_external_tbl_lookup_key_size
largestexternallookupkeysize; largestexternallookupkeysize;
ucc_geth_statistics_gathering_mode_e statisticsMode; enum ucc_geth_statistics_gathering_mode statisticsMode;
ucc_geth_vlan_operation_tagged_e vlanOperationTagged; enum ucc_geth_vlan_operation_tagged vlanOperationTagged;
ucc_geth_vlan_operation_non_tagged_e vlanOperationNonTagged; enum ucc_geth_vlan_operation_non_tagged vlanOperationNonTagged;
ucc_geth_qos_mode_e rxQoSMode; enum ucc_geth_qos_mode rxQoSMode;
ucc_geth_flow_control_mode_e aufc; enum ucc_geth_flow_control_mode aufc;
ucc_geth_maccfg2_pad_and_crc_mode_e padAndCrc; enum ucc_geth_maccfg2_pad_and_crc_mode padAndCrc;
ucc_geth_num_of_threads_e numThreadsTx; enum ucc_geth_num_of_threads numThreadsTx;
ucc_geth_num_of_threads_e numThreadsRx; enum ucc_geth_num_of_threads numThreadsRx;
qe_risc_allocation_e riscTx; enum qe_risc_allocation riscTx;
qe_risc_allocation_e riscRx; enum qe_risc_allocation riscRx;
} ucc_geth_info_t; };
/* structure representing UCC GETH */ /* structure representing UCC GETH */
typedef struct ucc_geth_private { struct ucc_geth_private {
ucc_geth_info_t *ug_info; struct ucc_geth_info *ug_info;
ucc_fast_private_t *uccf; struct ucc_fast_private *uccf;
struct net_device *dev; struct net_device *dev;
struct net_device_stats stats; /* linux network statistics */ struct net_device_stats stats; /* linux network statistics */
ucc_geth_t *ug_regs; struct ucc_geth *ug_regs;
ucc_geth_init_pram_t *p_init_enet_param_shadow; struct ucc_geth_init_pram *p_init_enet_param_shadow;
ucc_geth_exf_global_pram_t *p_exf_glbl_param; struct ucc_geth_exf_global_pram *p_exf_glbl_param;
u32 exf_glbl_param_offset; u32 exf_glbl_param_offset;
ucc_geth_rx_global_pram_t *p_rx_glbl_pram; struct ucc_geth_rx_global_pram *p_rx_glbl_pram;
u32 rx_glbl_pram_offset; u32 rx_glbl_pram_offset;
ucc_geth_tx_global_pram_t *p_tx_glbl_pram; struct ucc_geth_tx_global_pram *p_tx_glbl_pram;
u32 tx_glbl_pram_offset; u32 tx_glbl_pram_offset;
ucc_geth_send_queue_mem_region_t *p_send_q_mem_reg; struct ucc_geth_send_queue_mem_region *p_send_q_mem_reg;
u32 send_q_mem_reg_offset; u32 send_q_mem_reg_offset;
ucc_geth_thread_data_tx_t *p_thread_data_tx; struct ucc_geth_thread_data_tx *p_thread_data_tx;
u32 thread_dat_tx_offset; u32 thread_dat_tx_offset;
ucc_geth_thread_data_rx_t *p_thread_data_rx; struct ucc_geth_thread_data_rx *p_thread_data_rx;
u32 thread_dat_rx_offset; u32 thread_dat_rx_offset;
ucc_geth_scheduler_t *p_scheduler; struct ucc_geth_scheduler *p_scheduler;
u32 scheduler_offset; u32 scheduler_offset;
ucc_geth_tx_firmware_statistics_pram_t *p_tx_fw_statistics_pram; struct ucc_geth_tx_firmware_statistics_pram *p_tx_fw_statistics_pram;
u32 tx_fw_statistics_pram_offset; u32 tx_fw_statistics_pram_offset;
ucc_geth_rx_firmware_statistics_pram_t *p_rx_fw_statistics_pram; struct ucc_geth_rx_firmware_statistics_pram *p_rx_fw_statistics_pram;
u32 rx_fw_statistics_pram_offset; u32 rx_fw_statistics_pram_offset;
ucc_geth_rx_interrupt_coalescing_table_t *p_rx_irq_coalescing_tbl; struct ucc_geth_rx_interrupt_coalescing_table *p_rx_irq_coalescing_tbl;
u32 rx_irq_coalescing_tbl_offset; u32 rx_irq_coalescing_tbl_offset;
ucc_geth_rx_bd_queues_entry_t *p_rx_bd_qs_tbl; struct ucc_geth_rx_bd_queues_entry *p_rx_bd_qs_tbl;
u32 rx_bd_qs_tbl_offset; u32 rx_bd_qs_tbl_offset;
u8 *p_tx_bd_ring[NUM_TX_QUEUES]; u8 *p_tx_bd_ring[NUM_TX_QUEUES];
u32 tx_bd_ring_offset[NUM_TX_QUEUES]; u32 tx_bd_ring_offset[NUM_TX_QUEUES];
...@@ -1308,7 +1306,7 @@ typedef struct ucc_geth_private { ...@@ -1308,7 +1306,7 @@ typedef struct ucc_geth_private {
u16 cpucount[NUM_TX_QUEUES]; u16 cpucount[NUM_TX_QUEUES];
volatile u16 *p_cpucount[NUM_TX_QUEUES]; volatile u16 *p_cpucount[NUM_TX_QUEUES];
int indAddrRegUsed[NUM_OF_PADDRS]; int indAddrRegUsed[NUM_OF_PADDRS];
enet_addr_t paddr[NUM_OF_PADDRS]; u8 paddr[NUM_OF_PADDRS][ENET_NUM_OCTETS_PER_ADDRESS]; /* ethernet address */
u8 numGroupAddrInHash; u8 numGroupAddrInHash;
u8 numIndAddrInHash; u8 numIndAddrInHash;
u8 numIndAddrInReg; u8 numIndAddrInReg;
...@@ -1334,6 +1332,6 @@ typedef struct ucc_geth_private { ...@@ -1334,6 +1332,6 @@ typedef struct ucc_geth_private {
int oldspeed; int oldspeed;
int oldduplex; int oldduplex;
int oldlink; int oldlink;
} ucc_geth_private_t; };
#endif /* __UCC_GETH_H__ */ #endif /* __UCC_GETH_H__ */
drivers/net/ucc_geth_phy.c
View file @ 18a8e864
...@@ -42,7 +42,6 @@ ...@@ -42,7 +42,6 @@
#include "ucc_geth.h" #include "ucc_geth.h"
#include "ucc_geth_phy.h" #include "ucc_geth_phy.h"
#include <platforms/83xx/mpc8360e_pb.h>
#define ugphy_printk(level, format, arg...) \ #define ugphy_printk(level, format, arg...) \
printk(level format "\n", ## arg) printk(level format "\n", ## arg)
...@@ -72,16 +71,14 @@ static int genmii_read_status(struct ugeth_mii_info *mii_info); ...@@ -72,16 +71,14 @@ static int genmii_read_status(struct ugeth_mii_info *mii_info);
u16 phy_read(struct ugeth_mii_info *mii_info, u16 regnum); u16 phy_read(struct ugeth_mii_info *mii_info, u16 regnum);
void phy_write(struct ugeth_mii_info *mii_info, u16 regnum, u16 val); void phy_write(struct ugeth_mii_info *mii_info, u16 regnum, u16 val);
static u8 *bcsr_regs = NULL;
/* Write value to the PHY for this device to the register at regnum, */ /* Write value to the PHY for this device to the register at regnum, */
/* waiting until the write is done before it returns. All PHY */ /* waiting until the write is done before it returns. All PHY */
/* configuration has to be done through the TSEC1 MIIM regs */ /* configuration has to be done through the TSEC1 MIIM regs */
void write_phy_reg(struct net_device *dev, int mii_id, int regnum, int value) void write_phy_reg(struct net_device *dev, int mii_id, int regnum, int value)
{ {
ucc_geth_private_t *ugeth = netdev_priv(dev); struct ucc_geth_private *ugeth = netdev_priv(dev);
ucc_mii_mng_t *mii_regs; struct ucc_mii_mng *mii_regs;
enet_tbi_mii_reg_e mii_reg = (enet_tbi_mii_reg_e) regnum; enum enet_tbi_mii_reg mii_reg = (enum enet_tbi_mii_reg) regnum;
u32 tmp_reg; u32 tmp_reg;
ugphy_vdbg("%s: IN", __FUNCTION__); ugphy_vdbg("%s: IN", __FUNCTION__);
...@@ -116,9 +113,9 @@ void write_phy_reg(struct net_device *dev, int mii_id, int regnum, int value) ...@@ -116,9 +113,9 @@ void write_phy_reg(struct net_device *dev, int mii_id, int regnum, int value)
/* configuration has to be done through the TSEC1 MIIM regs */ /* configuration has to be done through the TSEC1 MIIM regs */
int read_phy_reg(struct net_device *dev, int mii_id, int regnum) int read_phy_reg(struct net_device *dev, int mii_id, int regnum)
{ {
ucc_geth_private_t *ugeth = netdev_priv(dev); struct ucc_geth_private *ugeth = netdev_priv(dev);
ucc_mii_mng_t *mii_regs; struct ucc_mii_mng *mii_regs;
enet_tbi_mii_reg_e mii_reg = (enet_tbi_mii_reg_e) regnum; enum enet_tbi_mii_reg mii_reg = (enum enet_tbi_mii_reg) regnum;
u32 tmp_reg; u32 tmp_reg;
u16 value; u16 value;
...@@ -634,11 +631,6 @@ static void dm9161_close(struct ugeth_mii_info *mii_info) ...@@ -634,11 +631,6 @@ static void dm9161_close(struct ugeth_mii_info *mii_info)
static int dm9161_ack_interrupt(struct ugeth_mii_info *mii_info) static int dm9161_ack_interrupt(struct ugeth_mii_info *mii_info)
{ {
/* FIXME: This lines are for BUG fixing in the mpc8325.
Remove this from here when it's fixed */
if (bcsr_regs == NULL)
bcsr_regs = (u8 *) ioremap(BCSR_PHYS_ADDR, BCSR_SIZE);
bcsr_regs[14] |= 0x40;
ugphy_vdbg("%s: IN", __FUNCTION__); ugphy_vdbg("%s: IN", __FUNCTION__);
/* Clear the interrupts by reading the reg */ /* Clear the interrupts by reading the reg */
...@@ -650,12 +642,6 @@ Remove this from here when it's fixed */ ...@@ -650,12 +642,6 @@ Remove this from here when it's fixed */
static int dm9161_config_intr(struct ugeth_mii_info *mii_info) static int dm9161_config_intr(struct ugeth_mii_info *mii_info)
{ {
/* FIXME: This lines are for BUG fixing in the mpc8325.
Remove this from here when it's fixed */
if (bcsr_regs == NULL) {
bcsr_regs = (u8 *) ioremap(BCSR_PHYS_ADDR, BCSR_SIZE);
bcsr_regs[14] &= ~0x40;
}
ugphy_vdbg("%s: IN", __FUNCTION__); ugphy_vdbg("%s: IN", __FUNCTION__);
if (mii_info->interrupts == MII_INTERRUPT_ENABLED) if (mii_info->interrupts == MII_INTERRUPT_ENABLED)
......
drivers/net/ucc_geth_phy.h
View file @ 18a8e864
...@@ -126,7 +126,7 @@ struct ugeth_mii_info { ...@@ -126,7 +126,7 @@ struct ugeth_mii_info {
/* And management functions */ /* And management functions */
struct phy_info *phyinfo; struct phy_info *phyinfo;
ucc_mii_mng_t *mii_regs; struct ucc_mii_mng *mii_regs;
/* forced speed & duplex (no autoneg) /* forced speed & duplex (no autoneg)
* partner speed & duplex & pause (autoneg) * partner speed & duplex & pause (autoneg)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment