Commit 39ec612a authored by Ivan Vecera's avatar Ivan Vecera Committed by Tony Nguyen
Browse files

i40e: Remove back pointer from i40e_hw structure 



The .back field placed in i40e_hw is used to get pointer to i40e_pf
instance but it is not necessary as the i40e_hw is a part of i40e_pf
and containerof macro can be used to obtain the pointer to i40e_pf.
Remove .back field from i40e_hw structure, introduce i40e_hw_to_pf()
and i40e_hw_to_dev() helpers and use them.

Signed-off-by: default avatarIvan Vecera <ivecera@redhat.com>
Reviewed-by: default avatarPrzemek Kitszel <przemyslaw.kitszel@intel.com>
Reviewed-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Reviewed-by: default avatarAleksandr Loktionov <aleksandr.loktionov@intel.com>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 49e7265f

drivers/net/ethernet/intel/i40e/i40e.h

+11 −0
Original line number Diff line number Diff line
@@ -1321,4 +1321,15 @@ static inline u32 i40e_is_tc_mqprio_enabled(struct i40e_pf *pf) 
	return pf->flags & I40E_FLAG_TC_MQPRIO;

}



/**

 * i40e_hw_to_pf - get pf pointer from the hardware structure

 * @hw: pointer to the device HW structure

 **/

static inline struct i40e_pf *i40e_hw_to_pf(struct i40e_hw *hw)

{

	return container_of(hw, struct i40e_pf, hw);

}



struct device *i40e_hw_to_dev(struct i40e_hw *hw);



#endif /* _I40E_H_ */

drivers/net/ethernet/intel/i40e/i40e_main.c

+16 −6
Original line number Diff line number Diff line
@@ -119,6 +119,17 @@ static void netdev_hw_addr_refcnt(struct i40e_mac_filter *f, 
	}

}



/**

 * i40e_hw_to_dev - get device pointer from the hardware structure

 * @hw: pointer to the device HW structure

 **/

struct device *i40e_hw_to_dev(struct i40e_hw *hw)

{

	struct i40e_pf *pf = i40e_hw_to_pf(hw);



	return &pf->pdev->dev;

}



/**

 * i40e_allocate_dma_mem_d - OS specific memory alloc for shared code

 * @hw:   pointer to the HW structure
@@ -129,7 +140,7 @@ static void netdev_hw_addr_refcnt(struct i40e_mac_filter *f, 
int i40e_allocate_dma_mem_d(struct i40e_hw *hw, struct i40e_dma_mem *mem,

			    u64 size, u32 alignment)

{

	struct i40e_pf *pf = (struct i40e_pf *)hw->back;

	struct i40e_pf *pf = i40e_hw_to_pf(hw);



	mem->size = ALIGN(size, alignment);

	mem->va = dma_alloc_coherent(&pf->pdev->dev, mem->size, &mem->pa,
@@ -147,7 +158,7 @@ int i40e_allocate_dma_mem_d(struct i40e_hw *hw, struct i40e_dma_mem *mem, 
 **/

int i40e_free_dma_mem_d(struct i40e_hw *hw, struct i40e_dma_mem *mem)

{

	struct i40e_pf *pf = (struct i40e_pf *)hw->back;

	struct i40e_pf *pf = i40e_hw_to_pf(hw);



	dma_free_coherent(&pf->pdev->dev, mem->size, mem->va, mem->pa);

	mem->va = NULL;
@@ -15619,10 +15630,10 @@ static int i40e_init_recovery_mode(struct i40e_pf *pf, struct i40e_hw *hw) 
 **/

static inline void i40e_set_subsystem_device_id(struct i40e_hw *hw)

{

	struct pci_dev *pdev = ((struct i40e_pf *)hw->back)->pdev;

	struct i40e_pf *pf = i40e_hw_to_pf(hw);



	hw->subsystem_device_id = pdev->subsystem_device ?

		pdev->subsystem_device :

	hw->subsystem_device_id = pf->pdev->subsystem_device ?

		pf->pdev->subsystem_device :

		(ushort)(rd32(hw, I40E_PFPCI_SUBSYSID) & USHRT_MAX);

}
@@ -15692,7 +15703,6 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	set_bit(__I40E_DOWN, pf->state);



	hw = &pf->hw;

	hw->back = pf;



	pf->ioremap_len = min_t(int, pci_resource_len(pdev, 0),

				I40E_MAX_CSR_SPACE);

drivers/net/ethernet/intel/i40e/i40e_osdep.h

+4 −4
Original line number Diff line number Diff line
@@ -18,10 +18,10 @@ 
 * actual OS primitives

 */



#define hw_dbg(hw, S, A...)							\

do {										\

	dev_dbg(&((struct i40e_pf *)hw->back)->pdev->dev, S, ##A);		\

} while (0)

struct i40e_hw;

struct device *i40e_hw_to_dev(struct i40e_hw *hw);



#define hw_dbg(hw, S, A...) dev_dbg(i40e_hw_to_dev(hw), S, ##A)



#define wr32(a, reg, value)	writel((value), ((a)->hw_addr + (reg)))

#define rd32(a, reg)		readl((a)->hw_addr + (reg))

drivers/net/ethernet/intel/i40e/i40e_type.h

+0 −1
Original line number Diff line number Diff line
@@ -525,7 +525,6 @@ struct i40e_dcbx_config { 
/* Port hardware description */

struct i40e_hw {

	u8 __iomem *hw_addr;

	void *back;



	/* subsystem structs */

	struct i40e_phy_info phy;