2 files changed, 138 insertions, 96 deletions

diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c
index 7bf3682cdf47..70fa6887f940 100644
--- a/drivers/net/ethernet/freescale/gianfar.c
+++ b/drivers/net/ethernet/freescale/gianfar.c
@@ -158,7 +158,7 @@ static void gfar_init_rxbdp(struct gfar_priv_rx_q *rx_queue, struct rxbd8 *bdp,
 {
         u32 lstatus;
 
-        bdp->bufPtr = buf;
+        bdp->bufPtr = cpu_to_be32(buf);
 
         lstatus = BD_LFLAG(RXBD_EMPTY | RXBD_INTERRUPT);
         if (bdp == rx_queue->rx_bd_base + rx_queue->rx_ring_size - 1)
@@ -166,7 +166,7 @@ static void gfar_init_rxbdp(struct gfar_priv_rx_q *rx_queue, struct rxbd8 *bdp,
 
         gfar_wmb();
 
-        bdp->lstatus = lstatus;
+        bdp->lstatus = cpu_to_be32(lstatus);
 }
 
 static int gfar_init_bds(struct net_device *ndev)
@@ -200,7 +200,8 @@ static int gfar_init_bds(struct net_device *ndev)
 
                 /* Set the last descriptor in the ring to indicate wrap */
                 txbdp--;
-                txbdp->status |= TXBD_WRAP;
+                txbdp->status = cpu_to_be16(be16_to_cpu(txbdp->status) |
+                                            TXBD_WRAP);
         }
 
         rfbptr = &regs->rfbptr0;
@@ -214,7 +215,7 @@ static int gfar_init_bds(struct net_device *ndev)
                         struct sk_buff *skb = rx_queue->rx_skbuff[j];
 
                         if (skb) {
-                                bufaddr = rxbdp->bufPtr;
+                                bufaddr = be32_to_cpu(rxbdp->bufPtr);
                         } else {
                                 skb = gfar_new_skb(ndev, &bufaddr);
                                 if (!skb) {
@@ -696,19 +697,28 @@ static int gfar_parse_group(struct device_node *np,
         grp->priv = priv;
         spin_lock_init(&grp->grplock);
         if (priv->mode == MQ_MG_MODE) {
-                u32 *rxq_mask, *txq_mask;
-                rxq_mask = (u32 *)of_get_property(np, "fsl,rx-bit-map", NULL);
-                txq_mask = (u32 *)of_get_property(np, "fsl,tx-bit-map", NULL);
+                u32 rxq_mask, txq_mask;
+                int ret;
+
+                grp->rx_bit_map = (DEFAULT_MAPPING >> priv->num_grps);
+                grp->tx_bit_map = (DEFAULT_MAPPING >> priv->num_grps);
+
+                ret = of_property_read_u32(np, "fsl,rx-bit-map", &rxq_mask);
+                if (!ret) {
+                        grp->rx_bit_map = rxq_mask ?
+                        rxq_mask : (DEFAULT_MAPPING >> priv->num_grps);
+                }
+
+                ret = of_property_read_u32(np, "fsl,tx-bit-map", &txq_mask);
+                if (!ret) {
+                        grp->tx_bit_map = txq_mask ?
+                        txq_mask : (DEFAULT_MAPPING >> priv->num_grps);
+                }
 
                 if (priv->poll_mode == GFAR_SQ_POLLING) {
                         /* One Q per interrupt group: Q0 to G0, Q1 to G1 */
                         grp->rx_bit_map = (DEFAULT_MAPPING >> priv->num_grps);
                         grp->tx_bit_map = (DEFAULT_MAPPING >> priv->num_grps);
-                } else { /* GFAR_MQ_POLLING */
-                        grp->rx_bit_map = rxq_mask ?
-                        *rxq_mask : (DEFAULT_MAPPING >> priv->num_grps);
-                        grp->tx_bit_map = txq_mask ?
-                        *txq_mask : (DEFAULT_MAPPING >> priv->num_grps);
                 }
         } else {
                 grp->rx_bit_map = 0xFF;
@@ -769,11 +779,10 @@ static int gfar_of_init(struct platform_device *ofdev, struct net_device **pdev)
         struct gfar_private *priv = NULL;
         struct device_node *np = ofdev->dev.of_node;
         struct device_node *child = NULL;
-        const u32 *stash;
-        const u32 *stash_len;
-        const u32 *stash_idx;
+        struct property *stash;
+        u32 stash_len = 0;
+        u32 stash_idx = 0;
         unsigned int num_tx_qs, num_rx_qs;
-        u32 *tx_queues, *rx_queues;
         unsigned short mode, poll_mode;
 
         if (!np)
@@ -787,10 +796,6 @@ static int gfar_of_init(struct platform_device *ofdev, struct net_device **pdev)
                 poll_mode = GFAR_SQ_POLLING;
         }
 
-        /* parse the num of HW tx and rx queues */
-        tx_queues = (u32 *)of_get_property(np, "fsl,num_tx_queues", NULL);
-        rx_queues = (u32 *)of_get_property(np, "fsl,num_rx_queues", NULL);
-
         if (mode == SQ_SG_MODE) {
                 num_tx_qs = 1;
                 num_rx_qs = 1;
@@ -809,8 +814,17 @@ static int gfar_of_init(struct platform_device *ofdev, struct net_device **pdev)
                         num_tx_qs = num_grps; /* one txq per int group */
                         num_rx_qs = num_grps; /* one rxq per int group */
                 } else { /* GFAR_MQ_POLLING */
-                        num_tx_qs = tx_queues ? *tx_queues : 1;
-                        num_rx_qs = rx_queues ? *rx_queues : 1;
+                        u32 tx_queues, rx_queues;
+                        int ret;
+
+                        /* parse the num of HW tx and rx queues */
+                        ret = of_property_read_u32(np, "fsl,num_tx_queues",
+                                                   &tx_queues);
+                        num_tx_qs = ret ? 1 : tx_queues;
+
+                        ret = of_property_read_u32(np, "fsl,num_rx_queues",
+                                                   &rx_queues);
+                        num_rx_qs = ret ? 1 : rx_queues;
                 }
         }
 
@@ -851,13 +865,17 @@ static int gfar_of_init(struct platform_device *ofdev, struct net_device **pdev)
         if (err)
                 goto rx_alloc_failed;
 
+        err = of_property_read_string(np, "model", &model);
+        if (err) {
+                pr_err("Device model property missing, aborting\n");
+                goto rx_alloc_failed;
+        }
+
         /* Init Rx queue filer rule set linked list */
         INIT_LIST_HEAD(&priv->rx_list.list);
         priv->rx_list.count = 0;
         mutex_init(&priv->rx_queue_access);
 
-        model = of_get_property(np, "model", NULL);
-
         for (i = 0; i < MAXGROUPS; i++)
                 priv->gfargrp[i].regs = NULL;
 
@@ -877,22 +895,22 @@ static int gfar_of_init(struct platform_device *ofdev, struct net_device **pdev)
                         goto err_grp_init;
         }
 
-        stash = of_get_property(np, "bd-stash", NULL);
+        stash = of_find_property(np, "bd-stash", NULL);
 
         if (stash) {
                 priv->device_flags |= FSL_GIANFAR_DEV_HAS_BD_STASHING;
                 priv->bd_stash_en = 1;
         }