iwlwifi: refactor common transport alloc/init code (7b501d10) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/net/wireless/iwlwifi/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -9,6 +9,7 @@ iwlwifi-objs += iwl-phy-db.o iwl-nvm-parse.o
		iwlwifi-objs += pcie/drv.o pcie/rx.o pcie/tx.o pcie/trans.o
		iwlwifi-$(CONFIG_IWLDVM) += iwl-1000.o iwl-2000.o iwl-5000.o iwl-6000.o
		iwlwifi-$(CONFIG_IWLMVM) += iwl-7000.o iwl-8000.o
		iwlwifi-objs += iwl-trans.o

		iwlwifi-objs += $(iwlwifi-m)

drivers/net/wireless/iwlwifi/iwl-trans.c

0 → 100644

+113 −0

Original line number	Diff line number	Diff line
		/******************************************************************************
		*
		* This file is provided under a dual BSD/GPLv2 license. When using or
		* redistributing this file, you may do so under either license.
		*
		* GPL LICENSE SUMMARY
		*
		* Copyright(c) 2015 Intel Mobile Communications GmbH
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of version 2 of the GNU General Public License as
		* published by the Free Software Foundation.
		*
		* This program is distributed in the hope that it will be useful, but
		* WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
		* General Public License for more details.
		*
		* You should have received a copy of the GNU General Public License
		* along with this program; if not, write to the Free Software
		* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
		* USA
		*
		* The full GNU General Public License is included in this distribution
		* in the file called COPYING.
		*
		* Contact Information:
		* Intel Linux Wireless <ilw@linux.intel.com>
		* Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
		*
		* BSD LICENSE
		*
		* Copyright(c) 2015 Intel Mobile Communications GmbH
		* All rights reserved.
		*
		* Redistribution and use in source and binary forms, with or without
		* modification, are permitted provided that the following conditions
		* are met:
		*
		* * Redistributions of source code must retain the above copyright
		* notice, this list of conditions and the following disclaimer.
		* * Redistributions in binary form must reproduce the above copyright
		* notice, this list of conditions and the following disclaimer in
		* the documentation and/or other materials provided with the
		* distribution.
		* * Neither the name Intel Corporation nor the names of its
		* contributors may be used to endorse or promote products derived
		* from this software without specific prior written permission.
		*
		* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
		* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
		* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
		* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
		* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
		* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
		* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
		* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
		* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
		* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
		* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
		*
		*****************************************************************************/
		#include <linux/kernel.h>
		#include "iwl-trans.h"

		struct iwl_trans *iwl_trans_alloc(unsigned int priv_size,
		struct device *dev,
		const struct iwl_cfg *cfg,
		const struct iwl_trans_ops *ops,
		size_t dev_cmd_headroom)
		{
		struct iwl_trans *trans;
		#ifdef CONFIG_LOCKDEP
		static struct lock_class_key __key;
		#endif

		trans = kzalloc(sizeof(*trans) + priv_size, GFP_KERNEL);
		if (!trans)
		return NULL;

		#ifdef CONFIG_LOCKDEP
		lockdep_init_map(&trans->sync_cmd_lockdep_map, "sync_cmd_lockdep_map",
		&__key, 0);
		#endif

		trans->dev = dev;
		trans->cfg = cfg;
		trans->ops = ops;
		trans->dev_cmd_headroom = dev_cmd_headroom;

		snprintf(trans->dev_cmd_pool_name, sizeof(trans->dev_cmd_pool_name),
		"iwl_cmd_pool:%s", dev_name(trans->dev));
		trans->dev_cmd_pool =
		kmem_cache_create(trans->dev_cmd_pool_name,
		sizeof(struct iwl_device_cmd)
		+ trans->dev_cmd_headroom,
		sizeof(void *),
		SLAB_HWCACHE_ALIGN,
		NULL);
		if (!trans->dev_cmd_pool)
		goto free;

		return trans;
		free:
		kfree(trans);
		return NULL;
		}

		void iwl_trans_free(struct iwl_trans *trans)
		{
		kmem_cache_destroy(trans->dev_cmd_pool);
		kfree(trans);
		}

drivers/net/wireless/iwlwifi/iwl-trans.h

+10 −10

Original line number	Diff line number	Diff line
		@@ -1010,20 +1010,20 @@ static inline void iwl_trans_fw_error(struct iwl_trans *trans)
		iwl_op_mode_nic_error(trans->op_mode);
		}

		/*****************************************************
		* transport helper functions
		*****************************************************/
		struct iwl_trans *iwl_trans_alloc(unsigned int priv_size,
		struct device *dev,
		const struct iwl_cfg *cfg,
		const struct iwl_trans_ops *ops,
		size_t dev_cmd_headroom);
		void iwl_trans_free(struct iwl_trans *trans);

		/*****************************************************
		* driver (transport) register/unregister functions
		******************************************************/
		int __must_check iwl_pci_register_driver(void);
		void iwl_pci_unregister_driver(void);

		static inline void trans_lockdep_init(struct iwl_trans *trans)
		{
		#ifdef CONFIG_LOCKDEP
		static struct lock_class_key __key;

		lockdep_init_map(&trans->sync_cmd_lockdep_map, "sync_cmd_lockdep_map",
		&__key, 0);
		#endif
		}

		#endif /* __iwl_trans_h__ */

drivers/net/wireless/iwlwifi/pcie/trans.c

+7 −33

Original line number	Diff line number	Diff line
		@@ -1366,14 +1366,13 @@ void iwl_trans_pcie_free(struct iwl_trans *trans)
		iounmap(trans_pcie->hw_base);
		pci_release_regions(trans_pcie->pci_dev);
		pci_disable_device(trans_pcie->pci_dev);
		kmem_cache_destroy(trans->dev_cmd_pool);

		if (trans_pcie->napi.poll)
		netif_napi_del(&trans_pcie->napi);

		iwl_pcie_free_fw_monitor(trans);

		kfree(trans);
		iwl_trans_free(trans);
		}

		static void iwl_trans_pcie_set_pmi(struct iwl_trans *trans, bool state)
		@@ -2466,18 +2465,13 @@ struct iwl_trans iwl_trans_pcie_alloc(struct pci_dev pdev,
		u16 pci_cmd;
		int err;

		trans = kzalloc(sizeof(struct iwl_trans) +
		sizeof(struct iwl_trans_pcie), GFP_KERNEL);
		if (!trans) {
		err = -ENOMEM;
		goto out;
		}
		trans = iwl_trans_alloc(sizeof(struct iwl_trans_pcie),
		&pdev->dev, cfg, &trans_ops_pcie, 0);
		if (!trans)
		return ERR_PTR(-ENOMEM);

		trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);

		trans->ops = &trans_ops_pcie;
		trans->cfg = cfg;
		trans_lockdep_init(trans);
		trans_pcie->trans = trans;
		spin_lock_init(&trans_pcie->irq_lock);
		spin_lock_init(&trans_pcie->reg_lock);
		@@ -2601,25 +2595,8 @@ struct iwl_trans iwl_trans_pcie_alloc(struct pci_dev pdev,
		/* Initialize the wait queue for commands */
		init_waitqueue_head(&trans_pcie->wait_command_queue);

		snprintf(trans->dev_cmd_pool_name, sizeof(trans->dev_cmd_pool_name),
		"iwl_cmd_pool:%s", dev_name(trans->dev));

		trans->dev_cmd_headroom = 0;
		trans->dev_cmd_pool =
		kmem_cache_create(trans->dev_cmd_pool_name,
		sizeof(struct iwl_device_cmd)
		+ trans->dev_cmd_headroom,
		sizeof(void *),
		SLAB_HWCACHE_ALIGN,
		NULL);

		if (!trans->dev_cmd_pool) {
		err = -ENOMEM;
		goto out_pci_disable_msi;
		}

		if (iwl_pcie_alloc_ict(trans))
		goto out_free_cmd_pool;
		goto out_pci_disable_msi;

		err = request_threaded_irq(pdev->irq, iwl_pcie_isr,
		iwl_pcie_irq_handler,
		@@ -2636,8 +2613,6 @@ struct iwl_trans iwl_trans_pcie_alloc(struct pci_dev pdev,

		out_free_ict:
		iwl_pcie_free_ict(trans);
		out_free_cmd_pool:
		kmem_cache_destroy(trans->dev_cmd_pool);
		out_pci_disable_msi:
		pci_disable_msi(pdev);
		out_pci_release_regions:
		@@ -2645,7 +2620,6 @@ struct iwl_trans iwl_trans_pcie_alloc(struct pci_dev pdev,
		out_pci_disable_device:
		pci_disable_device(pdev);
		out_no_pci:
		kfree(trans);
		out:
		iwl_trans_free(trans);
		return ERR_PTR(err);
		}