Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c58edc6 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Wey-Yi Guy
Browse files

iwlwifi: introducing the drv object's flows 



Fetch the fw and spawn the op_mode. The op_mode that we need
to fetch is determined from the fw file.
Since the fw is fetched very early in the init flow, we can
determine what op_mode to spawn.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent a78be210

drivers/net/wireless/iwlwifi/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ iwlwifi-objs += iwl-6000.o 
iwlwifi-objs		+= iwl-1000.o

iwlwifi-objs		+= iwl-2000.o

iwlwifi-objs		+= iwl-pci.o

iwlwifi-objs		+= iwl-drv.o

iwlwifi-objs		+= iwl-trans.o

iwlwifi-objs		+= iwl-trans-pcie.o iwl-trans-pcie-rx.o iwl-trans-pcie-tx.o

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

+0 −10
Original line number Diff line number Diff line
@@ -1331,16 +1331,6 @@ int iwl_op_mode_dvm_start(struct iwl_bus *bus, 
	return err;

}



int iwl_probe(struct iwl_bus *bus, const struct iwl_trans_ops *trans_ops,

		struct iwl_cfg *cfg)

{

	bus->shrd->cfg = cfg;



	init_completion(&nic(bus)->request_firmware_complete);



	return iwl_request_firmware(nic(bus), true);

}



void __devexit iwl_remove(struct iwl_priv * priv)

{

	wait_for_completion(&nic(priv)->request_firmware_complete);

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

0 → 100644
+94 −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) 2007 - 2012 Intel Corporation. All rights reserved.

 *

 * 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 LICENSE.GPL.

 *

 * 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) 2005 - 2012 Intel Corporation. All rights reserved.

 * 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/completion.h>



#include "iwl-drv.h"

#include "iwl-trans.h"

#include "iwl-wifi.h"



int iwl_drv_start(struct iwl_shared *shrd,

		  struct iwl_trans *trans, struct iwl_cfg *cfg)

{

	int ret;



	shrd->cfg = cfg;



	shrd->nic = kzalloc(sizeof(*shrd->nic), GFP_KERNEL);

	if (!shrd->nic) {

		dev_printk(KERN_ERR, trans->dev, "Couldn't allocate iwl_nic");

		return -ENOMEM;

	}

	shrd->nic->shrd = shrd;



	init_completion(&shrd->nic->request_firmware_complete);



	ret = iwl_request_firmware(shrd->nic, true);



	if (ret) {

		dev_printk(KERN_ERR, trans->dev, "Couldn't request the fw");

		kfree(shrd->nic);

	}



	return ret;

}

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

0 → 100644
+110 −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) 2008 - 2012 Intel Corporation. All rights reserved.

 *

 * 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 LICENSE.GPL.

 *

 * 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) 2005 - 2012 Intel Corporation. All rights reserved.

 * 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.

 *****************************************************************************/



#ifndef __iwl_drv_h__

#define __iwl_drv_h__



#include "iwl-shared.h"



/**

 * DOC: Driver system flows - drv component

 *

 * This component implements the system flows such as bus enumeration, bus

 * removal. Bus dependent parts of system flows (such as iwl_pci_probe) are in

 * bus specific files (transport files). This is the code that is common among

 * different buses.

 *

 * This component is also in charge of managing the several implementations of

 * the wifi flows: it will allow to have several fw API implementation. These

 * different implementations will differ in the way they implement mac80211's

 * handlers too.



 * The init flow wrt to the drv component looks like this:

 * 1) The bus specific component is called from module_init

 * 2) The bus specific component registers the bus driver

 * 3) The bus driver calls the probe function

 * 4) The bus specific component configures the bus

 * 5) The bus specific component calls to the drv bus agnostic part

 *    (iwl_drv_start)

 * 6) iwl_drv_start fetches the fw ASYNC, iwl_ucode_callback

 * 7) iwl_ucode_callback parses the fw file

 * 8) iwl_ucode_callback starts the wifi implementation to matches the fw

 */



/**

 * iwl_drv_start - start the drv

 *

 * @shrd: the shrd area

 * @trans_ops: the ops of the transport

 * @cfg: device specific constants / virtual functions

 *

 * TODO: review the parameters given to this function

 *

 * starts the driver: fetches the firmware. This should be called by bus

 * specific system flows implementations. For example, the bus specific probe

 * function should do bus related operations only, and then call to this

 * function.

 */

int iwl_drv_start(struct iwl_shared *shrd,

		  struct iwl_trans *trans, struct iwl_cfg *cfg);



#endif /* __iwl_drv_h__ */

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

+5 −17
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ 
#include "iwl-trans.h"

#include "iwl-csr.h"

#include "iwl-cfg.h"

#include "iwl-wifi.h"

#include "iwl-drv.h"



#define IWL_PCI_DEVICE(dev, subdev, cfg) \

	.vendor = PCI_VENDOR_ID_INTEL,  .device = (dev), \
@@ -283,34 +283,24 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 


	bus->shrd->bus = bus;



	/* temporarily create this here */

	bus->shrd->nic = kzalloc(sizeof(*bus->shrd->nic), GFP_KERNEL);

	if (!bus->shrd->nic) {

		dev_printk(KERN_ERR, &pdev->dev,

			   "Couldn't allocate iwl_nic");

		err = -ENOMEM;

		goto out_free_bus;

	}

	/* and initialize it as well, temporarily */

	bus->shrd->nic->shrd = bus->shrd;

	pci_set_drvdata(pdev, bus);



#ifdef CONFIG_IWLWIFI_IDI

	trans(bus) = iwl_trans_idi_alloc(bus->shrd, pdev, ent);

	if (trans(bus) == NULL) {

		err = -ENOMEM;

		goto out_free_nic;

		goto out_free_bus;

	}



	err = iwl_probe(bus, &trans_ops_idi, cfg);

	err = iwl_drv_start(bus->shrd, trans(bus), cfg);

#else

	trans(bus) = iwl_trans_pcie_alloc(bus->shrd, pdev, ent);

	if (trans(bus) == NULL) {

		err = -ENOMEM;

		goto out_free_nic;

		goto out_free_bus;

	}



	err = iwl_probe(bus, &trans_ops_pcie, cfg);

	err = iwl_drv_start(bus->shrd, trans(bus), cfg);

#endif

	if (err)

		goto out_free_trans;
@@ -320,8 +310,6 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
out_free_trans:

	iwl_trans_free(trans(bus));

	pci_set_drvdata(pdev, NULL);

out_free_nic:

	kfree(bus->shrd->nic);

out_free_bus:

	kfree(bus->shrd);

	kfree(bus);