* [PATCH v2] net: macb: Added PCI wrapper for Platform Driver. [not found] <1481537461-9587-1-git-send-email-bfolta@cadence.com> @ 2016-12-12 10:29 ` Bartosz Folta 2016-12-12 14:50 ` kbuild test robot 2016-12-12 15:00 ` kbuild test robot 0 siblings, 2 replies; 3+ messages in thread From: Bartosz Folta @ 2016-12-12 10:29 UTC (permalink / raw) To: Nicolas Ferre, David S. Miller, Niklas Cassel, Alexandre Torgue, Satanand Burla, Raghu Vatsavayi, Simon Horman, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: Bartosz Folta, Rafal Ozieblo There are hardware PCI implementations of Cadence GEM network controller. This patch will allow to use such hardware with reuse of existing Platform Driver. Signed-off-by: Bartosz Folta <bfolta@cadence.com> --- Changed in v2: Respin to net-next. Changed patch formatting. --- drivers/net/ethernet/cadence/Kconfig | 9 ++ drivers/net/ethernet/cadence/Makefile | 1 + drivers/net/ethernet/cadence/macb.c | 31 +++++-- drivers/net/ethernet/cadence/macb_pci.c | 152 ++++++++++++++++++++++++++++++++ include/linux/platform_data/macb.h | 6 ++ 5 files changed, 194 insertions(+), 5 deletions(-) create mode 100644 drivers/net/ethernet/cadence/macb_pci.c diff --git a/drivers/net/ethernet/cadence/Kconfig b/drivers/net/ethernet/cadence/Kconfig index f0bcb15..00d833e 100644 --- a/drivers/net/ethernet/cadence/Kconfig +++ b/drivers/net/ethernet/cadence/Kconfig @@ -31,4 +31,13 @@ config MACB To compile this driver as a module, choose M here: the module will be called macb. +config MACB_PCI + tristate "Cadence PCI MACB/GEM support" + depends on MACB + ---help--- + This is PCI wrapper for MACB driver. + + To compile this driver as a module, choose M here: the module + will be called macb_pci. + endif # NET_CADENCE diff --git a/drivers/net/ethernet/cadence/Makefile b/drivers/net/ethernet/cadence/Makefile index 91f79b1..4ba7559 100644 --- a/drivers/net/ethernet/cadence/Makefile +++ b/drivers/net/ethernet/cadence/Makefile @@ -3,3 +3,4 @@ # obj-$(CONFIG_MACB) += macb.o +obj-$(CONFIG_MACB_PCI) += macb_pci.o diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c index 538544a..c0fb80a 100644 --- a/drivers/net/ethernet/cadence/macb.c +++ b/drivers/net/ethernet/cadence/macb.c @@ -404,6 +404,8 @@ static int macb_mii_probe(struct net_device *dev) phy_irq = gpio_to_irq(pdata->phy_irq_pin); phydev->irq = (phy_irq < 0) ? PHY_POLL : phy_irq; } + } else { + phydev->irq = PHY_POLL; } /* attach the mac to the phy */ @@ -482,6 +484,9 @@ static int macb_mii_init(struct macb *bp) goto err_out_unregister_bus; } } else { + for (i = 0; i < PHY_MAX_ADDR; i++) + bp->mii_bus->irq[i] = PHY_POLL; + if (pdata) bp->mii_bus->phy_mask = pdata->phy_mask; @@ -2523,16 +2528,24 @@ static int macb_clk_init(struct platform_device *pdev, struct clk **pclk, struct clk **hclk, struct clk **tx_clk, struct clk **rx_clk) { + struct macb_platform_data *pdata; int err; - *pclk = devm_clk_get(&pdev->dev, "pclk"); + pdata = dev_get_platdata(&pdev->dev); + if (pdata) { + *pclk = pdata->pclk; + *hclk = pdata->hclk; + } else { + *pclk = devm_clk_get(&pdev->dev, "pclk"); + *hclk = devm_clk_get(&pdev->dev, "hclk"); + } + if (IS_ERR(*pclk)) { err = PTR_ERR(*pclk); dev_err(&pdev->dev, "failed to get macb_clk (%u)\n", err); return err; } - *hclk = devm_clk_get(&pdev->dev, "hclk"); if (IS_ERR(*hclk)) { err = PTR_ERR(*hclk); dev_err(&pdev->dev, "failed to get hclk (%u)\n", err); @@ -3107,15 +3120,23 @@ static int at91ether_init(struct platform_device *pdev) MODULE_DEVICE_TABLE(of, macb_dt_ids); #endif /* CONFIG_OF */ +static const struct macb_config default_gem_config = { + .caps = MACB_CAPS_GIGABIT_MODE_AVAILABLE | MACB_CAPS_JUMBO, + .dma_burst_length = 16, + .clk_init = macb_clk_init, + .init = macb_init, + .jumbo_max_len = 10240, +}; + static int macb_probe(struct platform_device *pdev) { + const struct macb_config *macb_config = &default_gem_config; int (*clk_init)(struct platform_device *, struct clk **, struct clk **, struct clk **, struct clk **) - = macb_clk_init; - int (*init)(struct platform_device *) = macb_init; + = macb_config->clk_init; + int (*init)(struct platform_device *) = macb_config->init; struct device_node *np = pdev->dev.of_node; struct device_node *phy_node; - const struct macb_config *macb_config = NULL; struct clk *pclk, *hclk = NULL, *tx_clk = NULL, *rx_clk = NULL; unsigned int queue_mask, num_queues; struct macb_platform_data *pdata; diff --git a/drivers/net/ethernet/cadence/macb_pci.c b/drivers/net/ethernet/cadence/macb_pci.c new file mode 100644 index 0000000..b440960 --- /dev/null +++ b/drivers/net/ethernet/cadence/macb_pci.c @@ -0,0 +1,152 @@ +/** + * macb_pci.c - Cadence GEM PCI wrapper. + * + * Copyright (C) 2016 Cadence Design Systems - http://www.cadence.com + * + * Authors: Rafal Ozieblo <rafalo@cadence.com> + * Bartosz Folta <bfolta@cadence.com> + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 of + * the License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include <linux/clk.h> +#include <linux/clk-provider.h> +#include <linux/etherdevice.h> +#include <linux/pci.h> +#include <linux/platform_data/macb.h> +#include <linux/platform_device.h> +#include "macb.h" + +#define PCI_DRIVER_NAME "macb_pci" +#define PLAT_DRIVER_NAME "macb" + +#define CDNS_VENDOR_ID 0x17cd +#define CDNS_DEVICE_ID 0xe007 + +#define GEM_PCLK_RATE 50000000 +#define GEM_HCLK_RATE 50000000 + +static int macb_probe(struct pci_dev *pdev, const struct pci_device_id *id) +{ + int err; + struct platform_device *plat_dev; + struct platform_device_info plat_info; + struct macb_platform_data plat_data; + struct resource res[2]; + + /* sanity check */ + if (!id) + return -EINVAL; + + /* enable pci device */ + err = pci_enable_device(pdev); + if (err < 0) { + dev_err(&pdev->dev, "Enabling PCI device has failed: 0x%04X", + err); + return -EACCES; + } + + pci_set_master(pdev); + + /* set up resources */ + memset(res, 0x00, sizeof(struct resource) * ARRAY_SIZE(res)); + res[0].start = pdev->resource[0].start; + res[0].end = pdev->resource[0].end; + res[0].name = PCI_DRIVER_NAME; + res[0].flags = IORESOURCE_MEM; + res[1].start = pdev->irq; + res[1].name = PCI_DRIVER_NAME; + res[1].flags = IORESOURCE_IRQ; + + dev_info(&pdev->dev, "EMAC physical base addr = 0x%p\n", + (void *)(uintptr_t)pci_resource_start(pdev, 0)); + + /* set up macb platform data */ + memset(&plat_data, 0, sizeof(plat_data)); + + /* initialize clocks */ + plat_data.pclk = clk_register_fixed_rate(&pdev->dev, "pclk", NULL, 0, + GEM_PCLK_RATE); + if (IS_ERR(plat_data.pclk)) { + err = PTR_ERR(plat_data.pclk); + goto err_pclk_register; + } + + plat_data.hclk = clk_register_fixed_rate(&pdev->dev, "hclk", NULL, 0, + GEM_HCLK_RATE); + if (IS_ERR(plat_data.hclk)) { + err = PTR_ERR(plat_data.hclk); + goto err_hclk_register; + } + + /* set up platform device info */ + memset(&plat_info, 0, sizeof(plat_info)); + plat_info.parent = &pdev->dev; + plat_info.fwnode = pdev->dev.fwnode; + plat_info.name = PLAT_DRIVER_NAME; + plat_info.id = pdev->devfn; + plat_info.res = res; + plat_info.num_res = ARRAY_SIZE(res); + plat_info.data = &plat_data; + plat_info.size_data = sizeof(plat_data); + plat_info.dma_mask = DMA_BIT_MASK(32); + + /* register platform device */ + plat_dev = platform_device_register_full(&plat_info); + if (IS_ERR(plat_dev)) { + err = PTR_ERR(plat_dev); + goto err_plat_dev_register; + } + + pci_set_drvdata(pdev, plat_dev); + + return 0; + +err_plat_dev_register: + clk_unregister(plat_data.hclk); + +err_hclk_register: + clk_unregister(plat_data.pclk); + +err_pclk_register: + pci_disable_device(pdev); + return err; +} + +void macb_remove(struct pci_dev *pdev) +{ + struct platform_device *plat_dev = pci_get_drvdata(pdev); + struct macb_platform_data *plat_data = dev_get_platdata(&plat_dev->dev); + + platform_device_unregister(plat_dev); + pci_disable_device(pdev); + clk_unregister(plat_data->pclk); + clk_unregister(plat_data->hclk); +} + +static struct pci_device_id dev_id_table[] = { + { PCI_DEVICE(CDNS_VENDOR_ID, CDNS_DEVICE_ID), }, + { 0, } +}; + +static struct pci_driver macb_pci_driver = { + .name = PCI_DRIVER_NAME, + .id_table = dev_id_table, + .probe = macb_probe, + .remove = macb_remove, +}; + +module_pci_driver(macb_pci_driver); +MODULE_DEVICE_TABLE(pci, dev_id_table); +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("Cadence NIC PCI wrapper"); diff --git a/include/linux/platform_data/macb.h b/include/linux/platform_data/macb.h index 21b15f6..7815d50 100644 --- a/include/linux/platform_data/macb.h +++ b/include/linux/platform_data/macb.h @@ -8,6 +8,8 @@ #ifndef __MACB_PDATA_H__ #define __MACB_PDATA_H__ +#include <linux/clk.h> + /** * struct macb_platform_data - platform data for MACB Ethernet * @phy_mask: phy mask passed when register the MDIO bus @@ -15,12 +17,16 @@ * @phy_irq_pin: PHY IRQ * @is_rmii: using RMII interface? * @rev_eth_addr: reverse Ethernet address byte order + * @pclk: platform clock + * @hclk: AHB clock */ struct macb_platform_data { u32 phy_mask; int phy_irq_pin; u8 is_rmii; u8 rev_eth_addr; + struct clk *pclk; + struct clk *hclk; }; #endif /* __MACB_PDATA_H__ */ -- 1.9.1 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] net: macb: Added PCI wrapper for Platform Driver. 2016-12-12 10:29 ` [PATCH v2] net: macb: Added PCI wrapper for Platform Driver Bartosz Folta @ 2016-12-12 14:50 ` kbuild test robot 2016-12-12 15:00 ` kbuild test robot 1 sibling, 0 replies; 3+ messages in thread From: kbuild test robot @ 2016-12-12 14:50 UTC (permalink / raw) To: Bartosz Folta Cc: kbuild-all, Nicolas Ferre, David S. Miller, Niklas Cassel, Alexandre Torgue, Satanand Burla, Raghu Vatsavayi, Simon Horman, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Bartosz Folta, Rafal Ozieblo [-- Attachment #1: Type: text/plain, Size: 3609 bytes --] Hi Bartosz, [auto build test ERROR on net-next/master] [also build test ERROR on v4.9 next-20161209] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Bartosz-Folta/net-macb-Added-PCI-wrapper-for-Platform-Driver/20161212-220228 config: alpha-allyesconfig (attached as .config) compiler: alpha-linux-gnu-gcc (Debian 6.1.1-9) 6.1.1 20160705 reproduce: wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross # save the attached .config to linux build tree make.cross ARCH=alpha All error/warnings (new ones prefixed by >>): drivers/net/ethernet/cadence/macb_pci.c: In function 'macb_probe': >> drivers/net/ethernet/cadence/macb_pci.c:78:19: error: implicit declaration of function 'clk_register_fixed_rate' [-Werror=implicit-function-declaration] plat_data.pclk = clk_register_fixed_rate(&pdev->dev, "pclk", NULL, 0, ^~~~~~~~~~~~~~~~~~~~~~~ >> drivers/net/ethernet/cadence/macb_pci.c:78:17: warning: assignment makes pointer from integer without a cast [-Wint-conversion] plat_data.pclk = clk_register_fixed_rate(&pdev->dev, "pclk", NULL, 0, ^ drivers/net/ethernet/cadence/macb_pci.c:85:17: warning: assignment makes pointer from integer without a cast [-Wint-conversion] plat_data.hclk = clk_register_fixed_rate(&pdev->dev, "hclk", NULL, 0, ^ >> drivers/net/ethernet/cadence/macb_pci.c:116:2: error: implicit declaration of function 'clk_unregister' [-Werror=implicit-function-declaration] clk_unregister(plat_data.hclk); ^~~~~~~~~~~~~~ cc1: some warnings being treated as errors vim +/clk_register_fixed_rate +78 drivers/net/ethernet/cadence/macb_pci.c 72 (void *)(uintptr_t)pci_resource_start(pdev, 0)); 73 74 /* set up macb platform data */ 75 memset(&plat_data, 0, sizeof(plat_data)); 76 77 /* initialize clocks */ > 78 plat_data.pclk = clk_register_fixed_rate(&pdev->dev, "pclk", NULL, 0, 79 GEM_PCLK_RATE); 80 if (IS_ERR(plat_data.pclk)) { 81 err = PTR_ERR(plat_data.pclk); 82 goto err_pclk_register; 83 } 84 85 plat_data.hclk = clk_register_fixed_rate(&pdev->dev, "hclk", NULL, 0, 86 GEM_HCLK_RATE); 87 if (IS_ERR(plat_data.hclk)) { 88 err = PTR_ERR(plat_data.hclk); 89 goto err_hclk_register; 90 } 91 92 /* set up platform device info */ 93 memset(&plat_info, 0, sizeof(plat_info)); 94 plat_info.parent = &pdev->dev; 95 plat_info.fwnode = pdev->dev.fwnode; 96 plat_info.name = PLAT_DRIVER_NAME; 97 plat_info.id = pdev->devfn; 98 plat_info.res = res; 99 plat_info.num_res = ARRAY_SIZE(res); 100 plat_info.data = &plat_data; 101 plat_info.size_data = sizeof(plat_data); 102 plat_info.dma_mask = DMA_BIT_MASK(32); 103 104 /* register platform device */ 105 plat_dev = platform_device_register_full(&plat_info); 106 if (IS_ERR(plat_dev)) { 107 err = PTR_ERR(plat_dev); 108 goto err_plat_dev_register; 109 } 110 111 pci_set_drvdata(pdev, plat_dev); 112 113 return 0; 114 115 err_plat_dev_register: > 116 clk_unregister(plat_data.hclk); 117 118 err_hclk_register: 119 clk_unregister(plat_data.pclk); --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation [-- Attachment #2: .config.gz --] [-- Type: application/gzip, Size: 48070 bytes --] ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] net: macb: Added PCI wrapper for Platform Driver. 2016-12-12 10:29 ` [PATCH v2] net: macb: Added PCI wrapper for Platform Driver Bartosz Folta 2016-12-12 14:50 ` kbuild test robot @ 2016-12-12 15:00 ` kbuild test robot 1 sibling, 0 replies; 3+ messages in thread From: kbuild test robot @ 2016-12-12 15:00 UTC (permalink / raw) To: Bartosz Folta Cc: kbuild-all, Nicolas Ferre, David S. Miller, Niklas Cassel, Alexandre Torgue, Satanand Burla, Raghu Vatsavayi, Simon Horman, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Bartosz Folta, Rafal Ozieblo [-- Attachment #1: Type: text/plain, Size: 5003 bytes --] Hi Bartosz, [auto build test ERROR on net-next/master] [also build test ERROR on v4.9 next-20161209] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Bartosz-Folta/net-macb-Added-PCI-wrapper-for-Platform-Driver/20161212-220228 config: blackfin-allyesconfig (attached as .config) compiler: bfin-uclinux-gcc (GCC) 6.2.0 reproduce: wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross # save the attached .config to linux build tree make.cross ARCH=blackfin All error/warnings (new ones prefixed by >>): drivers/net/ethernet/cadence/macb_pci.c: In function 'macb_probe': drivers/net/ethernet/cadence/macb_pci.c:78:19: error: implicit declaration of function 'clk_register_fixed_rate' [-Werror=implicit-function-declaration] plat_data.pclk = clk_register_fixed_rate(&pdev->dev, "pclk", NULL, 0, ^~~~~~~~~~~~~~~~~~~~~~~ drivers/net/ethernet/cadence/macb_pci.c:78:17: warning: assignment makes pointer from integer without a cast [-Wint-conversion] plat_data.pclk = clk_register_fixed_rate(&pdev->dev, "pclk", NULL, 0, ^ drivers/net/ethernet/cadence/macb_pci.c:85:17: warning: assignment makes pointer from integer without a cast [-Wint-conversion] plat_data.hclk = clk_register_fixed_rate(&pdev->dev, "hclk", NULL, 0, ^ drivers/net/ethernet/cadence/macb_pci.c:116:2: error: implicit declaration of function 'clk_unregister' [-Werror=implicit-function-declaration] clk_unregister(plat_data.hclk); ^~~~~~~~~~~~~~ drivers/net/ethernet/cadence/macb_pci.c: At top level: >> drivers/net/ethernet/cadence/macb_pci.c:149:1: warning: data definition has no type or storage class module_pci_driver(macb_pci_driver); ^~~~~~~~~~~~~~~~~ >> drivers/net/ethernet/cadence/macb_pci.c:149:1: error: type defaults to 'int' in declaration of 'module_pci_driver' [-Werror=implicit-int] >> drivers/net/ethernet/cadence/macb_pci.c:149:1: warning: parameter names (without types) in function declaration drivers/net/ethernet/cadence/macb_pci.c:142:26: warning: 'macb_pci_driver' defined but not used [-Wunused-variable] static struct pci_driver macb_pci_driver = { ^~~~~~~~~~~~~~~ cc1: some warnings being treated as errors vim +149 drivers/net/ethernet/cadence/macb_pci.c 79 GEM_PCLK_RATE); 80 if (IS_ERR(plat_data.pclk)) { 81 err = PTR_ERR(plat_data.pclk); 82 goto err_pclk_register; 83 } 84 > 85 plat_data.hclk = clk_register_fixed_rate(&pdev->dev, "hclk", NULL, 0, 86 GEM_HCLK_RATE); 87 if (IS_ERR(plat_data.hclk)) { 88 err = PTR_ERR(plat_data.hclk); 89 goto err_hclk_register; 90 } 91 92 /* set up platform device info */ 93 memset(&plat_info, 0, sizeof(plat_info)); 94 plat_info.parent = &pdev->dev; 95 plat_info.fwnode = pdev->dev.fwnode; 96 plat_info.name = PLAT_DRIVER_NAME; 97 plat_info.id = pdev->devfn; 98 plat_info.res = res; 99 plat_info.num_res = ARRAY_SIZE(res); 100 plat_info.data = &plat_data; 101 plat_info.size_data = sizeof(plat_data); 102 plat_info.dma_mask = DMA_BIT_MASK(32); 103 104 /* register platform device */ 105 plat_dev = platform_device_register_full(&plat_info); 106 if (IS_ERR(plat_dev)) { 107 err = PTR_ERR(plat_dev); 108 goto err_plat_dev_register; 109 } 110 111 pci_set_drvdata(pdev, plat_dev); 112 113 return 0; 114 115 err_plat_dev_register: > 116 clk_unregister(plat_data.hclk); 117 118 err_hclk_register: 119 clk_unregister(plat_data.pclk); 120 121 err_pclk_register: 122 pci_disable_device(pdev); 123 return err; 124 } 125 126 void macb_remove(struct pci_dev *pdev) 127 { 128 struct platform_device *plat_dev = pci_get_drvdata(pdev); 129 struct macb_platform_data *plat_data = dev_get_platdata(&plat_dev->dev); 130 131 platform_device_unregister(plat_dev); 132 pci_disable_device(pdev); 133 clk_unregister(plat_data->pclk); 134 clk_unregister(plat_data->hclk); 135 } 136 137 static struct pci_device_id dev_id_table[] = { 138 { PCI_DEVICE(CDNS_VENDOR_ID, CDNS_DEVICE_ID), }, 139 { 0, } 140 }; 141 142 static struct pci_driver macb_pci_driver = { 143 .name = PCI_DRIVER_NAME, 144 .id_table = dev_id_table, 145 .probe = macb_probe, 146 .remove = macb_remove, 147 }; 148 > 149 module_pci_driver(macb_pci_driver); 150 MODULE_DEVICE_TABLE(pci, dev_id_table); 151 MODULE_LICENSE("GPL"); 152 MODULE_DESCRIPTION("Cadence NIC PCI wrapper"); --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation [-- Attachment #2: .config.gz --] [-- Type: application/gzip, Size: 42460 bytes --] ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-12-12 15:01 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1481537461-9587-1-git-send-email-bfolta@cadence.com>
2016-12-12 10:29 ` [PATCH v2] net: macb: Added PCI wrapper for Platform Driver Bartosz Folta
2016-12-12 14:50 ` kbuild test robot
2016-12-12 15:00 ` kbuild test robot
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox