Merge tag 'powerpc-5.9-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[linux-2.6-microblaze.git] / drivers / net / ethernet / sfc / ef100_nic.c

diff --git a/drivers/net/ethernet/sfc/ef100_nic.c b/drivers/net/ethernet/sfc/ef100_nic.c
index 36598d0..19fe86b 100644 (file)
--- a/drivers/net/ethernet/sfc/ef100_nic.c
+++ b/drivers/net/ethernet/sfc/ef100_nic.c
@@ -431,18 +431,18 @@ static int ef100_reset(struct efx_nic *efx, enum reset_type reset_type)
                /* A RESET_TYPE_ALL will cause filters to be removed, so we remove filters
                 * and reprobe after reset to avoid removing filters twice
                 */
-               down_read(&efx->filter_sem);
+               down_write(&efx->filter_sem);
                ef100_filter_table_down(efx);
-               up_read(&efx->filter_sem);
+               up_write(&efx->filter_sem);
                rc = efx_mcdi_reset(efx, reset_type);
                if (rc)
                        return rc;
 
                netif_device_attach(efx->net_dev);
 
-               down_read(&efx->filter_sem);
+               down_write(&efx->filter_sem);
                rc = ef100_filter_table_up(efx);
-               up_read(&efx->filter_sem);
+               up_write(&efx->filter_sem);
                if (rc)
                        return rc;
 
@@ -739,6 +739,7 @@ const struct efx_nic_type ef100_pf_nic_type = {
        .rx_remove = efx_mcdi_rx_remove,
        .rx_write = ef100_rx_write,
        .rx_packet = __ef100_rx_packet,
+       .rx_buf_hash_valid = ef100_rx_buf_hash_valid,
        .fini_dmaq = efx_fini_dmaq,
        .max_rx_ip_filters = EFX_MCDI_FILTER_TBL_ROWS,
        .filter_table_probe = ef100_filter_table_up,
@@ -820,6 +821,7 @@ const struct efx_nic_type ef100_vf_nic_type = {
        .rx_remove = efx_mcdi_rx_remove,
        .rx_write = ef100_rx_write,
        .rx_packet = __ef100_rx_packet,
+       .rx_buf_hash_valid = ef100_rx_buf_hash_valid,
        .fini_dmaq = efx_fini_dmaq,
        .max_rx_ip_filters = EFX_MCDI_FILTER_TBL_ROWS,
        .filter_table_probe = ef100_filter_table_up,
@@ -979,7 +981,8 @@ static int ef100_process_design_param(struct efx_nic *efx,
                 * EFX_MIN_DMAQ_SIZE is divisible by GRANULARITY.
                 * This is very unlikely to fail.
                 */
-               if (EFX_MIN_DMAQ_SIZE % reader->value) {
+               if (!reader->value || reader->value > EFX_MIN_DMAQ_SIZE ||
+                   EFX_MIN_DMAQ_SIZE % (u32)reader->value) {
                        netif_err(efx, probe, efx->net_dev,
                                  "%s size granularity is %llu, can't guarantee safety\n",
                                  reader->type == ESE_EF100_DP_GZ_RXQ_SIZE_GRANULARITY ? "RXQ" : "TXQ",