* [PATCH 0/3] TI EMAC driver : Make driver re-usable on non-davinci platforms.
@ 2009-11-18 9:42 Sriramakrishnan
2009-11-18 9:42 ` [PATCH 1/3] TI Davinci EMAC : Re-use driver for other platforms Sriramakrishnan
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Sriramakrishnan @ 2009-11-18 9:42 UTC (permalink / raw)
To: netdev; +Cc: davinci-linux-open-source, Sriramakrishnan
The Davinci EMAC peripheral is also available on other TI platforms -
notably TI AM3517 SoC. The following series of patches modify the driver
suitably to make it platform agnostic.
Sriramakrishnan (3):
TI Davinci EMAC : Re-use driver for other platforms.
TI Davinci EMAC : add platform specific interrupt enable/disable
logic.
TI Davinci EMAC : Abstract Buffer address translation logic.
arch/arm/mach-davinci/board-dm644x-evm.c | 2 +-
arch/arm/mach-davinci/board-dm646x-evm.c | 2 +-
arch/arm/mach-davinci/common.c | 2 +-
arch/arm/mach-davinci/include/mach/da8xx.h | 2 +-
arch/arm/mach-davinci/include/mach/dm365.h | 2 +-
arch/arm/mach-davinci/include/mach/dm644x.h | 2 +-
arch/arm/mach-davinci/include/mach/dm646x.h | 2 +-
arch/arm/mach-davinci/include/mach/emac.h | 36 -----------------
drivers/net/Kconfig | 2 +-
drivers/net/davinci_emac.c | 55 +++++++++++++++++---------
include/linux/davinci_emac.h | 39 +++++++++++++++++++
11 files changed, 83 insertions(+), 63 deletions(-)
delete mode 100644 arch/arm/mach-davinci/include/mach/emac.h
create mode 100644 include/linux/davinci_emac.h
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 1/3] TI Davinci EMAC : Re-use driver for other platforms. 2009-11-18 9:42 [PATCH 0/3] TI EMAC driver : Make driver re-usable on non-davinci platforms Sriramakrishnan @ 2009-11-18 9:42 ` Sriramakrishnan 2009-11-18 9:42 ` [PATCH 2/3] TI Davinci EMAC : add platform specific interrupt enable/disable logic Sriramakrishnan 2009-11-18 13:12 ` [PATCH 0/3] TI EMAC driver : Make driver re-usable on non-davinci platforms David Miller 2009-11-18 17:53 ` Kevin Hilman 2 siblings, 1 reply; 9+ messages in thread From: Sriramakrishnan @ 2009-11-18 9:42 UTC (permalink / raw) To: netdev; +Cc: davinci-linux-open-source, Sriramakrishnan The davinci EMAC peripheral is also available on other TI platforms -notably TI AM3517 SoC. This patch modifies the config option and the platform structure header files so that the driver can be reused on non-davinci platforms as well. Signed-off-by: Sriramakrishnan <srk@ti.com> Acked-by: Chaithrika U S <chaithrika@ti.com> --- arch/arm/mach-davinci/board-dm644x-evm.c | 2 +- arch/arm/mach-davinci/board-dm646x-evm.c | 2 +- arch/arm/mach-davinci/common.c | 2 +- arch/arm/mach-davinci/include/mach/da8xx.h | 2 +- arch/arm/mach-davinci/include/mach/dm365.h | 2 +- arch/arm/mach-davinci/include/mach/dm644x.h | 2 +- arch/arm/mach-davinci/include/mach/dm646x.h | 2 +- arch/arm/mach-davinci/include/mach/emac.h | 36 --------------------------- drivers/net/Kconfig | 2 +- drivers/net/davinci_emac.c | 3 +- include/linux/davinci_emac.h | 36 +++++++++++++++++++++++++++ 11 files changed, 45 insertions(+), 46 deletions(-) delete mode 100644 arch/arm/mach-davinci/include/mach/emac.h create mode 100644 include/linux/davinci_emac.h diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c index 1213a00..e930281 100644 --- a/arch/arm/mach-davinci/board-dm644x-evm.c +++ b/arch/arm/mach-davinci/board-dm644x-evm.c @@ -29,6 +29,7 @@ #include <linux/phy.h> #include <linux/clk.h> #include <linux/videodev2.h> +#include <linux/davinci_emac.h> #include <media/tvp514x.h> @@ -47,7 +48,6 @@ #include <mach/psc.h> #include <mach/nand.h> #include <mach/mmc.h> -#include <mach/emac.h> #define DM644X_EVM_PHY_MASK (0x2) #define DM644X_EVM_MDIO_FREQUENCY (2200000) /* PHY bus frequency */ diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c index 24e0e13..6f9fe36 100644 --- a/arch/arm/mach-davinci/board-dm646x-evm.c +++ b/arch/arm/mach-davinci/board-dm646x-evm.c @@ -33,6 +33,7 @@ #include <linux/i2c/at24.h> #include <linux/i2c/pcf857x.h> #include <linux/etherdevice.h> +#include <linux/davinci_emac.h> #include <media/tvp514x.h> @@ -48,7 +49,6 @@ #include <mach/serial.h> #include <mach/i2c.h> #include <mach/mmc.h> -#include <mach/emac.h> #if defined(CONFIG_BLK_DEV_PALMCHIP_BK3710) || \ defined(CONFIG_BLK_DEV_PALMCHIP_BK3710_MODULE) diff --git a/arch/arm/mach-davinci/common.c b/arch/arm/mach-davinci/common.c index 61ede19..d62398b 100644 --- a/arch/arm/mach-davinci/common.c +++ b/arch/arm/mach-davinci/common.c @@ -11,13 +11,13 @@ #include <linux/module.h> #include <linux/io.h> #include <linux/etherdevice.h> +#include <linux/davinci_emac.h> #include <asm/tlb.h> #include <asm/mach/map.h> #include <mach/common.h> #include <mach/cputype.h> -#include <mach/emac.h> #include "clock.h" diff --git a/arch/arm/mach-davinci/include/mach/da8xx.h b/arch/arm/mach-davinci/include/mach/da8xx.h index d4095d0..f056178 100644 --- a/arch/arm/mach-davinci/include/mach/da8xx.h +++ b/arch/arm/mach-davinci/include/mach/da8xx.h @@ -11,10 +11,10 @@ #ifndef __ASM_ARCH_DAVINCI_DA8XX_H #define __ASM_ARCH_DAVINCI_DA8XX_H +#include <linux/davinci_emac.h> #include <mach/serial.h> #include <mach/edma.h> #include <mach/i2c.h> -#include <mach/emac.h> #include <mach/asp.h> #include <mach/mmc.h> diff --git a/arch/arm/mach-davinci/include/mach/dm365.h b/arch/arm/mach-davinci/include/mach/dm365.h index 09db434..f2e34d8 100644 --- a/arch/arm/mach-davinci/include/mach/dm365.h +++ b/arch/arm/mach-davinci/include/mach/dm365.h @@ -14,8 +14,8 @@ #define __ASM_ARCH_DM665_H #include <linux/platform_device.h> +#include <linux/davinci_emac.h> #include <mach/hardware.h> -#include <mach/emac.h> #define DM365_EMAC_BASE (0x01D07000) #define DM365_EMAC_CNTRL_OFFSET (0x0000) diff --git a/arch/arm/mach-davinci/include/mach/dm644x.h b/arch/arm/mach-davinci/include/mach/dm644x.h index 0efb738..dad3622 100644 --- a/arch/arm/mach-davinci/include/mach/dm644x.h +++ b/arch/arm/mach-davinci/include/mach/dm644x.h @@ -23,8 +23,8 @@ #define __ASM_ARCH_DM644X_H #include <linux/platform_device.h> +#include <linux/davinci_emac.h> #include <mach/hardware.h> -#include <mach/emac.h> #include <mach/asp.h> #include <media/davinci/vpfe_capture.h> diff --git a/arch/arm/mach-davinci/include/mach/dm646x.h b/arch/arm/mach-davinci/include/mach/dm646x.h index 8cec746..5c92dfb 100644 --- a/arch/arm/mach-davinci/include/mach/dm646x.h +++ b/arch/arm/mach-davinci/include/mach/dm646x.h @@ -12,10 +12,10 @@ #define __ASM_ARCH_DM646X_H #include <mach/hardware.h> -#include <mach/emac.h> #include <mach/asp.h> #include <linux/i2c.h> #include <linux/videodev2.h> +#include <linux/davinci_emac.h> #define DM646X_EMAC_BASE (0x01C80000) #define DM646X_EMAC_CNTRL_OFFSET (0x0000) diff --git a/arch/arm/mach-davinci/include/mach/emac.h b/arch/arm/mach-davinci/include/mach/emac.h deleted file mode 100644 index beff4fb..0000000 --- a/arch/arm/mach-davinci/include/mach/emac.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * TI DaVinci EMAC platform support - * - * Author: Kevin Hilman, Deep Root Systems, LLC - * - * 2007 (c) Deep Root Systems, LLC. This file is licensed under - * the terms of the GNU General Public License version 2. This program - * is licensed "as is" without any warranty of any kind, whether express - * or implied. - */ -#ifndef _MACH_DAVINCI_EMAC_H -#define _MACH_DAVINCI_EMAC_H - -#include <linux/if_ether.h> -#include <linux/memory.h> - -struct emac_platform_data { - char mac_addr[ETH_ALEN]; - u32 ctrl_reg_offset; - u32 ctrl_mod_reg_offset; - u32 ctrl_ram_offset; - u32 mdio_reg_offset; - u32 ctrl_ram_size; - u32 phy_mask; - u32 mdio_max_freq; - u8 rmii_en; - u8 version; -}; - -enum { - EMAC_VERSION_1, /* DM644x */ - EMAC_VERSION_2, /* DM646x */ -}; - -void davinci_get_mac_addr(struct memory_accessor *mem_acc, void *context); -#endif diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index e19ca4b..2d3443c 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -920,7 +920,7 @@ config NET_NETX config TI_DAVINCI_EMAC tristate "TI DaVinci EMAC Support" - depends on ARM && ARCH_DAVINCI + depends on ARM && ( ARCH_DAVINCI || ARCH_OMAP3 ) select PHYLIB help This driver supports TI's DaVinci Ethernet . diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c index 4cf80ec..6aec8f5 100644 --- a/drivers/net/davinci_emac.c +++ b/drivers/net/davinci_emac.c @@ -62,12 +62,11 @@ #include <linux/bitops.h> #include <linux/io.h> #include <linux/uaccess.h> +#include <linux/davinci_emac.h> #include <asm/irq.h> #include <asm/page.h> -#include <mach/emac.h> - static int debug_level; module_param(debug_level, int, 0); MODULE_PARM_DESC(debug_level, "DaVinci EMAC debug level (NETIF_MSG bits)"); diff --git a/include/linux/davinci_emac.h b/include/linux/davinci_emac.h new file mode 100644 index 0000000..ff55487 --- /dev/null +++ b/include/linux/davinci_emac.h @@ -0,0 +1,36 @@ +/* + * TI DaVinci EMAC platform support + * + * Author: Kevin Hilman, Deep Root Systems, LLC + * + * 2007 (c) Deep Root Systems, LLC. This file is licensed under + * the terms of the GNU General Public License version 2. This program + * is licensed "as is" without any warranty of any kind, whether express + * or implied. + */ +#ifndef _LINUX_DAVINCI_EMAC_H +#define _LINUX_DAVINCI_EMAC_H + +#include <linux/if_ether.h> +#include <linux/memory.h> + +struct emac_platform_data { + char mac_addr[ETH_ALEN]; + u32 ctrl_reg_offset; + u32 ctrl_mod_reg_offset; + u32 ctrl_ram_offset; + u32 mdio_reg_offset; + u32 ctrl_ram_size; + u32 phy_mask; + u32 mdio_max_freq; + u8 rmii_en; + u8 version; +}; + +enum { + EMAC_VERSION_1, /* DM644x */ + EMAC_VERSION_2, /* DM646x */ +}; + +void davinci_get_mac_addr(struct memory_accessor *mem_acc, void *context); +#endif -- 1.6.2.4 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/3] TI Davinci EMAC : add platform specific interrupt enable/disable logic. 2009-11-18 9:42 ` [PATCH 1/3] TI Davinci EMAC : Re-use driver for other platforms Sriramakrishnan @ 2009-11-18 9:42 ` Sriramakrishnan 2009-11-18 9:42 ` [PATCH 3/3] TI Davinci EMAC : Abstract Buffer address translation logic Sriramakrishnan [not found] ` <1258537328-31527-3-git-send-email-srk-l0cyMroinI0@public.gmane.org> 0 siblings, 2 replies; 9+ messages in thread From: Sriramakrishnan @ 2009-11-18 9:42 UTC (permalink / raw) To: netdev; +Cc: davinci-linux-open-source, Sriramakrishnan On certain SOCs, the EMAC controller is interfaced with a wrapper logic for handling interrupts. This patch implements a platform specific hook to cater to platforms that require custom interrupt handling logic Signed-off-by: Sriramakrishnan <srk@ti.com> Acked-by: Chaithrika U S <chaithrika@ti.com> --- drivers/net/davinci_emac.c | 11 +++++++++++ include/linux/davinci_emac.h | 2 ++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c index 6aec8f5..81931f8 100644 --- a/drivers/net/davinci_emac.c +++ b/drivers/net/davinci_emac.c @@ -487,6 +487,9 @@ struct emac_priv { struct mii_bus *mii_bus; struct phy_device *phydev; spinlock_t lock; + /*platform specific members*/ + void (*wrapper_int_enable) (void); + void (*wrapper_int_disable) (void); }; /* clock frequency for EMAC */ @@ -1001,6 +1004,8 @@ static void emac_int_disable(struct emac_priv *priv) emac_ctrl_write(EMAC_DM646X_CMRXINTEN, 0x0); emac_ctrl_write(EMAC_DM646X_CMTXINTEN, 0x0); /* NOTE: Rx Threshold and Misc interrupts are not disabled */ + if (priv->wrapper_int_disable) + priv->wrapper_int_disable(); local_irq_restore(flags); @@ -1020,6 +1025,9 @@ static void emac_int_disable(struct emac_priv *priv) static void emac_int_enable(struct emac_priv *priv) { if (priv->version == EMAC_VERSION_2) { + if (priv->wrapper_int_enable) + priv->wrapper_int_enable(); + emac_ctrl_write(EMAC_DM646X_CMRXINTEN, 0xff); emac_ctrl_write(EMAC_DM646X_CMTXINTEN, 0xff); @@ -2662,6 +2670,9 @@ static int __devinit davinci_emac_probe(struct platform_device *pdev) priv->phy_mask = pdata->phy_mask; priv->rmii_en = pdata->rmii_en; priv->version = pdata->version; + priv->wrapper_int_enable = pdata->wrapper_interrupt_enable; + priv->wrapper_int_disable = pdata->wrapper_interrupt_disable; + emac_dev = &ndev->dev; /* Get EMAC platform data */ res = platform_get_resource(pdev, IORESOURCE_MEM, 0); diff --git a/include/linux/davinci_emac.h b/include/linux/davinci_emac.h index ff55487..eb24dc0 100644 --- a/include/linux/davinci_emac.h +++ b/include/linux/davinci_emac.h @@ -25,6 +25,8 @@ struct emac_platform_data { u32 mdio_max_freq; u8 rmii_en; u8 version; + void (*wrapper_interrupt_enable) (void); + void (*wrapper_interrupt_disable) (void); }; enum { -- 1.6.2.4 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 3/3] TI Davinci EMAC : Abstract Buffer address translation logic. 2009-11-18 9:42 ` [PATCH 2/3] TI Davinci EMAC : add platform specific interrupt enable/disable logic Sriramakrishnan @ 2009-11-18 9:42 ` Sriramakrishnan 2009-11-18 19:15 ` Troy Kisky [not found] ` <1258537328-31527-3-git-send-email-srk-l0cyMroinI0@public.gmane.org> 1 sibling, 1 reply; 9+ messages in thread From: Sriramakrishnan @ 2009-11-18 9:42 UTC (permalink / raw) To: netdev; +Cc: davinci-linux-open-source, Sriramakrishnan When programming the DMA engine, the next pointers must be programmed with physical address as seen from the DMA master address space. This address may be different from physical address of the buffer RAM area. This patch abstracts the buffer address translation logic. Signed-off-by: Sriramakrishnan <srk@ti.com> Acked-by: Chaithrika U S <chaithrika@ti.com> --- drivers/net/davinci_emac.c | 41 ++++++++++++++++++++++++----------------- include/linux/davinci_emac.h | 1 + 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c index 81931f8..d4e173b 100644 --- a/drivers/net/davinci_emac.c +++ b/drivers/net/davinci_emac.c @@ -464,6 +464,7 @@ struct emac_priv { void __iomem *ctrl_base; void __iomem *emac_ctrl_ram; u32 ctrl_ram_size; + u32 hw_ram_addr; struct emac_txch *txch[EMAC_DEF_MAX_TX_CH]; struct emac_rxch *rxch[EMAC_DEF_MAX_RX_CH]; u32 link; /* 1=link on, 0=link off */ @@ -497,11 +498,9 @@ static struct clk *emac_clk; static unsigned long emac_bus_frequency; static unsigned long mdio_max_freq; -/* EMAC internal utility function */ -static inline u32 emac_virt_to_phys(void __iomem *addr) -{ - return (u32 __force) io_v2p(addr); -} +#define emac_virt_to_phys(addr, priv) \ + (((u32 __force)(addr) - (u32 __force)(priv->emac_ctrl_ram)) \ + + priv->hw_ram_addr) /* Cache macros - Packet buffers would be from skb pool which is cached */ #define EMAC_VIRT_NOCACHE(addr) (addr) @@ -1309,7 +1308,7 @@ static int emac_tx_bdproc(struct emac_priv *priv, u32 ch, u32 budget) curr_bd = txch->active_queue_head; if (NULL == curr_bd) { emac_write(EMAC_TXCP(ch), - emac_virt_to_phys(txch->last_hw_bdprocessed)); + emac_virt_to_phys(txch->last_hw_bdprocessed, priv)); txch->no_active_pkts++; spin_unlock_irqrestore(&priv->tx_lock, flags); return 0; @@ -1319,7 +1318,7 @@ static int emac_tx_bdproc(struct emac_priv *priv, u32 ch, u32 budget) while ((curr_bd) && ((frame_status & EMAC_CPPI_OWNERSHIP_BIT) == 0) && (pkts_processed < budget)) { - emac_write(EMAC_TXCP(ch), emac_virt_to_phys(curr_bd)); + emac_write(EMAC_TXCP(ch), emac_virt_to_phys(curr_bd, priv)); txch->active_queue_head = curr_bd->next; if (frame_status & EMAC_CPPI_EOQ_BIT) { if (curr_bd->next) { /* misqueued packet */ @@ -1406,7 +1405,7 @@ static int emac_send(struct emac_priv *priv, struct emac_netpktobj *pkt, u32 ch) txch->active_queue_tail = curr_bd; if (1 != txch->queue_active) { emac_write(EMAC_TXHDP(ch), - emac_virt_to_phys(curr_bd)); + emac_virt_to_phys(curr_bd, priv)); txch->queue_active = 1; } ++txch->queue_reinit; @@ -1418,10 +1417,11 @@ static int emac_send(struct emac_priv *priv, struct emac_netpktobj *pkt, u32 ch) tail_bd->next = curr_bd; txch->active_queue_tail = curr_bd; tail_bd = EMAC_VIRT_NOCACHE(tail_bd); - tail_bd->h_next = (int)emac_virt_to_phys(curr_bd); + tail_bd->h_next = (int)emac_virt_to_phys(curr_bd, priv); frame_status = tail_bd->mode; if (frame_status & EMAC_CPPI_EOQ_BIT) { - emac_write(EMAC_TXHDP(ch), emac_virt_to_phys(curr_bd)); + emac_write(EMAC_TXHDP(ch), + emac_virt_to_phys(curr_bd, priv)); frame_status &= ~(EMAC_CPPI_EOQ_BIT); tail_bd->mode = frame_status; ++txch->end_of_queue_add; @@ -1611,7 +1611,8 @@ static int emac_init_rxch(struct emac_priv *priv, u32 ch, char *param) } /* populate the hardware descriptor */ - curr_bd->h_next = emac_virt_to_phys(rxch->active_queue_head); + curr_bd->h_next = emac_virt_to_phys(rxch->active_queue_head, + priv); /* FIXME buff_ptr = dma_map_single(... data_ptr ...) */ curr_bd->buff_ptr = virt_to_phys(curr_bd->data_ptr); curr_bd->off_b_len = rxch->buf_size; @@ -1886,7 +1887,7 @@ static void emac_addbd_to_rx_queue(struct emac_priv *priv, u32 ch, rxch->active_queue_tail = curr_bd; if (0 != rxch->queue_active) { emac_write(EMAC_RXHDP(ch), - emac_virt_to_phys(rxch->active_queue_head)); + emac_virt_to_phys(rxch->active_queue_head, priv)); rxch->queue_active = 1; } } else { @@ -1897,11 +1898,11 @@ static void emac_addbd_to_rx_queue(struct emac_priv *priv, u32 ch, rxch->active_queue_tail = curr_bd; tail_bd->next = curr_bd; tail_bd = EMAC_VIRT_NOCACHE(tail_bd); - tail_bd->h_next = emac_virt_to_phys(curr_bd); + tail_bd->h_next = emac_virt_to_phys(curr_bd, priv); frame_status = tail_bd->mode; if (frame_status & EMAC_CPPI_EOQ_BIT) { emac_write(EMAC_RXHDP(ch), - emac_virt_to_phys(curr_bd)); + emac_virt_to_phys(curr_bd, priv)); frame_status &= ~(EMAC_CPPI_EOQ_BIT); tail_bd->mode = frame_status; ++rxch->end_of_queue_add; @@ -1994,7 +1995,7 @@ static int emac_rx_bdproc(struct emac_priv *priv, u32 ch, u32 budget) curr_pkt->num_bufs = 1; curr_pkt->pkt_length = (frame_status & EMAC_RX_BD_PKT_LENGTH_MASK); - emac_write(EMAC_RXCP(ch), emac_virt_to_phys(curr_bd)); + emac_write(EMAC_RXCP(ch), emac_virt_to_phys(curr_bd, priv)); ++rxch->processed_bd; last_bd = curr_bd; curr_bd = last_bd->next; @@ -2005,7 +2006,7 @@ static int emac_rx_bdproc(struct emac_priv *priv, u32 ch, u32 budget) if (curr_bd) { ++rxch->mis_queued_packets; emac_write(EMAC_RXHDP(ch), - emac_virt_to_phys(curr_bd)); + emac_virt_to_phys(curr_bd, priv)); } else { ++rxch->end_of_queue; rxch->queue_active = 0; @@ -2106,7 +2107,7 @@ static int emac_hw_enable(struct emac_priv *priv) emac_write(EMAC_RXINTMASKSET, BIT(ch)); rxch->queue_active = 1; emac_write(EMAC_RXHDP(ch), - emac_virt_to_phys(rxch->active_queue_head)); + emac_virt_to_phys(rxch->active_queue_head, priv)); } /* Enable MII */ @@ -2705,6 +2706,12 @@ static int __devinit davinci_emac_probe(struct platform_device *pdev) priv->ctrl_ram_size = pdata->ctrl_ram_size; priv->emac_ctrl_ram = priv->remap_addr + pdata->ctrl_ram_offset; + if (pdata->hw_ram_addr) + priv->hw_ram_addr = pdata->hw_ram_addr; + else + priv->hw_ram_addr = (u32 __force)res->start + + pdata->ctrl_ram_offset; + res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); if (!res) { dev_err(emac_dev, "DaVinci EMAC: Error getting irq res\n"); diff --git a/include/linux/davinci_emac.h b/include/linux/davinci_emac.h index eb24dc0..b318dfd 100644 --- a/include/linux/davinci_emac.h +++ b/include/linux/davinci_emac.h @@ -19,6 +19,7 @@ struct emac_platform_data { u32 ctrl_reg_offset; u32 ctrl_mod_reg_offset; u32 ctrl_ram_offset; + u32 hw_ram_addr; u32 mdio_reg_offset; u32 ctrl_ram_size; u32 phy_mask; -- 1.6.2.4 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 3/3] TI Davinci EMAC : Abstract Buffer address translation logic. 2009-11-18 9:42 ` [PATCH 3/3] TI Davinci EMAC : Abstract Buffer address translation logic Sriramakrishnan @ 2009-11-18 19:15 ` Troy Kisky 0 siblings, 0 replies; 9+ messages in thread From: Troy Kisky @ 2009-11-18 19:15 UTC (permalink / raw) To: Sriramakrishnan; +Cc: netdev, davinci-linux-open-source Sriramakrishnan wrote: > When programming the DMA engine, the next pointers must be > programmed with physical address as seen from the DMA master > address space. This address may be different from physical > address of the buffer RAM area. This patch abstracts the > buffer address translation logic. > > Signed-off-by: Sriramakrishnan <srk@ti.com> > Acked-by: Chaithrika U S <chaithrika@ti.com> > --- > drivers/net/davinci_emac.c | 41 ++++++++++++++++++++++++----------------- > include/linux/davinci_emac.h | 1 + > 2 files changed, 25 insertions(+), 17 deletions(-) > > diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c > index 81931f8..d4e173b 100644 > --- a/drivers/net/davinci_emac.c > +++ b/drivers/net/davinci_emac.c > @@ -464,6 +464,7 @@ struct emac_priv { > void __iomem *ctrl_base; > void __iomem *emac_ctrl_ram; > u32 ctrl_ram_size; > + u32 hw_ram_addr; > struct emac_txch *txch[EMAC_DEF_MAX_TX_CH]; > struct emac_rxch *rxch[EMAC_DEF_MAX_RX_CH]; > u32 link; /* 1=link on, 0=link off */ > @@ -497,11 +498,9 @@ static struct clk *emac_clk; > static unsigned long emac_bus_frequency; > static unsigned long mdio_max_freq; > > -/* EMAC internal utility function */ > -static inline u32 emac_virt_to_phys(void __iomem *addr) > -{ > - return (u32 __force) io_v2p(addr); > -} > +#define emac_virt_to_phys(addr, priv) \ > + (((u32 __force)(addr) - (u32 __force)(priv->emac_ctrl_ram)) \ > + + priv->hw_ram_addr) Maybe instead of hw_ram_addr, you could use virtual_to_phys_translation where virtual_to_phys_translation = your hw_ram_addr - emac_ctrl_ram I'm fine with your way too though. > > /* Cache macros - Packet buffers would be from skb pool which is cached */ > #define EMAC_VIRT_NOCACHE(addr) (addr) > @@ -1309,7 +1308,7 @@ static int emac_tx_bdproc(struct emac_priv *priv, u32 ch, u32 budget) > curr_bd = txch->active_queue_head; > if (NULL == curr_bd) { > emac_write(EMAC_TXCP(ch), > - emac_virt_to_phys(txch->last_hw_bdprocessed)); > + emac_virt_to_phys(txch->last_hw_bdprocessed, priv)); > txch->no_active_pkts++; > spin_unlock_irqrestore(&priv->tx_lock, flags); > return 0; > @@ -1319,7 +1318,7 @@ static int emac_tx_bdproc(struct emac_priv *priv, u32 ch, u32 budget) > while ((curr_bd) && > ((frame_status & EMAC_CPPI_OWNERSHIP_BIT) == 0) && > (pkts_processed < budget)) { > - emac_write(EMAC_TXCP(ch), emac_virt_to_phys(curr_bd)); > + emac_write(EMAC_TXCP(ch), emac_virt_to_phys(curr_bd, priv)); > txch->active_queue_head = curr_bd->next; > if (frame_status & EMAC_CPPI_EOQ_BIT) { > if (curr_bd->next) { /* misqueued packet */ > @@ -1406,7 +1405,7 @@ static int emac_send(struct emac_priv *priv, struct emac_netpktobj *pkt, u32 ch) > txch->active_queue_tail = curr_bd; > if (1 != txch->queue_active) { > emac_write(EMAC_TXHDP(ch), > - emac_virt_to_phys(curr_bd)); > + emac_virt_to_phys(curr_bd, priv)); > txch->queue_active = 1; > } > ++txch->queue_reinit; > @@ -1418,10 +1417,11 @@ static int emac_send(struct emac_priv *priv, struct emac_netpktobj *pkt, u32 ch) > tail_bd->next = curr_bd; > txch->active_queue_tail = curr_bd; > tail_bd = EMAC_VIRT_NOCACHE(tail_bd); > - tail_bd->h_next = (int)emac_virt_to_phys(curr_bd); > + tail_bd->h_next = (int)emac_virt_to_phys(curr_bd, priv); > frame_status = tail_bd->mode; > if (frame_status & EMAC_CPPI_EOQ_BIT) { > - emac_write(EMAC_TXHDP(ch), emac_virt_to_phys(curr_bd)); > + emac_write(EMAC_TXHDP(ch), > + emac_virt_to_phys(curr_bd, priv)); > frame_status &= ~(EMAC_CPPI_EOQ_BIT); > tail_bd->mode = frame_status; > ++txch->end_of_queue_add; > @@ -1611,7 +1611,8 @@ static int emac_init_rxch(struct emac_priv *priv, u32 ch, char *param) > } > > /* populate the hardware descriptor */ > - curr_bd->h_next = emac_virt_to_phys(rxch->active_queue_head); > + curr_bd->h_next = emac_virt_to_phys(rxch->active_queue_head, > + priv); > /* FIXME buff_ptr = dma_map_single(... data_ptr ...) */ > curr_bd->buff_ptr = virt_to_phys(curr_bd->data_ptr); > curr_bd->off_b_len = rxch->buf_size; > @@ -1886,7 +1887,7 @@ static void emac_addbd_to_rx_queue(struct emac_priv *priv, u32 ch, > rxch->active_queue_tail = curr_bd; > if (0 != rxch->queue_active) { > emac_write(EMAC_RXHDP(ch), > - emac_virt_to_phys(rxch->active_queue_head)); > + emac_virt_to_phys(rxch->active_queue_head, priv)); > rxch->queue_active = 1; > } > } else { > @@ -1897,11 +1898,11 @@ static void emac_addbd_to_rx_queue(struct emac_priv *priv, u32 ch, > rxch->active_queue_tail = curr_bd; > tail_bd->next = curr_bd; > tail_bd = EMAC_VIRT_NOCACHE(tail_bd); > - tail_bd->h_next = emac_virt_to_phys(curr_bd); > + tail_bd->h_next = emac_virt_to_phys(curr_bd, priv); > frame_status = tail_bd->mode; > if (frame_status & EMAC_CPPI_EOQ_BIT) { > emac_write(EMAC_RXHDP(ch), > - emac_virt_to_phys(curr_bd)); > + emac_virt_to_phys(curr_bd, priv)); > frame_status &= ~(EMAC_CPPI_EOQ_BIT); > tail_bd->mode = frame_status; > ++rxch->end_of_queue_add; > @@ -1994,7 +1995,7 @@ static int emac_rx_bdproc(struct emac_priv *priv, u32 ch, u32 budget) > curr_pkt->num_bufs = 1; > curr_pkt->pkt_length = > (frame_status & EMAC_RX_BD_PKT_LENGTH_MASK); > - emac_write(EMAC_RXCP(ch), emac_virt_to_phys(curr_bd)); > + emac_write(EMAC_RXCP(ch), emac_virt_to_phys(curr_bd, priv)); > ++rxch->processed_bd; > last_bd = curr_bd; > curr_bd = last_bd->next; > @@ -2005,7 +2006,7 @@ static int emac_rx_bdproc(struct emac_priv *priv, u32 ch, u32 budget) > if (curr_bd) { > ++rxch->mis_queued_packets; > emac_write(EMAC_RXHDP(ch), > - emac_virt_to_phys(curr_bd)); > + emac_virt_to_phys(curr_bd, priv)); > } else { > ++rxch->end_of_queue; > rxch->queue_active = 0; > @@ -2106,7 +2107,7 @@ static int emac_hw_enable(struct emac_priv *priv) > emac_write(EMAC_RXINTMASKSET, BIT(ch)); > rxch->queue_active = 1; > emac_write(EMAC_RXHDP(ch), > - emac_virt_to_phys(rxch->active_queue_head)); > + emac_virt_to_phys(rxch->active_queue_head, priv)); > } > > /* Enable MII */ > @@ -2705,6 +2706,12 @@ static int __devinit davinci_emac_probe(struct platform_device *pdev) > priv->ctrl_ram_size = pdata->ctrl_ram_size; > priv->emac_ctrl_ram = priv->remap_addr + pdata->ctrl_ram_offset; > > + if (pdata->hw_ram_addr) > + priv->hw_ram_addr = pdata->hw_ram_addr; > + else > + priv->hw_ram_addr = (u32 __force)res->start + > + pdata->ctrl_ram_offset; > + > res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); > if (!res) { > dev_err(emac_dev, "DaVinci EMAC: Error getting irq res\n"); > diff --git a/include/linux/davinci_emac.h b/include/linux/davinci_emac.h > index eb24dc0..b318dfd 100644 > --- a/include/linux/davinci_emac.h > +++ b/include/linux/davinci_emac.h > @@ -19,6 +19,7 @@ struct emac_platform_data { > u32 ctrl_reg_offset; > u32 ctrl_mod_reg_offset; > u32 ctrl_ram_offset; > + u32 hw_ram_addr; > u32 mdio_reg_offset; > u32 ctrl_ram_size; > u32 phy_mask; ^ permalink raw reply [flat|nested] 9+ messages in thread
[parent not found: <1258537328-31527-3-git-send-email-srk-l0cyMroinI0@public.gmane.org>]
* Re: [PATCH 2/3] TI Davinci EMAC : add platform specific interrupt enable/disable logic. [not found] ` <1258537328-31527-3-git-send-email-srk-l0cyMroinI0@public.gmane.org> @ 2009-11-18 19:08 ` Troy Kisky 2009-11-18 22:29 ` Kevin Hilman 0 siblings, 1 reply; 9+ messages in thread From: Troy Kisky @ 2009-11-18 19:08 UTC (permalink / raw) To: Sriramakrishnan Cc: netdev-u79uwXL29TY76Z2rM5mHXA, davinci-linux-open-source-VycZQUHpC/PFrsHnngEfi1aTQe2KTcn/ Sriramakrishnan wrote: > On certain SOCs, the EMAC controller is interfaced with a wrapper logic > for handling interrupts. This patch implements a platform > specific hook to cater to platforms that require custom interrupt > handling logic > > Signed-off-by: Sriramakrishnan <srk-l0cyMroinI0@public.gmane.org> > Acked-by: Chaithrika U S <chaithrika-l0cyMroinI0@public.gmane.org> > --- > drivers/net/davinci_emac.c | 11 +++++++++++ > include/linux/davinci_emac.h | 2 ++ > 2 files changed, 13 insertions(+), 0 deletions(-) > > diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c > index 6aec8f5..81931f8 100644 > --- a/drivers/net/davinci_emac.c > +++ b/drivers/net/davinci_emac.c > @@ -487,6 +487,9 @@ struct emac_priv { > struct mii_bus *mii_bus; > struct phy_device *phydev; > spinlock_t lock; > + /*platform specific members*/ > + void (*wrapper_int_enable) (void); > + void (*wrapper_int_disable) (void); Would platform_int_enable be more appropriate then wrapper_int_enable ? > }; > > /* clock frequency for EMAC */ > @@ -1001,6 +1004,8 @@ static void emac_int_disable(struct emac_priv *priv) > emac_ctrl_write(EMAC_DM646X_CMRXINTEN, 0x0); > emac_ctrl_write(EMAC_DM646X_CMTXINTEN, 0x0); > /* NOTE: Rx Threshold and Misc interrupts are not disabled */ > + if (priv->wrapper_int_disable) > + priv->wrapper_int_disable(); > > local_irq_restore(flags); > > @@ -1020,6 +1025,9 @@ static void emac_int_disable(struct emac_priv *priv) > static void emac_int_enable(struct emac_priv *priv) > { > if (priv->version == EMAC_VERSION_2) { > + if (priv->wrapper_int_enable) > + priv->wrapper_int_enable(); > + > emac_ctrl_write(EMAC_DM646X_CMRXINTEN, 0xff); > emac_ctrl_write(EMAC_DM646X_CMTXINTEN, 0xff); > > @@ -2662,6 +2670,9 @@ static int __devinit davinci_emac_probe(struct platform_device *pdev) > priv->phy_mask = pdata->phy_mask; > priv->rmii_en = pdata->rmii_en; > priv->version = pdata->version; > + priv->wrapper_int_enable = pdata->wrapper_interrupt_enable; > + priv->wrapper_int_disable = pdata->wrapper_interrupt_disable; > + > emac_dev = &ndev->dev; > /* Get EMAC platform data */ > res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > diff --git a/include/linux/davinci_emac.h b/include/linux/davinci_emac.h > index ff55487..eb24dc0 100644 > --- a/include/linux/davinci_emac.h > +++ b/include/linux/davinci_emac.h > @@ -25,6 +25,8 @@ struct emac_platform_data { > u32 mdio_max_freq; > u8 rmii_en; > u8 version; > + void (*wrapper_interrupt_enable) (void); > + void (*wrapper_interrupt_disable) (void); > }; > > enum { ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/3] TI Davinci EMAC : add platform specific interrupt enable/disable logic. 2009-11-18 19:08 ` [PATCH 2/3] TI Davinci EMAC : add platform specific interrupt enable/disable logic Troy Kisky @ 2009-11-18 22:29 ` Kevin Hilman 0 siblings, 0 replies; 9+ messages in thread From: Kevin Hilman @ 2009-11-18 22:29 UTC (permalink / raw) To: Troy Kisky; +Cc: Sriramakrishnan, netdev, davinci-linux-open-source Troy Kisky <troy.kisky@boundarydevices.com> writes: > Sriramakrishnan wrote: >> On certain SOCs, the EMAC controller is interfaced with a wrapper logic >> for handling interrupts. This patch implements a platform >> specific hook to cater to platforms that require custom interrupt >> handling logic >> >> Signed-off-by: Sriramakrishnan <srk@ti.com> >> Acked-by: Chaithrika U S <chaithrika@ti.com> >> --- >> drivers/net/davinci_emac.c | 11 +++++++++++ >> include/linux/davinci_emac.h | 2 ++ >> 2 files changed, 13 insertions(+), 0 deletions(-) >> >> diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c >> index 6aec8f5..81931f8 100644 >> --- a/drivers/net/davinci_emac.c >> +++ b/drivers/net/davinci_emac.c >> @@ -487,6 +487,9 @@ struct emac_priv { >> struct mii_bus *mii_bus; >> struct phy_device *phydev; >> spinlock_t lock; >> + /*platform specific members*/ >> + void (*wrapper_int_enable) (void); >> + void (*wrapper_int_disable) (void); > > Would platform_int_enable be more appropriate then wrapper_int_enable ? > Or just int_enable. As it's being used through a private pointer, it's clear that it's a wrapper. Kevin ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 0/3] TI EMAC driver : Make driver re-usable on non-davinci platforms. 2009-11-18 9:42 [PATCH 0/3] TI EMAC driver : Make driver re-usable on non-davinci platforms Sriramakrishnan 2009-11-18 9:42 ` [PATCH 1/3] TI Davinci EMAC : Re-use driver for other platforms Sriramakrishnan @ 2009-11-18 13:12 ` David Miller 2009-11-18 17:53 ` Kevin Hilman 2 siblings, 0 replies; 9+ messages in thread From: David Miller @ 2009-11-18 13:12 UTC (permalink / raw) To: srk; +Cc: netdev, davinci-linux-open-source From: Sriramakrishnan <srk@ti.com> Date: Wed, 18 Nov 2009 15:12:05 +0530 > The Davinci EMAC peripheral is also available on other TI platforms - > notably TI AM3517 SoC. The following series of patches modify the driver > suitably to make it platform agnostic. > > Sriramakrishnan (3): > TI Davinci EMAC : Re-use driver for other platforms. > TI Davinci EMAC : add platform specific interrupt enable/disable > logic. > TI Davinci EMAC : Abstract Buffer address translation logic. It is easier to send this through the ARM tree? If so, feel free to do that and add my: Acked-by: David S. Miller <davem@davemloft.net> Thanks. ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 0/3] TI EMAC driver : Make driver re-usable on non-davinci platforms. 2009-11-18 9:42 [PATCH 0/3] TI EMAC driver : Make driver re-usable on non-davinci platforms Sriramakrishnan 2009-11-18 9:42 ` [PATCH 1/3] TI Davinci EMAC : Re-use driver for other platforms Sriramakrishnan 2009-11-18 13:12 ` [PATCH 0/3] TI EMAC driver : Make driver re-usable on non-davinci platforms David Miller @ 2009-11-18 17:53 ` Kevin Hilman 2 siblings, 0 replies; 9+ messages in thread From: Kevin Hilman @ 2009-11-18 17:53 UTC (permalink / raw) To: Sriramakrishnan; +Cc: netdev, davinci-linux-open-source Sriramakrishnan <srk@ti.com> writes: > The Davinci EMAC peripheral is also available on other TI platforms - > notably TI AM3517 SoC. The following series of patches modify the driver > suitably to make it platform agnostic. > > Sriramakrishnan (3): > TI Davinci EMAC : Re-use driver for other platforms. > TI Davinci EMAC : add platform specific interrupt enable/disable > logic. > TI Davinci EMAC : Abstract Buffer address translation logic. > As David proposed, this should go upstream via the ARM/DaVinci route. Can you please re-submit against current DaVinci git? This series doesn't apply there currently. Kevin ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2009-11-18 22:29 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-11-18 9:42 [PATCH 0/3] TI EMAC driver : Make driver re-usable on non-davinci platforms Sriramakrishnan
2009-11-18 9:42 ` [PATCH 1/3] TI Davinci EMAC : Re-use driver for other platforms Sriramakrishnan
2009-11-18 9:42 ` [PATCH 2/3] TI Davinci EMAC : add platform specific interrupt enable/disable logic Sriramakrishnan
2009-11-18 9:42 ` [PATCH 3/3] TI Davinci EMAC : Abstract Buffer address translation logic Sriramakrishnan
2009-11-18 19:15 ` Troy Kisky
[not found] ` <1258537328-31527-3-git-send-email-srk-l0cyMroinI0@public.gmane.org>
2009-11-18 19:08 ` [PATCH 2/3] TI Davinci EMAC : add platform specific interrupt enable/disable logic Troy Kisky
2009-11-18 22:29 ` Kevin Hilman
2009-11-18 13:12 ` [PATCH 0/3] TI EMAC driver : Make driver re-usable on non-davinci platforms David Miller
2009-11-18 17:53 ` Kevin Hilman
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).