target/linux/generic/pending-4.4/071-v4.8-0002-net-ethernet-bgmac-add-dma_dev-pointer.patch

   1 From a0b68486f6f680c7c0352a47c60042d7d95ffd87 Mon Sep 17 00:00:00 2001
   2 From: Jon Mason <jon.mason@broadcom.com>
   3 Date: Thu, 7 Jul 2016 19:08:54 -0400
   4 Subject: [PATCH 2/5] net: ethernet: bgmac: add dma_dev pointer
   5
   6 The dma buffer allocation, etc references a dma_dev device pointer from
   7 the bcma core.  In anticipation of removing the bcma requirement for
   8 this driver, these must be changed to not reference that struct.  Add a
   9 dma_dev device pointer to the bgmac stuct and reference that instead.
  10
  11 Signed-off-by: Jon Mason <jon.mason@broadcom.com>
  12 Acked-by: Arnd Bergmann <arnd@arndb.de>
  13 Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
  14 Tested-by: Florian Fainelli <f.fainelli@gmail.com>
  15 Signed-off-by: David S. Miller <davem@davemloft.net>
  16 ---
  17  drivers/net/ethernet/broadcom/bgmac.c | 17 +++++++++--------
  18  drivers/net/ethernet/broadcom/bgmac.h |  1 +
  19  2 files changed, 10 insertions(+), 8 deletions(-)
  20
  21 --- a/drivers/net/ethernet/broadcom/bgmac.c
  22 +++ b/drivers/net/ethernet/broadcom/bgmac.c
  23 @@ -152,7 +152,7 @@ static netdev_tx_t bgmac_dma_tx_add(stru
  24                                     struct bgmac_dma_ring *ring,
  25                                     struct sk_buff *skb)
  26  {
  27 -       struct device *dma_dev = bgmac->core->dma_dev;
  28 +       struct device *dma_dev = bgmac->dma_dev;
  29         struct net_device *net_dev = bgmac->net_dev;
  30         int index = ring->end % BGMAC_TX_RING_SLOTS;
  31         struct bgmac_slot_info *slot = &ring->slots[index];
  32 @@ -254,7 +254,7 @@ err_drop:
  33  /* Free transmitted packets */
  34  static void bgmac_dma_tx_free(struct bgmac *bgmac, struct bgmac_dma_ring *ring)
  35  {
  36 -       struct device *dma_dev = bgmac->core->dma_dev;
  37 +       struct device *dma_dev = bgmac->dma_dev;
  38         int empty_slot;
  39         bool freed = false;
  40         unsigned bytes_compl = 0, pkts_compl = 0;
  41 @@ -355,7 +355,7 @@ static void bgmac_dma_rx_enable(struct b
  42  static int bgmac_dma_rx_skb_for_slot(struct bgmac *bgmac,
  43                                      struct bgmac_slot_info *slot)
  44  {
  45 -       struct device *dma_dev = bgmac->core->dma_dev;
  46 +       struct device *dma_dev = bgmac->dma_dev;
  47         dma_addr_t dma_addr;
  48         struct bgmac_rx_header *rx;
  49         void *buf;
  50 @@ -444,7 +444,7 @@ static int bgmac_dma_rx_read(struct bgma
  51         end_slot /= sizeof(struct bgmac_dma_desc);
  52
  53         while (ring->start != end_slot) {
  54 -               struct device *dma_dev = bgmac->core->dma_dev;
  55 +               struct device *dma_dev = bgmac->dma_dev;
  56                 struct bgmac_slot_info *slot = &ring->slots[ring->start];
  57                 struct bgmac_rx_header *rx = slot->buf + BGMAC_RX_BUF_OFFSET;
  58                 struct sk_buff *skb;
  59 @@ -547,7 +547,7 @@ static bool bgmac_dma_unaligned(struct b
  60  static void bgmac_dma_tx_ring_free(struct bgmac *bgmac,
  61                                    struct bgmac_dma_ring *ring)
  62  {
  63 -       struct device *dma_dev = bgmac->core->dma_dev;
  64 +       struct device *dma_dev = bgmac->dma_dev;
  65         struct bgmac_dma_desc *dma_desc = ring->cpu_base;
  66         struct bgmac_slot_info *slot;
  67         int i;
  68 @@ -573,7 +573,7 @@ static void bgmac_dma_tx_ring_free(struc
  69  static void bgmac_dma_rx_ring_free(struct bgmac *bgmac,
  70                                    struct bgmac_dma_ring *ring)
  71  {
  72 -       struct device *dma_dev = bgmac->core->dma_dev;
  73 +       struct device *dma_dev = bgmac->dma_dev;
  74         struct bgmac_slot_info *slot;
  75         int i;
  76
  77 @@ -594,7 +594,7 @@ static void bgmac_dma_ring_desc_free(str
  78                                      struct bgmac_dma_ring *ring,
  79                                      int num_slots)
  80  {
  81 -       struct device *dma_dev = bgmac->core->dma_dev;
  82 +       struct device *dma_dev = bgmac->dma_dev;
  83         int size;
  84
  85         if (!ring->cpu_base)
  86 @@ -632,7 +632,7 @@ static void bgmac_dma_free(struct bgmac
  87
  88  static int bgmac_dma_alloc(struct bgmac *bgmac)
  89  {
  90 -       struct device *dma_dev = bgmac->core->dma_dev;
  91 +       struct device *dma_dev = bgmac->dma_dev;
  92         struct bgmac_dma_ring *ring;
  93         static const u16 ring_base[] = { BGMAC_DMA_BASE0, BGMAC_DMA_BASE1,
  94                                          BGMAC_DMA_BASE2, BGMAC_DMA_BASE3, };
  95 @@ -1733,6 +1733,7 @@ static int bgmac_probe(struct bcma_devic
  96         net_dev->ethtool_ops = &bgmac_ethtool_ops;
  97         bgmac = netdev_priv(net_dev);
  98         bgmac->dev = &core->dev;
  99 +       bgmac->dma_dev = core->dma_dev;
 100         bgmac->net_dev = net_dev;
 101         bgmac->core = core;
 102         bcma_set_drvdata(core, bgmac);
 103 --- a/drivers/net/ethernet/broadcom/bgmac.h
 104 +++ b/drivers/net/ethernet/broadcom/bgmac.h
 105 @@ -429,6 +429,7 @@ struct bgmac {
 106         struct bcma_device *cmn; /* Reference to CMN core for BCM4706 */
 107
 108         struct device *dev;
 109 +       struct device *dma_dev;
 110         struct net_device *net_dev;
 111         struct napi_struct napi;
 112         struct mii_bus *mii_bus;