Skip to content

Commit 051a2e0

Browse files
davem330davem330
committed
Merge tag 'wireless-drivers-for-davem-2017-01-29' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers
Kalle Valo says: ==================== wireless-drivers fixes for 4.10 Most important here are fixes to two iwlwifi crashes, but there's also a firmware naming fix for iwlwifi and a revert of an older bcma patch. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
2 parents 4af0e5b + 2b1d530 commit 051a2e0

File tree

7 files changed

+22
-17
lines changed

7 files changed

+22
-17
lines changed

‎MAINTAINERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10195,7 +10195,6 @@ F: drivers/media/tuners/qt1010*
1019510195
QUALCOMM ATHEROS ATH9K WIRELESS DRIVER
1019610196
M: QCA ath9k Development <ath9k-devel@qca.qualcomm.com>
1019710197
L: linux-wireless@vger.kernel.org
10198-
L: ath9k-devel@lists.ath9k.org
1019910198
W: http://wireless.kernel.org/en/users/Drivers/ath9k
1020010199
S: Supported
1020110200
F: drivers/net/wireless/ath/ath9k/

‎drivers/bcma/bcma_private.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ int bcma_sprom_get(struct bcma_bus *bus);
4545
void bcma_core_chipcommon_early_init(struct bcma_drv_cc *cc);
4646
void bcma_core_chipcommon_init(struct bcma_drv_cc *cc);
4747
void bcma_chipco_bcm4331_ext_pa_lines_ctl(struct bcma_drv_cc *cc, bool enable);
48+
#ifdef CONFIG_BCMA_DRIVER_MIPS
49+
void bcma_chipco_serial_init(struct bcma_drv_cc *cc);
50+
#endif /* CONFIG_BCMA_DRIVER_MIPS */
4851

4952
/* driver_chipcommon_b.c */
5053
int bcma_core_chipcommon_b_init(struct bcma_drv_cc_b *ccb);

‎drivers/bcma/driver_chipcommon.c

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
#include <linux/platform_device.h>
1616
#include <linux/bcma/bcma.h>
1717

18-
static void bcma_chipco_serial_init(struct bcma_drv_cc *cc);
19-
2018
static inline u32 bcma_cc_write32_masked(struct bcma_drv_cc *cc, u16 offset,
2119
u32 mask, u32 value)
2220
{
@@ -186,9 +184,6 @@ void bcma_core_chipcommon_early_init(struct bcma_drv_cc *cc)
186184
if (cc->capabilities & BCMA_CC_CAP_PMU)
187185
bcma_pmu_early_init(cc);
188186

189-
if (IS_BUILTIN(CONFIG_BCM47XX) && bus->hosttype == BCMA_HOSTTYPE_SOC)
190-
bcma_chipco_serial_init(cc);
191-
192187
if (bus->hosttype == BCMA_HOSTTYPE_SOC)
193188
bcma_core_chipcommon_flash_detect(cc);
194189

@@ -378,9 +373,9 @@ u32 bcma_chipco_gpio_pulldown(struct bcma_drv_cc *cc, u32 mask, u32 value)
378373
return res;
379374
}
380375

381-
static void bcma_chipco_serial_init(struct bcma_drv_cc *cc)
376+
#ifdef CONFIG_BCMA_DRIVER_MIPS
377+
void bcma_chipco_serial_init(struct bcma_drv_cc *cc)
382378
{
383-
#if IS_BUILTIN(CONFIG_BCM47XX)
384379
unsigned int irq;
385380
u32 baud_base;
386381
u32 i;
@@ -422,5 +417,5 @@ static void bcma_chipco_serial_init(struct bcma_drv_cc *cc)
422417
ports[i].baud_base = baud_base;
423418
ports[i].reg_shift = 0;
424419
}
425-
#endif /* CONFIG_BCM47XX */
426420
}
421+
#endif /* CONFIG_BCMA_DRIVER_MIPS */

‎drivers/bcma/driver_mips.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,9 +278,12 @@ static void bcma_core_mips_nvram_init(struct bcma_drv_mips *mcore)
278278

279279
void bcma_core_mips_early_init(struct bcma_drv_mips *mcore)
280280
{
281+
struct bcma_bus *bus = mcore->core->bus;
282+
281283
if (mcore->early_setup_done)
282284
return;
283285

286+
bcma_chipco_serial_init(&bus->drv_cc);
284287
bcma_core_mips_nvram_init(mcore);
285288

286289
mcore->early_setup_done = true;

‎drivers/net/wireless/intel/iwlwifi/iwl-8000.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191

9292
#define IWL8000_FW_PRE "iwlwifi-8000C-"
9393
#define IWL8000_MODULE_FIRMWARE(api) \
94-
IWL8000_FW_PRE "-" __stringify(api) ".ucode"
94+
IWL8000_FW_PRE __stringify(api) ".ucode"
9595

9696
#define IWL8265_FW_PRE "iwlwifi-8265-"
9797
#define IWL8265_MODULE_FIRMWARE(api) \

‎drivers/net/wireless/intel/iwlwifi/mvm/sta.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1164,9 +1164,10 @@ static void iwl_mvm_realloc_queues_after_restart(struct iwl_mvm *mvm,
11641164
.frame_limit = IWL_FRAME_LIMIT,
11651165
};
11661166

1167-
/* Make sure reserved queue is still marked as such (or allocated) */
1168-
mvm->queue_info[mvm_sta->reserved_queue].status =
1169-
IWL_MVM_QUEUE_RESERVED;
1167+
/* Make sure reserved queue is still marked as such (if allocated) */
1168+
if (mvm_sta->reserved_queue != IEEE80211_INVAL_HW_QUEUE)
1169+
mvm->queue_info[mvm_sta->reserved_queue].status =
1170+
IWL_MVM_QUEUE_RESERVED;
11701171

11711172
for (i = 0; i <= IWL_MAX_TID_COUNT; i++) {
11721173
struct iwl_mvm_tid_data *tid_data = &mvm_sta->tid_data[i];

‎drivers/net/wireless/intel/iwlwifi/mvm/tt.c

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -843,8 +843,10 @@ static void iwl_mvm_thermal_zone_unregister(struct iwl_mvm *mvm)
843843
return;
844844

845845
IWL_DEBUG_TEMP(mvm, "Thermal zone device unregister\n");
846-
thermal_zone_device_unregister(mvm->tz_device.tzone);
847-
mvm->tz_device.tzone = NULL;
846+
if (mvm->tz_device.tzone) {
847+
thermal_zone_device_unregister(mvm->tz_device.tzone);
848+
mvm->tz_device.tzone = NULL;
849+
}
848850
}
849851

850852
static void iwl_mvm_cooling_device_unregister(struct iwl_mvm *mvm)
@@ -853,8 +855,10 @@ static void iwl_mvm_cooling_device_unregister(struct iwl_mvm *mvm)
853855
return;
854856

855857
IWL_DEBUG_TEMP(mvm, "Cooling device unregister\n");
856-
thermal_cooling_device_unregister(mvm->cooling_dev.cdev);
857-
mvm->cooling_dev.cdev = NULL;
858+
if (mvm->cooling_dev.cdev) {
859+
thermal_cooling_device_unregister(mvm->cooling_dev.cdev);
860+
mvm->cooling_dev.cdev = NULL;
861+
}
858862
}
859863
#endif /* CONFIG_THERMAL */
860864

0 commit comments

Comments
 (0)