target/linux/layerscape/patches-5.4/701-net-0036-sdk-dpa-use-netdev-dev-for-DMA-mapping.patch

   1 From e1ae30545347709590bab5f4a3c27e7f639c6ead Mon Sep 17 00:00:00 2001
   2 From: Madalin Bucur <madalin.bucur@nxp.com>
   3 Date: Wed, 18 Oct 2017 19:36:59 +0300
   4 Subject: [PATCH] sdk: dpa: use netdev dev for DMA mapping
   5
   6 Signed-off-by: Madalin Bucur <madalin.bucur@nxp.com>
   7 ---
   8  drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth.c |  2 +-
   9  .../ethernet/freescale/sdk_dpaa/dpaa_eth_base.c    |  2 +-
  10  .../ethernet/freescale/sdk_dpaa/dpaa_eth_common.c  | 35 ++++------------------
  11  .../ethernet/freescale/sdk_dpaa/dpaa_eth_common.h  |  2 +-
  12  4 files changed, 9 insertions(+), 32 deletions(-)
  13
  14 --- a/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth.c
  15 +++ b/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth.c
  16 @@ -875,7 +875,7 @@ static int dpa_priv_bp_create(struct net
  17
  18         for (i = 0; i < count; i++) {
  19                 int err;
  20 -               err = dpa_bp_alloc(&dpa_bp[i]);
  21 +               err = dpa_bp_alloc(&dpa_bp[i], net_dev->dev.parent);
  22                 if (err < 0) {
  23                         dpa_bp_free(priv);
  24                         priv->dpa_bp = NULL;
  25 --- a/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_base.c
  26 +++ b/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_base.c
  27 @@ -176,7 +176,7 @@ int dpa_bp_create(struct net_device *net
  28
  29         for (i = 0; i < count; i++) {
  30                 int err;
  31 -               err = dpa_bp_alloc(&dpa_bp[i]);
  32 +               err = dpa_bp_alloc(&dpa_bp[i], net_dev->dev.parent);
  33                 if (err < 0) {
  34                         dpa_bp_free(priv);
  35                         priv->dpa_bp = NULL;
  36 --- a/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_common.c
  37 +++ b/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_common.c
  38 @@ -686,11 +686,10 @@ void dpa_set_buffers_layout(struct mac_d
  39  EXPORT_SYMBOL(dpa_set_buffers_layout);
  40
  41  int __attribute__((nonnull))
  42 -dpa_bp_alloc(struct dpa_bp *dpa_bp)
  43 +dpa_bp_alloc(struct dpa_bp *dpa_bp, struct device *dev)
  44  {
  45         int err;
  46         struct bman_pool_params  bp_params;
  47 -       struct platform_device *pdev;
  48
  49         if (dpa_bp->size == 0 || dpa_bp->config_count == 0) {
  50                 pr_err("Buffer pool is not properly initialized! Missing size or initial number of buffers");
  51 @@ -723,44 +722,25 @@ dpa_bp_alloc(struct dpa_bp *dpa_bp)
  52
  53         dpa_bp->bpid = (uint8_t)bman_get_params(dpa_bp->pool)->bpid;
  54
  55 -       pdev = platform_device_register_simple("dpaa_eth_bpool",
  56 -                       dpa_bp->bpid, NULL, 0);
  57 -       if (IS_ERR(pdev)) {
  58 -               pr_err("platform_device_register_simple() failed\n");
  59 -               err = PTR_ERR(pdev);
  60 -               goto pdev_register_failed;
  61 -       }
  62 -       {
  63 -               struct dma_map_ops *ops = get_dma_ops(&pdev->dev);
  64 -               ops->dma_supported = NULL;
  65 -       }
  66 -       err = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(40));
  67 +       err = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(40));
  68         if (err) {
  69                 pr_err("dma_coerce_mask_and_coherent() failed\n");
  70 -               goto pdev_mask_failed;
  71 +               goto bman_free_pool;
  72         }
  73 -#ifdef CONFIG_FMAN_ARM
  74 -       /* force coherency */
  75 -       pdev->dev.archdata.dma_coherent = true;
  76 -       arch_setup_dma_ops(&pdev->dev, 0, 0, NULL, true);
  77 -#endif
  78
  79 -       dpa_bp->dev = &pdev->dev;
  80 +       dpa_bp->dev = dev;
  81
  82         if (dpa_bp->seed_cb) {
  83                 err = dpa_bp->seed_cb(dpa_bp);
  84                 if (err)
  85 -                       goto pool_seed_failed;
  86 +                       goto bman_free_pool;
  87         }
  88
  89         dpa_bpid2pool_map(dpa_bp->bpid, dpa_bp);
  90
  91         return 0;
  92
  93 -pool_seed_failed:
  94 -pdev_mask_failed:
  95 -       platform_device_unregister(pdev);
  96 -pdev_register_failed:
  97 +bman_free_pool:
  98         bman_free_pool(dpa_bp->pool);
  99
 100         return err;
 101 @@ -822,9 +802,6 @@ _dpa_bp_free(struct dpa_bp *dpa_bp)
 102
 103         dpa_bp_array[bp->bpid] = NULL;
 104         bman_free_pool(bp->pool);
 105 -
 106 -       if (bp->dev)
 107 -               platform_device_unregister(to_platform_device(bp->dev));
 108  }
 109
 110  void __cold __attribute__((nonnull))
 111 --- a/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_common.h
 112 +++ b/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_common.h
 113 @@ -163,7 +163,7 @@ void dpa_set_rx_mode(struct net_device *
 114  void dpa_set_buffers_layout(struct mac_device *mac_dev,
 115                 struct dpa_buffer_layout_s *layout);
 116  int __attribute__((nonnull))
 117 -dpa_bp_alloc(struct dpa_bp *dpa_bp);
 118 +dpa_bp_alloc(struct dpa_bp *dpa_bp, struct device *dev);
 119  void __cold __attribute__((nonnull))
 120  dpa_bp_free(struct dpa_priv_s *priv);
 121  struct dpa_bp *dpa_bpid2pool(int bpid);