Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next

7 files changed, 24 insertions, 14 deletions

diff --git a/drivers/net/ethernet/sfc/bitfield.h b/drivers/net/ethernet/sfc/bitfield.h
index a2a9f40b90cf..b26a954c27fc 100644
--- a/drivers/net/ethernet/sfc/bitfield.h
+++ b/drivers/net/ethernet/sfc/bitfield.h
@@ -531,8 +531,8 @@ typedef union efx_oword {
 
 
 /* Static initialiser */
-#define EFX_OWORD32(a, b, c, d)                                         \
-        { .u32 = { cpu_to_le32(a), cpu_to_le32(b), \
+#define EFX_OWORD32(a, b, c, d)                         \
+        { .u32 = { cpu_to_le32(a), cpu_to_le32(b),      \
                    cpu_to_le32(c), cpu_to_le32(d) } }
 
 #endif /* EFX_BITFIELD_H */
diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
index ac571cf14485..c7004dcb5838 100644
--- a/drivers/net/ethernet/sfc/efx.c
+++ b/drivers/net/ethernet/sfc/efx.c
@@ -585,7 +585,12 @@ static int efx_probe_channels(struct efx_nic *efx)
         /* Restart special buffer allocation */
         efx->next_buffer_table = 0;
 
-        efx_for_each_channel(channel, efx) {
+        /* Probe channels in reverse, so that any 'extra' channels
+         * use the start of the buffer table. This allows the traffic
+         * channels to be resized without moving them or wasting the
+         * entries before them.
+         */
+        efx_for_each_channel_rev(channel, efx) {
                 rc = efx_probe_channel(channel);
                 if (rc) {
                         netif_err(efx, probe, efx->net_dev,
diff --git a/drivers/net/ethernet/sfc/mcdi_mon.c b/drivers/net/ethernet/sfc/mcdi_mon.c
index 8a72c10b9a6c..fb7f65b59eb8 100644
--- a/drivers/net/ethernet/sfc/mcdi_mon.c
+++ b/drivers/net/ethernet/sfc/mcdi_mon.c
@@ -37,7 +37,7 @@ static const struct {
         SENSOR(PHY0_TEMP,          "PHY temp.",            EFX_HWMON_TEMP, 0),
         SENSOR(PHY0_COOLING,       "PHY cooling",          EFX_HWMON_COOL, 0),
         SENSOR(PHY1_TEMP,          "PHY temp.",            EFX_HWMON_TEMP, 1),
-        SENSOR(PHY1_COOLING,       "PHY cooling",          EFX_HWMON_COOL, 1),
+        SENSOR(PHY1_COOLING,       "PHY cooling",          EFX_HWMON_COOL, 1),
         SENSOR(IN_1V0,             "1.0V supply",          EFX_HWMON_IN,   -1),
         SENSOR(IN_1V2,             "1.2V supply",          EFX_HWMON_IN,   -1),
         SENSOR(IN_1V8,             "1.8V supply",          EFX_HWMON_IN,   -1),
diff --git a/drivers/net/ethernet/sfc/net_driver.h b/drivers/net/ethernet/sfc/net_driver.h
index 3fbec458c323..0b95505e8968 100644
--- a/drivers/net/ethernet/sfc/net_driver.h
+++ b/drivers/net/ethernet/sfc/net_driver.h
@@ -1030,9 +1030,12 @@ static inline bool efx_tx_queue_used(struct efx_tx_queue *tx_queue)
 
 /* Iterate over all possible TX queues belonging to a channel */
 #define efx_for_each_possible_channel_tx_queue(_tx_queue, _channel)     \
-        for (_tx_queue = (_channel)->tx_queue;                          \
-             _tx_queue < (_channel)->tx_queue + EFX_TXQ_TYPES;          \
-             _tx_queue++)
+        if (!efx_channel_has_tx_queues(_channel))                       \
+                ;                                                       \
+        else                                                            \
+                for (_tx_queue = (_channel)->tx_queue;                  \
+                     _tx_queue < (_channel)->tx_queue + EFX_TXQ_TYPES;  \
+                     _tx_queue++)
 
 static inline bool efx_channel_has_rx_queue(struct efx_channel *channel)
 {
diff --git a/drivers/net/ethernet/sfc/siena_sriov.c b/drivers/net/ethernet/sfc/siena_sriov.c
index 5c6839ec3a83..80976e84eee6 100644
--- a/drivers/net/ethernet/sfc/siena_sriov.c
+++ b/drivers/net/ethernet/sfc/siena_sriov.c
@@ -796,12 +796,13 @@ static int efx_vfdi_set_status_page(struct efx_vf *vf)
 {
         struct efx_nic *efx = vf->efx;
         struct vfdi_req *req = vf->buf.addr;
-        unsigned int page_count;
+        u64 page_count = req->u.set_status_page.peer_page_count;
+        u64 max_page_count =
+                (EFX_PAGE_SIZE -
+                 offsetof(struct vfdi_req, u.set_status_page.peer_page_addr[0]))
+                / sizeof(req->u.set_status_page.peer_page_addr[0]);
 
-        page_count = req->u.set_status_page.peer_page_count;
-        if (!req->u.set_status_page.dma_addr || EFX_PAGE_SIZE <
-            offsetof(struct vfdi_req,
-                     u.set_status_page.peer_page_addr[page_count])) {
+        if (!req->u.set_status_page.dma_addr || page_count > max_page_count) {
                 if (net_ratelimit())
                         netif_err(efx, hw, efx->net_dev,
                                   "ERROR: Invalid SET_STATUS_PAGE from %s\n",
diff --git a/drivers/net/ethernet/sfc/tx.c b/drivers/net/ethernet/sfc/tx.c
index a096e287e95f..94d0365b31cd 100644
--- a/drivers/net/ethernet/sfc/tx.c
+++ b/drivers/net/ethernet/sfc/tx.c
@@ -339,7 +339,7 @@ static void efx_dequeue_buffers(struct efx_tx_queue *tx_queue,
  * OS to free the skb.
  */
 netdev_tx_t efx_hard_start_xmit(struct sk_buff *skb,
-                                      struct net_device *net_dev)
+                                struct net_device *net_dev)
 {
         struct efx_nic *efx = netdev_priv(net_dev);
         struct efx_tx_queue *tx_queue;
diff --git a/drivers/net/ethernet/sfc/vfdi.h b/drivers/net/ethernet/sfc/vfdi.h
index 656fa70f9993..225557caaf5a 100644
--- a/drivers/net/ethernet/sfc/vfdi.h
+++ b/drivers/net/ethernet/sfc/vfdi.h
@@ -152,7 +152,8 @@ enum vfdi_op {
  *      all traffic at this receive queue.
  * @u.mac_filter.flags: MAC filter flags.
  * @u.set_status_page.dma_addr: Base address for the &struct vfdi_status.
- *      This address must be such that the structure fits within a page.
+ *      This address must be page-aligned and the PF may write up to a
+ *      whole page (allowing for extension of the structure).
  * @u.set_status_page.peer_page_count: Number of additional pages the VF
  *      has provided into which peer addresses may be DMAd.
  * @u.set_status_page.peer_page_addr: Array of DMA addresses of pages.