From patchwork Thu Mar 20 15:02:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 332220 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id B345D2C0091 for ; Fri, 21 Mar 2014 02:03:32 +1100 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1WQeVD-0007xV-5f; Thu, 20 Mar 2014 15:03:27 +0000 Received: from mail-oa0-f44.google.com ([209.85.219.44]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1WQeV5-0007vx-Cv for kernel-team@lists.ubuntu.com; Thu, 20 Mar 2014 15:03:19 +0000 Received: by mail-oa0-f44.google.com with SMTP id n16so1045052oag.31 for ; Thu, 20 Mar 2014 08:03:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=EKUfW6+ueNempC72pReEHLA6MTqROor9+2RSf1n2H9A=; b=XWnL1kX1pbLz+qqX96uCKhY4Gl+J0snik9c2/R9MWqqqKADCu3VanY6Vvvau2x78EN lSclNbFgaO17s7xfPpqGt7aLM8N3ZdJXmC1uJglQcAu9i74jUc3hsdoVTScvmCdmmnuv kVNUMxaWCggNl6c4+e5LOVuxVueD7lLu14+FeLJcmKg/FRWUaQAEoSpcy/7zc7Vm6H2B HO8WAe9GQXI3P+rxDIdxa9kpaqj9SMOuwjSn7jEsgBNXyhXMURlrsPivxqldbIuQeRGb AUeVRi4HzlfsUXvSUa4Dx0nXyNuMDhUez5/LY2XFiMdoYDSYt9OWhb+TF7JkKf5PjdPR rgwA== X-Gm-Message-State: ALoCoQk4kS7XOdcEVeRJe0o24woB6UMH96U9V2XzkPgnmqp9yRi9MsDIDqJCJVu1gBTCt4qFQN7I X-Received: by 10.60.58.193 with SMTP id t1mr1438785oeq.78.1395327798642; Thu, 20 Mar 2014 08:03:18 -0700 (PDT) Received: from localhost (64-126-112-59.dyn.everestkc.net. [64.126.112.59]) by mx.google.com with ESMTPSA id zm8sm3303860obc.16.2014.03.20.08.03.17 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 20 Mar 2014 08:03:18 -0700 (PDT) From: Seth Forshee To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/4][trusty] UBUNTU: SAUCE: iwlwifi: mvm: Free sram dump immediately after using it Date: Thu, 20 Mar 2014 10:02:57 -0500 Message-Id: <1395327779-34296-3-git-send-email-seth.forshee@canonical.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1395327779-34296-1-git-send-email-seth.forshee@canonical.com> References: <1395327779-34296-1-git-send-email-seth.forshee@canonical.com> Cc: Emmanuel Grumbach X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com After the sram dump is copied to the firmware error dump it is no longer needed. Free it immediately instead of waiting for the debugfs file to be read. Signed-off-by: Seth Forshee --- drivers/net/wireless/iwlwifi/mvm/debugfs.c | 3 --- drivers/net/wireless/iwlwifi/mvm/ops.c | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/iwlwifi/mvm/debugfs.c b/drivers/net/wireless/iwlwifi/mvm/debugfs.c index 5afa741..865d9bd 100644 --- a/drivers/net/wireless/iwlwifi/mvm/debugfs.c +++ b/drivers/net/wireless/iwlwifi/mvm/debugfs.c @@ -156,9 +156,6 @@ static int iwl_dbgfs_fw_error_dump_open(struct inode *inode, struct file *file) file->private_data = mvm->fw_error_dump; mvm->fw_error_dump = NULL; - kfree(mvm->fw_error_sram); - mvm->fw_error_sram = NULL; - mvm->fw_error_sram_len = 0; ret = 0; out: diff --git a/drivers/net/wireless/iwlwifi/mvm/ops.c b/drivers/net/wireless/iwlwifi/mvm/ops.c index 8d07464..a390eaf 100644 --- a/drivers/net/wireless/iwlwifi/mvm/ops.c +++ b/drivers/net/wireless/iwlwifi/mvm/ops.c @@ -790,6 +790,9 @@ void iwl_mvm_fw_error_dump(struct iwl_mvm *mvm) * mvm->fw_error_sram right now. */ memcpy(dump_data->data, mvm->fw_error_sram, mvm->fw_error_sram_len); + kfree(mvm->fw_error_sram); + mvm->fw_error_sram = NULL; + mvm->fw_error_sram_len = 0; } #endif