iwmc3200wifi: replace netif_rx with netif_rx_ni
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/4 iwmc3200wifi: replace netif_rx with netif_rx_ni
The patch uses netif_rx_ni() over netif_rx() to post buffers to upper network code because it is always scheduled in a workqueue. The problem was first observed from a dynamic ticks warning:
"NOHZ: local_softirq_pending ..."
--- drivers/net/wireless/iwmc3200wifi/rx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/wireless/iwmc3200wifi/rx.c +1 -1
@@ -1373,7 +1373,7 @@ static void iwm_rx_process_packet(struct iwm_priv *iwm, ndev->stats.rx_packets++; ndev->stats.rx_bytes += skb->len; -if (netif_rx (skb) ==NET_RX_DROP ) { +if (netif_rx_ni (skb) ==NET_RX_DROP ) {IWM_ERR (iwm,"Packet dropped\n" ); ndev->stats.rx_dropped++; }
Signature · 1 line
1.6.0.4
PATCH 2/4 iwmc3200wifi: simplify calibration map
The patch simplifies calibration map by combining the init_calib_map and periodic_calib_map into one calib_map in struct iwm_conf. Now the initial calibration map is stored in the lower 16 bits of calib_map and the periodic calibration map is stored in the higher 16 bits.
--- drivers/net/wireless/iwmc3200wifi/fw.c | 19 +++++++++++-------- drivers/net/wireless/iwmc3200wifi/iwm.h | 3 +-- drivers/net/wireless/iwmc3200wifi/lmac.h | 4 ++++ drivers/net/wireless/iwmc3200wifi/main.c | 6 +----- 4 files changed, 17 insertions(+), 15 deletions(-)
drivers/net/wireless/iwmc3200wifi/fw.c +11 -8
@@ -275,6 +275,7 @@ static int iwm_load_lmac(struct iwm_priv *iwm, const char *img_name)*/ int iwm_load_fw (struct iwm_priv *iwm) { +unsigned long init_calib_map, periodic_calib_map;int ret;/* We first start downloading the UMAC */
@@ -315,23 +316,25 @@ int iwm_load_fw(struct iwm_priv *iwm)return ret; } + init_calib_map = iwm->conf.calib_map &IWM_CALIB_MAP_INIT_MSK ; + periodic_calib_map =IWM_CALIB_MAP_PER_LMAC (iwm->conf.calib_map); +#ifdef CONFIG_IWM_B0_HW_SUPPORT if (iwm->conf.hw_b0) { -clear_bit (PHY_CALIBRATE_RX_IQ_CMD , &iwm->conf.init_calib_map); -clear_bit (PHY_CALIBRATE_RX_IQ_CMD , - &iwm->conf.periodic_calib_map); +clear_bit (PHY_CALIBRATE_RX_IQ_CMD , &init_calib_map); +clear_bit (PHY_CALIBRATE_RX_IQ_CMD , &periodic_calib_map); }#endif /* Read RX IQ calibration result from EEPROM */ -if (test_bit (PHY_CALIBRATE_RX_IQ_CMD , &iwm->conf.init_calib_map)) { +if (test_bit (PHY_CALIBRATE_RX_IQ_CMD , &init_calib_map)) {iwm_store_rxiq_calib_result (iwm);set_bit (PHY_CALIBRATE_RX_IQ_CMD , &iwm->calib_done_map); }iwm_send_prio_table (iwm); -iwm_send_init_calib_cfg (iwm, iwm->conf.init_calib_map); +iwm_send_init_calib_cfg (iwm, init_calib_map); -while (iwm->calib_done_map != iwm->conf.init_calib_map) { +while (iwm->calib_done_map != init_calib_map) { ret =iwm_notif_handle (iwm,CALIBRATION_RES_NOTIFICATION ,IWM_SRC_LMAC ,WAIT_NOTIF_TIMEOUT );if (ret) {
@@ -340,7 +343,7 @@ int iwm_load_fw(struct iwm_priv *iwm) }IWM_DBG_FW (iwm,DBG ,"Got calibration result. calib_done_map: " "0x%lx, requested calibrations: 0x%lx\n" , - iwm->calib_done_map, iwm->conf.init_calib_map); + iwm->calib_done_map, init_calib_map); }/* Handle LMAC CALIBRATION_COMPLETE notification */
@@ -378,7 +381,7 @@ int iwm_load_fw(struct iwm_priv *iwm)iwm_send_prio_table (iwm);iwm_send_calib_results (iwm); -iwm_send_periodic_calib_cfg (iwm, iwm->conf.periodic_calib_map); +iwm_send_periodic_calib_cfg (iwm, periodic_calib_map);return 0 ;
drivers/net/wireless/iwmc3200wifi/iwm.h +1 -2
@@ -65,8 +65,7 @@struct iwm_conf {u32 sdio_ior_timeout; -unsigned long init_calib_map; -unsigned long periodic_calib_map; +unsigned long calib_map;bool reset_on_fatal_err;bool auto_connect;bool wimax_not_present;
drivers/net/wireless/iwmc3200wifi/lmac.h +4 -0
@@ -396,6 +396,10 @@ enum { CALIBRATION_CMD_NUM, }; +#define IWM_CALIB_MAP_INIT_MSK 0xFFFF +#define IWM_CALIB_MAP_PER_LMAC (m) ((m & 0xFF0000) >> 16) +#define IWM_CALIB_MAP_PER_UMAC (m) ((m & 0xFF000000) >> 24) +struct iwm_lmac_calib_hdr {u8 opcode;u8 first_grp;
drivers/net/wireless/iwmc3200wifi/main.c +1 -5
@@ -53,11 +53,7 @@static struct iwm_conf def_iwm_conf = { .sdio_ior_timeout =5000 , - .init_calib_map =BIT (PHY_CALIBRATE_DC_CMD ) | -BIT (PHY_CALIBRATE_LO_CMD ) | -BIT (PHY_CALIBRATE_TX_IQ_CMD ) | -BIT (PHY_CALIBRATE_RX_IQ_CMD ), - .periodic_calib_map =BIT (PHY_CALIBRATE_DC_CMD ) | + .calib_map =BIT (PHY_CALIBRATE_DC_CMD ) |BIT (PHY_CALIBRATE_LO_CMD ) |BIT (PHY_CALIBRATE_TX_IQ_CMD ) | BIT(PHY_CALIBRATE_RX_IQ_CMD) |
Signature · 1 line
1.6.0.4
PATCH 3/4 iwmc3200wifi: remove B0 hardware support
The patch removes B0 hardware support. Nobody is using it anyway.
--- drivers/net/wireless/iwmc3200wifi/eeprom.c | 4 ---- drivers/net/wireless/iwmc3200wifi/fw.c | 6 ------ drivers/net/wireless/iwmc3200wifi/iwm.h | 5 ----- drivers/net/wireless/iwmc3200wifi/main.c | 7 ------- drivers/net/wireless/iwmc3200wifi/rx.c | 7 ------- 5 files changed, 0 insertions(+), 29 deletions(-)
drivers/net/wireless/iwmc3200wifi/eeprom.c +0 -4
@@ -156,10 +156,6 @@ int iwm_eeprom_init(struct iwm_priv *iwm)return -ENOMEM ;for (i =IWM_EEPROM_FIRST ; i <IWM_EEPROM_LAST ; i++) { -#ifdef CONFIG_IWM_B0_HW_SUPPORT -if (iwm->conf.hw_b0 && (i >=IWM_EEPROM_INDIRECT_OFFSET )) -break ; -#endif ret =iwm_eeprom_read (iwm, i);if (ret <0 ) { IWM_ERR(iwm, "Couldn't read eeprom entry #%d: %s\n",
drivers/net/wireless/iwmc3200wifi/fw.c +0 -6
@@ -319,12 +319,6 @@ int iwm_load_fw(struct iwm_priv *iwm) init_calib_map = iwm->conf.calib_map &IWM_CALIB_MAP_INIT_MSK ; periodic_calib_map =IWM_CALIB_MAP_PER_LMAC (iwm->conf.calib_map); -#ifdef CONFIG_IWM_B0_HW_SUPPORT -if (iwm->conf.hw_b0) { -clear_bit (PHY_CALIBRATE_RX_IQ_CMD , &init_calib_map); -clear_bit (PHY_CALIBRATE_RX_IQ_CMD , &periodic_calib_map); - } -#endif /* Read RX IQ calibration result from EEPROM */ if (test_bit (PHY_CALIBRATE_RX_IQ_CMD , &init_calib_map)) {iwm_store_rxiq_calib_result (iwm);
drivers/net/wireless/iwmc3200wifi/iwm.h +0 -5
@@ -52,8 +52,6 @@#define IWM_COPYRIGHT "Copyright(c) 2009 Intel Corporation"#define IWM_AUTHOR "<[email protected]>" -#define CONFIG_IWM_B0_HW_SUPPORT 1 -#define IWM_SRC_LMAC UMAC_HDI_IN_SOURCE_FHRX#define IWM_SRC_UDMA UMAC_HDI_IN_SOURCE_UDMA#define IWM_SRC_UMAC UMAC_HDI_IN_SOURCE_FW
@@ -86,9 +84,6 @@ struct iwm_conf {u8 ibss_channel;u8 mac_addr[ETH_ALEN ]; -#ifdef CONFIG_IWM_B0_HW_SUPPORT -bool hw_b0; -#endif };enum {
drivers/net/wireless/iwmc3200wifi/main.c +0 -7
@@ -515,13 +515,6 @@ static int iwm_channels_init(struct iwm_priv *iwm) {int ret; -#ifdef CONFIG_IWM_B0_HW_SUPPORT -if (iwm->conf.hw_b0) { -IWM_INFO (iwm,"Workaround EEPROM channels for B0 hardware\n" ); -return 0 ; - } -#endif - ret =iwm_send_umac_channel_list (iwm);if (ret) {IWM_ERR (iwm,"Send channel list failed\n" );
drivers/net/wireless/iwmc3200wifi/rx.c +0 -7
@@ -924,13 +924,6 @@ static int iwm_ntf_eeprom_proxy(struct iwm_priv *iwm, u8 *buf,if ((hdr_offset + hdr_len) >IWM_EEPROM_LEN )return -EINVAL ; -#ifdef CONFIG_IWM_B0_HW_SUPPORT -if (hdr_offset ==IWM_EEPROM_SKU_CAP_OFF ) { -if (eeprom_proxy->buf[0 ] ==0xff ) - iwm->conf.hw_b0 =1 ; - } -#endif -switch (hdr_type) {case IWM_UMAC_CMD_EEPROM_TYPE_READ :memcpy (iwm->eeprom + hdr_offset, eeprom_proxy->buf, hdr_len);
Signature · 1 line
1.6.0.4
PATCH 4/4 iwmc3200wifi: fix NULL pointer dereference in iwm_if_free
The driver private data is now based on wiphy. So we should not touch the private data after wiphy_free() is called. The patch fixes the potential NULL pointer dereference by making the iwm_wdev_free() the last one on the interface removal path.
--- drivers/net/wireless/iwmc3200wifi/netdev.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/iwmc3200wifi/netdev.c +3 -3
@@ -155,11 +155,11 @@ void iwm_if_free(struct iwm_priv *iwm)if (!iwm_to_ndev (iwm))return ; -free_netdev (iwm_to_ndev (iwm)); -iwm_wdev_free (iwm); -iwm_priv_deinit (iwm);kfree (iwm->umac_profile); iwm->umac_profile =NULL ; +free_netdev (iwm_to_ndev (iwm)); +iwm_priv_deinit (iwm); +iwm_wdev_free (iwm); }int iwm_if_add (struct iwm_priv *iwm)
Signature · 1 line
1.6.0.4