On Fri, Oct 21, 2011 at 6:28 PM, <keguang.zhang@xxxxxxxxx> wrote:
> From: Kelvin Cheung <keguang.zhang@xxxxxxxxx>
>
> This patch adds basic platform support for Loongson1B
> including serial port, ethernet, and interrupt handler.
>
> Loongson1B UART is compatible with NS16550A.
> Loongson1B GMAC is built around Synopsys IP Core.
>
Perhaps you'd better split out the GMAC support to its own patch and
send it to the net/ maintainer and the authors of the original files.
> diff --git a/drivers/net/stmmac/descs.h b/drivers/net/stmmac/descs.h
> index 63a03e2..4db27d0 100644
> --- a/drivers/net/stmmac/descs.h
> +++ b/drivers/net/stmmac/descs.h
> @@ -53,6 +53,38 @@ struct dma_desc {
> u32 reserved3:5;
> u32 disable_ic:1;
> } rx;
> +#ifdef CONFIG_MACH_LOONGSON1
> + struct {
> + /* RDES0 */
> + u32 payload_csum_error:1;
> + u32 crc_error:1;
> + u32 dribbling:1;
> + u32 error_gmii:1;
> + u32 receive_watchdog:1;
> + u32 frame_type:1;
> + u32 late_collision:1;
> + u32 ipc_csum_error:1;
> + u32 last_descriptor:1;
> + u32 first_descriptor:1;
> + u32 vlan_tag:1;
> + u32 overflow_error:1;
> + u32 length_error:1;
> + u32 sa_filter_fail:1;
> + u32 descriptor_error:1;
> + u32 error_summary:1;
> + u32 frame_length:14;
> + u32 da_filter_fail:1;
> + u32 own:1;
> + /* RDES1 */
> + u32 buffer1_size:11;
> + u32 buffer2_size:11;
> + u32 reserved1:2;
> + u32 second_address_chained:1;
> + u32 end_ring:1;
> + u32 reserved2:5;
> + u32 disable_ic:1;
> + } erx; /* -- enhanced -- */
> +#else
> struct {
> /* RDES0 */
> u32 payload_csum_error:1;
> @@ -83,6 +115,7 @@ struct dma_desc {
> u32 reserved2:2;
> u32 disable_ic:1;
> } erx; /* -- enhanced -- */
> +#endif
>
> /* Transmit descriptor */
> struct {
> @@ -113,6 +146,40 @@ struct dma_desc {
> u32 last_segment:1;
> u32 interrupt:1;
> } tx;
> +#ifdef CONFIG_MACH_LOONGSON1
> + struct {
> + /* TDES0 */
> + u32 deferred:1;
> + u32 underflow_error:1;
> + u32 excessive_deferral:1;
> + u32 collision_count:4;
> + u32 vlan_frame:1;
> + u32 excessive_collisions:1;
> + u32 late_collision:1;
> + u32 no_carrier:1;
> + u32 loss_carrier:1;
> + u32 payload_error:1;
> + u32 frame_flushed:1;
> + u32 jabber_timeout:1;
> + u32 error_summary:1;
> + u32 ip_header_error:1;
> + u32 time_stamp_status:1;
> + u32 reserved1:13;
> + u32 own:1;
> + /* TDES1 */
> + u32 buffer1_size:11;
> + u32 buffer2_size:11;
> + u32 time_stamp_enable:1;
> + u32 disable_padding:1;
> + u32 second_address_chained:1;
> + u32 end_ring:1;
> + u32 crc_disable:1;
> + u32 checksum_insertion:2;
> + u32 first_segment:1;
> + u32 last_segment:1;
> + u32 interrupt:1;
> + } etx; /* -- enhanced -- */
> +#else
> struct {
> /* TDES0 */
> u32 deferred:1;
> @@ -148,6 +215,7 @@ struct dma_desc {
> u32 buffer2_size:13;
> u32 reserved4:3;
> } etx; /* -- enhanced -- */
> +#endif
> } des01;
> unsigned int des2;
> unsigned int des3;
If the difference is very much, perhaps a new dma_desc struct can be
defined instead.
> diff --git a/drivers/net/stmmac/enh_desc.c b/drivers/net/stmmac/enh_desc.c
> index e5dfb6a..3b5e4f1 100644
> --- a/drivers/net/stmmac/enh_desc.c
> +++ b/drivers/net/stmmac/enh_desc.c
> @@ -108,6 +108,7 @@ static int enh_desc_get_tx_len(struct dma_desc *p)
> static int enh_desc_coe_rdes0(int ipc_err, int type, int payload_err)
> {
> int ret = good_frame;
> +#ifndef CONFIG_MACH_LOONGSON1
> u32 status = (type << 2 | ipc_err << 1 | payload_err) & 0x7;
>
> /* bits 5 7 0 | Frame status
> @@ -145,6 +146,7 @@ static int enh_desc_coe_rdes0(int ipc_err, int type, int payload_err)
> CHIP_DBG(KERN_ERR "RX Des0 status: No IPv4, IPv6 frame.\n");
> ret = discard_frame;
> }
> +#endif
> return ret;
> }
>
> @@ -232,9 +234,17 @@ static void enh_desc_init_rx_desc(struct dma_desc *p, unsigned int ring_size,
> int i;
> for (i = 0; i < ring_size; i++) {
> p->des01.erx.own = 1;
> +#ifdef CONFIG_MACH_LOONGSON1
> + p->des01.erx.buffer1_size = BUF_SIZE_2KiB - 1;
> +#else
> p->des01.erx.buffer1_size = BUF_SIZE_8KiB - 1;
> +#endif
> /* To support jumbo frames */
> +#ifdef CONFIG_MACH_LOONGSON1
> + p->des01.erx.buffer2_size = BUF_SIZE_2KiB - 1;
> +#else
> p->des01.erx.buffer2_size = BUF_SIZE_8KiB - 1;
> +#endif
> if (i == ring_size - 1)
> p->des01.erx.end_ring = 1;
> if (disable_rx_ic)
> @@ -292,9 +302,15 @@ static void enh_desc_prepare_tx_desc(struct dma_desc *p, int is_fs, int len,
> int csum_flag)
> {
> p->des01.etx.first_segment = is_fs;
> +#ifdef CONFIG_MACH_LOONGSON1
> + if (unlikely(len > BUF_SIZE_2KiB)) {
> + p->des01.etx.buffer1_size = BUF_SIZE_2KiB - 1;
> + p->des01.etx.buffer2_size = len - BUF_SIZE_2KiB + 1;
> +#else
> if (unlikely(len > BUF_SIZE_4KiB)) {
> p->des01.etx.buffer1_size = BUF_SIZE_4KiB;
> p->des01.etx.buffer2_size = len - BUF_SIZE_4KiB;
> +#endif
> } else {
> p->des01.etx.buffer1_size = len;
> }
Is it possible to add two new macros RX_BUF_SIZE and TX_BUF_SIZE to .h
instead? which may reduce code duplication.
Regards,
Wu Zhangjin
> --
> 1.7.1
>
>
