From patchwork Wed Mar 9 19:12:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emmanuel Grumbach X-Patchwork-Id: 8548701 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6C7CEC0553 for ; Wed, 9 Mar 2016 19:12:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5123E2013A for ; Wed, 9 Mar 2016 19:12:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2D81120125 for ; Wed, 9 Mar 2016 19:12:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934002AbcCITMh (ORCPT ); Wed, 9 Mar 2016 14:12:37 -0500 Received: from mail-lb0-f172.google.com ([209.85.217.172]:34909 "EHLO mail-lb0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933303AbcCITMf (ORCPT ); Wed, 9 Mar 2016 14:12:35 -0500 Received: by mail-lb0-f172.google.com with SMTP id bc4so79592592lbc.2 for ; Wed, 09 Mar 2016 11:12:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc; bh=tJlq/Ic3O9ySCm5rI12tbSSyhDEoR9ePt4s1uMH4MWE=; b=ZZh4n5URLgp5RdeqnjHPhPtPFraTuHg446xOn59PgRu3F5v8igbwEnvbTX9hhZZzl0 p7wQP6NVu5nNyw+9IzO1Z9wDn4+dtjHHYV2Li4MeTH/RFsV2mjlrOF+ubei19EaIAsdR yPhBEQFlUU6okHBoIIVcT67JwBePsCOUVxQqpW87+m8dvhsHTaa002w04OfmPjx+kSQO laylr6k6JriMo8YaVl2qPuHhTCZ5PCtIDmqgDV/bOrYYYtA5LWA3CPaT6wBFi+8cfBGb 6lv6yr56TwUZRjtMatVCRDiwD7YYICQTcKKXqZuyCgbNCeRZ68SfZ2ANOptOS0nZi3YZ QVIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc; bh=tJlq/Ic3O9ySCm5rI12tbSSyhDEoR9ePt4s1uMH4MWE=; b=X80WG6je7z38OjH80NPs33qEspoXxpGSKrN3R8z2kliOjuGdnPsrUwnv3pbj/7j3XX 0dv4XWqRRqaFGsLfN7TMAvIIIyQ7WSKEQHjYTw1z1yMUPnjkg0Gb2wAYUOm7Y6vb3TnT uKmOFSbDmA4NmSP8DHWRtT+aNOwnAHKewnjg9B4eTlai9oQbwS6kHtsWWClGEQ3Bf6Rb zG50OeaLlZSV8x9u5HLKPWwH8nVntQsVBs7CHgGUlGNYu/9Ye1DA/AhaHAVfQd48XW6q +vE88xQbpB6H2nY1VMYhgCAHzN8rHtWL95WDSx+KQFaE/tRYzoegWEKKLQCGLzloZ/3/ foLg== X-Gm-Message-State: AD7BkJK/ruN2ELEyG67rKgs+9utKw/2wuiTVinM9pJ5DWXRrELag//6MFGM4JVHtNV0LYUleijoyZq9i44CTnw== MIME-Version: 1.0 X-Received: by 10.25.33.1 with SMTP id h1mr13188890lfh.151.1457550753391; Wed, 09 Mar 2016 11:12:33 -0800 (PST) Received: by 10.114.109.74 with HTTP; Wed, 9 Mar 2016 11:12:33 -0800 (PST) In-Reply-To: References: <0BA3FCBA62E2DC44AF3030971E174FB32EA64B1D@hasmsx107.ger.corp.intel.com> Date: Wed, 9 Mar 2016 21:12:33 +0200 Message-ID: Subject: Re: pull request: iwlwifi-next 2016-03-09 From: Emmanuel Grumbach To: "Grumbach, Emmanuel" Cc: Kalle Valo , "linux-wireless@vger.kernel.org" Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Wed, Mar 9, 2016 at 8:14 PM, Emmanuel Grumbach wrote: > Hi Kalle, > > On Wed, Mar 9, 2016 at 7:43 PM, Grumbach, Emmanuel > wrote: >> Hi Kalle, >> >> this is the very last pull request for 4.6. I hope it is not too late. >> Most of it are fixes for code that is already in >> wireless-drivers.next.git. There are a few other patches as well. >> Let me know if you have issues! >> Thank you. > > As you saw, we have a compilation issue when THERMAL is not enabled. > I'll respin. Done: new tag is iwlwifi-next-for-kalle-2016-03-09_2. $ git diff iwlwifi-next-for-kalle-2016-03-09 iwlwifi-next-for-kalle-2016-03-09_2 IWL_DEBUG_TEMP(mvm, "cTDP avg energy in mWatt = %d\n", status); > >> >> The following changes since commit 53f09e742b0fdf14a2a2bfd2062ee96c9b3eedf0: >> >> Merge branch 'fixes' into next (2016-03-02 09:35:38 +0200) >> >> are available in the git repository at: >> >> https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git tags/iwlwifi-next-for-kalle-2016-03-09 >> >> for you to fetch changes up to 0831fcd67fc5bddd360bca51a3892bbd33048dbb: >> >> iwlwifi: mvm: update GSCAN capabilities (2016-03-09 16:55:39 +0200) >> >> ---------------------------------------------------------------- >> * update GSCAN capabilities (Ayala) >> * fix AES-CMAC in AP mode (Johannes) >> * adapt prints to new firmware API >> * rx path improvements (Sara and Gregory) >> * fixes for the thermal / cooling device code (Chaya Rachel) >> * fixes for GO uAPSD handling >> * more code for the 9000 device family (Sara) >> * infrastructure work for firmware notification (Chaya Rachel) >> * improve association reliablity (Sara) >> * runtime PM fixes >> * fixes for ROC (HS2.0) >> >> ---------------------------------------------------------------- >> Ayala Beker (1): >> iwlwifi: mvm: update GSCAN capabilities >> >> Chaya Rachel Ivgi (4): >> iwlwifi: mvm: fix unregistration of thermal in some error flows >> iwlwifi: mvm: add ctdp operations to debugfs >> iwlwifi: mvm: add support for async rx handler without hold the mutex >> iwlwifi: mvm: return the cooling state index instead of the budget >> >> Emmanuel Grumbach (4): >> iwlwifi: mvm: avoid panics with thermal device usage >> iwlwifi: mvm: don't let NDPs mess the packet tracking >> iwlwifi: mvm: remove RRM advertisement >> iwlwifi: mvm: adapt the firmware assert log to new firmware >> >> Gregory Greenman (1): >> iwlwifi: pcie: avoid restocks inside rx loop if not emergency >> >> Johannes Berg (1): >> iwlwifi: mvm: don't try to offload AES-CMAC in AP/IBSS modes >> >> Luca Coelho (1): >> iwlwifi: pcie: forbid RTPM on device removal >> >> Matti Gottlieb (1): >> iwlwifi: mvm: ROC: cleanup time event info on FW failure >> >> Sara Sharon (8): >> iwlwifi: pcie: refactor RXBs reclaiming code >> iwlwifi: pcie: set RB chunk size back to 64 >> iwlwifi: refactor the code that reads the MAC address from the NVM >> iwlwifi: mvm: set the correct amsdu enum values >> iwlwifi: mvm: extend time event duration >> iwlwifi: mvm: turn off AMSDU bit in QoS control for de-aggregated AMSDUs >> iwlwifi: pcie: fine tune number of rxbs >> iwlwifi: add support for getting HW address from CSR >> >> drivers/net/wireless/intel/iwlwifi/dvm/main.c | 8 ++-- >> drivers/net/wireless/intel/iwlwifi/iwl-9000.c | 3 +- >> drivers/net/wireless/intel/iwlwifi/iwl-config.h | 2 + >> drivers/net/wireless/intel/iwlwifi/iwl-csr.h | 10 +++++ >> drivers/net/wireless/intel/iwlwifi/iwl-devtrace-iwlwifi.h | 27 ++++++------ >> drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 38 ++++++++++------- >> drivers/net/wireless/intel/iwlwifi/iwl-fh.h | 9 ++-- >> drivers/net/wireless/intel/iwlwifi/iwl-fw-file.h | 11 +++++ >> drivers/net/wireless/intel/iwlwifi/iwl-fw.h | 13 ++++++ >> drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 146 ++++++++++++++++++++++++++++++++++++++++------------------------ >> drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h | 5 +-- >> drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 42 +++++++++++++++++++ >> drivers/net/wireless/intel/iwlwifi/mvm/fw-api-rx.h | 5 +-- >> drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 14 +++---- >> drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 5 +-- >> drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 11 +---- >> drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 120 +++++++++++++++++++++++++++++++++-------------------- >> drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 12 ++++++ >> drivers/net/wireless/intel/iwlwifi/mvm/time-event.c | 15 ++----- >> drivers/net/wireless/intel/iwlwifi/mvm/time-event.h | 2 +- >> drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 175 ++++++++++++++++++++++++++++++++++++++++++----------------------------------- >> drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 29 +++++++++++-- >> drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 28 ++++++------- >> drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 28 +++++++++++++ >> drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 2 +- >> drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 148 ++++++++++++++++++++++++++++++++--------------------------------- >> drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 6 --- >> 27 files changed, 563 insertions(+), 351 deletions(-) >> >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in >> the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html --- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tt.c b/drivers/net/wireless/intel/iwlwifi/mvm/tt.c index de3589a..f1f2825 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/tt.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/tt.c @@ -557,7 +557,9 @@ int iwl_mvm_ctdp_command(struct iwl_mvm *mvm, u32 op, u32 state) switch (op) { case CTDP_CMD_OPERATION_START: +#ifdef CONFIG_THERMAL mvm->cooling_dev.cur_state = state; +#endif /* CONFIG_THERMAL */ break; case CTDP_CMD_OPERATION_REPORT: