lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Thu, 25 Apr 2019 09:38:10 -0400 From: Murali Karicheri <m-karicheri2@...com> To: Grygorii Strashko <grygorii.strashko@...com>, <netdev@...r.kernel.org>, Ilias Apalodimas <ilias.apalodimas@...aro.org>, "David S . Miller" <davem@...emloft.net>, Ivan Khoronzhuk <ivan.khoronzhuk@...aro.org> CC: Florian Fainelli <f.fainelli@...il.com>, Andrew Lunn <andrew@...n.ch>, Sekhar Nori <nsekhar@...com>, <linux-kernel@...r.kernel.org>, <linux-omap@...r.kernel.org> Subject: Re: [PATCH net-next 16/19] net: ethernet: ti: cpsw: move common hw init code in separate func On 04/23/2019 09:09 AM, Grygorii Strashko wrote: > move common hw init code in separate function as preparation for adding new > switchdev driver. All of the changes indicates a better name for the file is cpsw_common.c; commit log, new function cpsw_init_common() etc. Any specific reason to use cpsw_priv.[ch]? > > Signed-off-by: Grygorii Strashko <grygorii.strashko@...com> > --- > drivers/net/ethernet/ti/Makefile | 2 +- > drivers/net/ethernet/ti/cpsw.c | 106 ++--------------------- > drivers/net/ethernet/ti/cpsw_priv.c | 128 ++++++++++++++++++++++++++++ > drivers/net/ethernet/ti/cpsw_priv.h | 3 + > 4 files changed, 137 insertions(+), 102 deletions(-) > create mode 100644 drivers/net/ethernet/ti/cpsw_priv.c > > diff --git a/drivers/net/ethernet/ti/Makefile b/drivers/net/ethernet/ti/Makefile > index 2f159a71f88e..de1561596646 100644 > --- a/drivers/net/ethernet/ti/Makefile > +++ b/drivers/net/ethernet/ti/Makefile > @@ -14,7 +14,7 @@ obj-$(CONFIG_TI_DAVINCI_MDIO) += davinci_mdio.o > obj-$(CONFIG_TI_CPSW_PHY_SEL) += cpsw-phy-sel.o > obj-$(CONFIG_TI_CPTS_MOD) += cpts.o > obj-$(CONFIG_TI_CPSW) += ti_cpsw.o > -ti_cpsw-y := cpsw.o davinci_cpdma.o cpsw_ale.o > +ti_cpsw-y := cpsw.o davinci_cpdma.o cpsw_ale.o cpsw_priv.o > > obj-$(CONFIG_TI_KEYSTONE_NETCP) += keystone_netcp.o > keystone_netcp-y := netcp_core.o cpsw_ale.o > diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c > index 7dffc67f0cf4..a6c3d8be1649 100644 > --- a/drivers/net/ethernet/ti/cpsw.c > +++ b/drivers/net/ethernet/ti/cpsw.c > @@ -3007,16 +3007,12 @@ static int cpsw_probe(struct platform_device *pdev) > struct cpsw_platform_data *data; > struct net_device *ndev; > struct cpsw_priv *priv; > - struct cpdma_params dma_params; > - struct cpsw_ale_params ale_params; > void __iomem *ss_regs; > - void __iomem *cpts_regs; > struct resource *res, *ss_res; > struct gpio_descs *mode; > - u32 slave_offset, sliver_offset, slave_size; > const struct soc_device_attribute *soc; > struct cpsw_common *cpsw; > - int ret = 0, i, ch; > + int ret = 0, ch; > int irq; > > cpsw = devm_kzalloc(dev, sizeof(struct cpsw_common), GFP_KERNEL); > @@ -3096,103 +3092,12 @@ static int cpsw_probe(struct platform_device *pdev) > > cpsw->rx_packet_max = max(rx_packet_max, CPSW_MAX_PACKET_SIZE); > > - cpsw->rx_ch_num = 1; > - cpsw->tx_ch_num = 1; > > - cpsw->version = readl(&cpsw->regs->id_ver); > - > - memset(&dma_params, 0, sizeof(dma_params)); > - memset(&ale_params, 0, sizeof(ale_params)); > - > - switch (cpsw->version) { > - case CPSW_VERSION_1: > - cpsw->host_port_regs = ss_regs + CPSW1_HOST_PORT_OFFSET; > - cpts_regs = ss_regs + CPSW1_CPTS_OFFSET; > - cpsw->hw_stats = ss_regs + CPSW1_HW_STATS; > - dma_params.dmaregs = ss_regs + CPSW1_CPDMA_OFFSET; > - dma_params.txhdp = ss_regs + CPSW1_STATERAM_OFFSET; > - ale_params.ale_regs = ss_regs + CPSW1_ALE_OFFSET; > - slave_offset = CPSW1_SLAVE_OFFSET; > - slave_size = CPSW1_SLAVE_SIZE; > - sliver_offset = CPSW1_SLIVER_OFFSET; > - dma_params.desc_mem_phys = 0; > - break; > - case CPSW_VERSION_2: > - case CPSW_VERSION_3: > - case CPSW_VERSION_4: > - cpsw->host_port_regs = ss_regs + CPSW2_HOST_PORT_OFFSET; > - cpts_regs = ss_regs + CPSW2_CPTS_OFFSET; > - cpsw->hw_stats = ss_regs + CPSW2_HW_STATS; > - dma_params.dmaregs = ss_regs + CPSW2_CPDMA_OFFSET; > - dma_params.txhdp = ss_regs + CPSW2_STATERAM_OFFSET; > - ale_params.ale_regs = ss_regs + CPSW2_ALE_OFFSET; > - slave_offset = CPSW2_SLAVE_OFFSET; > - slave_size = CPSW2_SLAVE_SIZE; > - sliver_offset = CPSW2_SLIVER_OFFSET; > - dma_params.desc_mem_phys = > - (u32 __force) ss_res->start + CPSW2_BD_OFFSET; > - break; > - default: > - dev_err(dev, "unknown version 0x%08x\n", cpsw->version); > - ret = -ENODEV; > - goto clean_dt_ret; > - } > - > - for (i = 0; i < cpsw->data.slaves; i++) { > - struct cpsw_slave *slave = &cpsw->slaves[i]; > - void __iomem *regs = cpsw->regs; > - > - slave->slave_num = i; > - slave->data = &cpsw->data.slave_data[i]; > - slave->regs = regs + slave_offset; > - slave->sliver = regs + sliver_offset; > - slave->port_vlan = slave->data->dual_emac_res_vlan; > - > - slave_offset += slave_size; > - sliver_offset += SLIVER_SIZE; > - } > - > - ale_params.dev = dev; > - ale_params.ale_ageout = ale_ageout; > - ale_params.ale_entries = data->ale_entries; > - ale_params.ale_ports = CPSW_ALE_PORTS_NUM; > - > - cpsw->ale = cpsw_ale_create(&ale_params); > - if (!cpsw->ale) { > - dev_err(dev, "error initializing ale engine\n"); > - ret = -ENODEV; > - goto clean_dt_ret; > - } > - > - dma_params.dev = dev; > - dma_params.rxthresh = dma_params.dmaregs + CPDMA_RXTHRESH; > - dma_params.rxfree = dma_params.dmaregs + CPDMA_RXFREE; > - dma_params.rxhdp = dma_params.txhdp + CPDMA_RXHDP; > - dma_params.txcp = dma_params.txhdp + CPDMA_TXCP; > - dma_params.rxcp = dma_params.txhdp + CPDMA_RXCP; > - > - dma_params.num_chan = data->channels; > - dma_params.has_soft_reset = true; > - dma_params.min_packet_size = CPSW_MIN_PACKET_SIZE; > - dma_params.desc_mem_size = data->bd_ram_size; > - dma_params.desc_align = 16; > - dma_params.has_ext_regs = true; > - dma_params.desc_hw_addr = dma_params.desc_mem_phys; > - dma_params.bus_freq_mhz = cpsw->bus_freq_mhz; > - dma_params.descs_pool_size = descs_pool_size; > - > - cpsw->dma = cpdma_ctlr_create(&dma_params); > - if (!cpsw->dma) { > - dev_err(dev, "error initializing dma\n"); > - ret = -ENOMEM; > + ret = cpsw_init_common(cpsw, ss_regs, ale_ageout, > + (u32 __force)ss_res->start + CPSW2_BD_OFFSET, > + descs_pool_size); > + if (ret) > goto clean_dt_ret; > - } > - > - cpsw->cpts = cpts_create(cpsw->dev, cpts_regs, cpsw->dev->of_node); > - if (IS_ERR(cpsw->cpts)) { > - ret = PTR_ERR(cpsw->cpts); > - goto clean_dma_ret; > - } > > ch = cpsw->quirk_irq ? 0 : 7; > cpsw->txv[0].ch = cpdma_chan_create(cpsw->dma, ch, cpsw_tx_handler, 0); > @@ -3300,7 +3205,6 @@ static int cpsw_probe(struct platform_device *pdev) > unregister_netdev(ndev); > clean_cpts: > cpts_release(cpsw->cpts); > -clean_dma_ret: > cpdma_ctlr_destroy(cpsw->dma); > clean_dt_ret: > cpsw_remove_dt(pdev); > diff --git a/drivers/net/ethernet/ti/cpsw_priv.c b/drivers/net/ethernet/ti/cpsw_priv.c > new file mode 100644 > index 000000000000..208c544d0b80 > --- /dev/null > +++ b/drivers/net/ethernet/ti/cpsw_priv.c > @@ -0,0 +1,128 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Texas Instruments Ethernet Switch Driver > + * > + * Copyright (C) 2019 Texas Instruments > + */ > + > +#include <linux/if_ether.h> > +#include <linux/if_vlan.h> > +#include <linux/module.h> > +#include <linux/netdevice.h> > +#include <linux/phy.h> > +#include <linux/platform_device.h> > +#include <linux/skbuff.h> > + > +#include "cpts.h" > +#include "cpsw_ale.h" > +#include "cpsw_priv.h" > +#include "davinci_cpdma.h" > + > +int cpsw_init_common(struct cpsw_common *cpsw, void __iomem *ss_regs, > + int ale_ageout, u32 desc_mem_phys, int descs_pool_size) > +{ > + u32 slave_offset, sliver_offset, slave_size; > + struct cpsw_ale_params ale_params; > + struct cpsw_platform_data *data; > + struct cpdma_params dma_params; > + struct device *dev = cpsw->dev; > + void __iomem *cpts_regs; > + int ret = 0, i; > + > + data = &cpsw->data; > + cpsw->rx_ch_num = 1; > + cpsw->tx_ch_num = 1; > + > + cpsw->version = readl(&cpsw->regs->id_ver); > + > + memset(&dma_params, 0, sizeof(dma_params)); > + memset(&ale_params, 0, sizeof(ale_params)); > + > + switch (cpsw->version) { > + case CPSW_VERSION_1: > + cpsw->host_port_regs = ss_regs + CPSW1_HOST_PORT_OFFSET; > + cpts_regs = ss_regs + CPSW1_CPTS_OFFSET; > + cpsw->hw_stats = ss_regs + CPSW1_HW_STATS; > + dma_params.dmaregs = ss_regs + CPSW1_CPDMA_OFFSET; > + dma_params.txhdp = ss_regs + CPSW1_STATERAM_OFFSET; > + ale_params.ale_regs = ss_regs + CPSW1_ALE_OFFSET; > + slave_offset = CPSW1_SLAVE_OFFSET; > + slave_size = CPSW1_SLAVE_SIZE; > + sliver_offset = CPSW1_SLIVER_OFFSET; > + dma_params.desc_mem_phys = 0; > + break; > + case CPSW_VERSION_2: > + case CPSW_VERSION_3: > + case CPSW_VERSION_4: > + cpsw->host_port_regs = ss_regs + CPSW2_HOST_PORT_OFFSET; > + cpts_regs = ss_regs + CPSW2_CPTS_OFFSET; > + cpsw->hw_stats = ss_regs + CPSW2_HW_STATS; > + dma_params.dmaregs = ss_regs + CPSW2_CPDMA_OFFSET; > + dma_params.txhdp = ss_regs + CPSW2_STATERAM_OFFSET; > + ale_params.ale_regs = ss_regs + CPSW2_ALE_OFFSET; > + slave_offset = CPSW2_SLAVE_OFFSET; > + slave_size = CPSW2_SLAVE_SIZE; > + sliver_offset = CPSW2_SLIVER_OFFSET; > + dma_params.desc_mem_phys = desc_mem_phys; > + break; > + default: > + dev_err(dev, "unknown version 0x%08x\n", cpsw->version); > + return -ENODEV; > + } > + > + for (i = 0; i < cpsw->data.slaves; i++) { > + struct cpsw_slave *slave = &cpsw->slaves[i]; > + void __iomem *regs = cpsw->regs; > + > + slave->slave_num = i; > + slave->data = &cpsw->data.slave_data[i]; > + slave->regs = regs + slave_offset; > + slave->sliver = regs + sliver_offset; > + slave->port_vlan = slave->data->dual_emac_res_vlan; > + > + slave_offset += slave_size; > + sliver_offset += SLIVER_SIZE; > + } > + > + ale_params.dev = dev; > + ale_params.ale_ageout = ale_ageout; > + ale_params.ale_entries = data->ale_entries; > + ale_params.ale_ports = CPSW_ALE_PORTS_NUM; > + > + cpsw->ale = cpsw_ale_create(&ale_params); > + if (!cpsw->ale) { > + dev_err(dev, "error initializing ale engine\n"); > + return -ENODEV; > + } > + > + dma_params.dev = dev; > + dma_params.rxthresh = dma_params.dmaregs + CPDMA_RXTHRESH; > + dma_params.rxfree = dma_params.dmaregs + CPDMA_RXFREE; > + dma_params.rxhdp = dma_params.txhdp + CPDMA_RXHDP; > + dma_params.txcp = dma_params.txhdp + CPDMA_TXCP; > + dma_params.rxcp = dma_params.txhdp + CPDMA_RXCP; > + > + dma_params.num_chan = data->channels; > + dma_params.has_soft_reset = true; > + dma_params.min_packet_size = CPSW_MIN_PACKET_SIZE; > + dma_params.desc_mem_size = data->bd_ram_size; > + dma_params.desc_align = 16; > + dma_params.has_ext_regs = true; > + dma_params.desc_hw_addr = dma_params.desc_mem_phys; > + dma_params.bus_freq_mhz = cpsw->bus_freq_mhz; > + dma_params.descs_pool_size = descs_pool_size; > + > + cpsw->dma = cpdma_ctlr_create(&dma_params); > + if (!cpsw->dma) { > + dev_err(dev, "error initializing dma\n"); > + return -ENOMEM; > + } > + > + cpsw->cpts = cpts_create(cpsw->dev, cpts_regs, cpsw->dev->of_node); > + if (IS_ERR(cpsw->cpts)) { > + ret = PTR_ERR(cpsw->cpts); > + cpdma_ctlr_destroy(cpsw->dma); > + } > + > + return ret; > +} > diff --git a/drivers/net/ethernet/ti/cpsw_priv.h b/drivers/net/ethernet/ti/cpsw_priv.h > index 8df9ce68696a..4004140fc4d0 100644 > --- a/drivers/net/ethernet/ti/cpsw_priv.h > +++ b/drivers/net/ethernet/ti/cpsw_priv.h > @@ -447,4 +447,7 @@ struct addr_sync_ctx { > int flush; /* flush flag */ > }; > > +int cpsw_init_common(struct cpsw_common *cpsw, void __iomem *ss_regs, > + int ale_ageout, u32 desc_mem_phys, int descs_pool_size); > + > #endif /* DRIVERS_NET_ETHERNET_TI_CPSW_PRIV_H_ */ >
Powered by blists - more mailing lists