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

Commit 3599d39a authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Wey-Yi Guy
Browse files

iwlagn: add get_dev to iwl_bus_ops 



Bus specific layer must know how to return the struct device* of the device.
Implement that as a callback of iwl_bus_ops and use that callback instead of
using the priv->pdev pointer which is meant to disappear soon.

Since the struct device * is needed in hot path, iwl_bus holds a pointer to it
instead of calling get_dev all the time.

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

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

+2 −2
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
void iwl_free_isr_ict(struct iwl_priv *priv)

{

	if (priv->_agn.ict_tbl_vir) {

		dma_free_coherent(&priv->pci_dev->dev,

		dma_free_coherent(priv->bus.dev,

				  (sizeof(u32) * ICT_COUNT) + PAGE_SIZE,

				  priv->_agn.ict_tbl_vir,

				  priv->_agn.ict_tbl_dma);
@@ -61,7 +61,7 @@ int iwl_alloc_isr_ict(struct iwl_priv *priv) 


	/* allocate shrared data table */

	priv->_agn.ict_tbl_vir =

		dma_alloc_coherent(&priv->pci_dev->dev,

		dma_alloc_coherent(priv->bus.dev,

				   (sizeof(u32) * ICT_COUNT) + PAGE_SIZE,

				   &priv->_agn.ict_tbl_dma, GFP_KERNEL);

	if (!priv->_agn.ict_tbl_vir)

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

+4 −3
Original line number Diff line number Diff line
@@ -966,9 +966,10 @@ void iwlagn_rx_queue_free(struct iwl_priv *priv, struct iwl_rx_queue *rxq) 
		}

	}



	dma_free_coherent(&priv->pci_dev->dev, 4 * RX_QUEUE_SIZE, rxq->bd,

			  rxq->bd_dma);

	dma_free_coherent(&priv->pci_dev->dev, sizeof(struct iwl_rb_status),

	dma_free_coherent(priv->bus.dev, 4 * RX_QUEUE_SIZE,

			  rxq->bd, rxq->bd_dma);

	dma_free_coherent(priv->bus.dev,

			  sizeof(struct iwl_rb_status),

			  rxq->rb_stts, rxq->rb_stts_dma);

	rxq->bd = NULL;

	rxq->rb_stts  = NULL;

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

+4 −3
Original line number Diff line number Diff line
@@ -834,8 +834,8 @@ drop_unlock_priv: 
static inline int iwlagn_alloc_dma_ptr(struct iwl_priv *priv,

				    struct iwl_dma_ptr *ptr, size_t size)

{

	ptr->addr = dma_alloc_coherent(&priv->pci_dev->dev, size, &ptr->dma,

				       GFP_KERNEL);

	ptr->addr = dma_alloc_coherent(priv->bus.dev, size,

				       &ptr->dma, GFP_KERNEL);

	if (!ptr->addr)

		return -ENOMEM;

	ptr->size = size;
@@ -848,7 +848,8 @@ static inline void iwlagn_free_dma_ptr(struct iwl_priv *priv, 
	if (unlikely(!ptr->addr))

		return;



	dma_free_coherent(&priv->pci_dev->dev, ptr->size, ptr->addr, ptr->dma);

	dma_free_coherent(priv->bus.dev,

			  ptr->size, ptr->addr, ptr->dma);

	memset(ptr, 0, sizeof(*ptr));

}

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

+28 −25
Original line number Diff line number Diff line
@@ -937,22 +937,28 @@ static struct attribute_group iwl_attribute_group = { 
 *

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



static void iwl_free_fw_desc(struct pci_dev *pci_dev, struct fw_desc *desc)

static void iwl_free_fw_desc(struct iwl_priv *priv, struct fw_desc *desc)

{

	if (desc->v_addr)

		dma_free_coherent(&pci_dev->dev, desc->len,

		dma_free_coherent(priv->bus.dev, desc->len,

				  desc->v_addr, desc->p_addr);

	desc->v_addr = NULL;

	desc->len = 0;

}



static void iwl_free_fw_img(struct pci_dev *pci_dev, struct fw_img *img)

static void iwl_free_fw_img(struct iwl_priv *priv, struct fw_img *img)

{

	iwl_free_fw_desc(pci_dev, &img->code);

	iwl_free_fw_desc(pci_dev, &img->data);

	iwl_free_fw_desc(priv, &img->code);

	iwl_free_fw_desc(priv, &img->data);

}



static int iwl_alloc_fw_desc(struct pci_dev *pci_dev, struct fw_desc *desc,

static void iwl_dealloc_ucode(struct iwl_priv *priv)

{

	iwl_free_fw_img(priv, &priv->ucode_rt);

	iwl_free_fw_img(priv, &priv->ucode_init);

}



static int iwl_alloc_fw_desc(struct iwl_priv *priv, struct fw_desc *desc,

			     const void *data, size_t len)

{

	if (!len) {
@@ -960,21 +966,16 @@ static int iwl_alloc_fw_desc(struct pci_dev *pci_dev, struct fw_desc *desc, 
		return -EINVAL;

	}



	desc->v_addr = dma_alloc_coherent(&pci_dev->dev, len,

	desc->v_addr = dma_alloc_coherent(priv->bus.dev, len,

					  &desc->p_addr, GFP_KERNEL);

	if (!desc->v_addr)

		return -ENOMEM;



	desc->len = len;

	memcpy(desc->v_addr, data, len);

	return 0;

}



static void iwl_dealloc_ucode_pci(struct iwl_priv *priv)

{

	iwl_free_fw_img(priv->pci_dev, &priv->ucode_rt);

	iwl_free_fw_img(priv->pci_dev, &priv->ucode_init);

}



struct iwlagn_ucode_capabilities {

	u32 max_probe_length;

	u32 standard_phy_calibration_size;
@@ -1019,8 +1020,8 @@ static int __must_check iwl_request_firmware(struct iwl_priv *priv, bool first) 
		       priv->firmware_name);



	return request_firmware_nowait(THIS_MODULE, 1, priv->firmware_name,

				       &priv->pci_dev->dev, GFP_KERNEL, priv,

				       iwl_ucode_callback);

				       priv->bus.dev,

				       GFP_KERNEL, priv, iwl_ucode_callback);

}



struct iwlagn_firmware_pieces {
@@ -1441,19 +1442,19 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context) 
	/* Runtime instructions and 2 copies of data:

	 * 1) unmodified from disk

	 * 2) backup cache for save/restore during power-downs */

	if (iwl_alloc_fw_desc(priv->pci_dev, &priv->ucode_rt.code,

	if (iwl_alloc_fw_desc(priv, &priv->ucode_rt.code,

			      pieces.inst, pieces.inst_size))

		goto err_pci_alloc;

	if (iwl_alloc_fw_desc(priv->pci_dev, &priv->ucode_rt.data,

	if (iwl_alloc_fw_desc(priv, &priv->ucode_rt.data,

			      pieces.data, pieces.data_size))

		goto err_pci_alloc;



	/* Initialization instructions and data */

	if (pieces.init_size && pieces.init_data_size) {

		if (iwl_alloc_fw_desc(priv->pci_dev, &priv->ucode_init.code,

		if (iwl_alloc_fw_desc(priv, &priv->ucode_init.code,

				      pieces.init, pieces.init_size))

			goto err_pci_alloc;

		if (iwl_alloc_fw_desc(priv->pci_dev, &priv->ucode_init.data,

		if (iwl_alloc_fw_desc(priv, &priv->ucode_init.data,

				      pieces.init_data, pieces.init_data_size))

			goto err_pci_alloc;

	}
@@ -1522,7 +1523,7 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context) 
	if (err)

		IWL_ERR(priv, "failed to create debugfs files. Ignoring error: %d\n", err);



	err = sysfs_create_group(&priv->pci_dev->dev.kobj,

	err = sysfs_create_group(&(priv->bus.dev->kobj),

					&iwl_attribute_group);

	if (err) {

		IWL_ERR(priv, "failed to create sysfs device attributes\n");
@@ -1543,10 +1544,10 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context) 


 err_pci_alloc:

	IWL_ERR(priv, "failed to allocate pci memory\n");

	iwl_dealloc_ucode_pci(priv);

	iwl_dealloc_ucode(priv);

 out_unbind:

	complete(&priv->_agn.firmware_loading_complete);

	device_release_driver(&priv->pci_dev->dev);

	device_release_driver(priv->bus.dev);

	release_firmware(ucode_raw);

}
@@ -3507,10 +3508,11 @@ int iwl_probe(void *bus_specific, struct iwl_bus_ops *bus_ops, 
	priv->bus.bus_specific = bus_specific;

	priv->bus.ops = bus_ops;

	priv->bus.ops->set_drv_data(&priv->bus, priv);

	priv->bus.dev = priv->bus.ops->get_dev(&priv->bus);



	/* At this point both hw and priv are allocated. */



	SET_IEEE80211_DEV(hw, &pdev->dev);

	SET_IEEE80211_DEV(hw, priv->bus.dev);



	IWL_DEBUG_INFO(priv, "*** LOAD DRIVER ***\n");

	priv->cfg = cfg;
@@ -3735,7 +3737,8 @@ void __devexit iwl_remove(struct iwl_priv * priv) 
	IWL_DEBUG_INFO(priv, "*** UNLOAD DRIVER ***\n");



	iwl_dbgfs_unregister(priv);

	sysfs_remove_group(&pdev->dev.kobj, &iwl_attribute_group);

	sysfs_remove_group(&priv->bus.dev->kobj,

			   &iwl_attribute_group);



	/* ieee80211_unregister_hw call wil cause iwl_mac_stop to

	 * to be called and iwl_down since we are removing the device
@@ -3765,7 +3768,7 @@ void __devexit iwl_remove(struct iwl_priv * priv) 


	iwl_synchronize_irq(priv);



	iwl_dealloc_ucode_pci(priv);

	iwl_dealloc_ucode(priv);



	if (priv->rxq.bd)

		iwlagn_rx_queue_free(priv, &priv->rxq);

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

+4 −4
Original line number Diff line number Diff line
@@ -32,10 +32,10 @@ 
struct iwl_priv;

extern u32 iwl_debug_level;



#define IWL_ERR(p, f, a...) dev_err(&((p)->pci_dev->dev), f, ## a)

#define IWL_WARN(p, f, a...) dev_warn(&((p)->pci_dev->dev), f, ## a)

#define IWL_INFO(p, f, a...) dev_info(&((p)->pci_dev->dev), f, ## a)

#define IWL_CRIT(p, f, a...) dev_crit(&((p)->pci_dev->dev), f, ## a)

#define IWL_ERR(p, f, a...) dev_err(p->bus.ops->get_dev(&p->bus), f, ## a)

#define IWL_WARN(p, f, a...) dev_warn(p->bus.ops->get_dev(&p->bus), f, ## a)

#define IWL_INFO(p, f, a...) dev_info(p->bus.ops->get_dev(&p->bus), f, ## a)

#define IWL_CRIT(p, f, a...) dev_crit(p->bus.ops->get_dev(&p->bus), f, ## a)



#define iwl_print_hex_error(priv, p, len) 				\

do {									\