Commit 369dac68 authored by Satish Kharat's avatar Satish Kharat Committed by David S. Miller
Browse files

enic: Replace hardcoded values for vnic descriptor by defines 



Replace the hardcoded values used in the calculations for
vnic descriptors and rings with defines. Minor code cleanup.

Signed-off-by: default avatarSatish Kharat <satishkh@cisco.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent caf93883

drivers/net/ethernet/cisco/enic/vnic_dev.c

+8 −12
Original line number Diff line number Diff line
@@ -146,23 +146,19 @@ EXPORT_SYMBOL(vnic_dev_get_res); 
static unsigned int vnic_dev_desc_ring_size(struct vnic_dev_ring *ring,

	unsigned int desc_count, unsigned int desc_size)

{

	/* The base address of the desc rings must be 512 byte aligned.

	 * Descriptor count is aligned to groups of 32 descriptors.  A

	 * count of 0 means the maximum 4096 descriptors.  Descriptor

	 * size is aligned to 16 bytes.

	 */



	unsigned int count_align = 32;

	unsigned int desc_align = 16;



	ring->base_align = 512;

	/* Descriptor ring base address alignment in bytes*/

	ring->base_align = VNIC_DESC_BASE_ALIGN;



	/* A count of 0 means the maximum descriptors */

	if (desc_count == 0)

		desc_count = 4096;

		desc_count = VNIC_DESC_MAX_COUNT;



	ring->desc_count = ALIGN(desc_count, count_align);

	/* Descriptor count aligned in groups of VNIC_DESC_COUNT_ALIGN descriptors */

	ring->desc_count = ALIGN(desc_count, VNIC_DESC_COUNT_ALIGN);



	ring->desc_size = ALIGN(desc_size, desc_align);

	/* Descriptor size alignment in bytes */

	ring->desc_size = ALIGN(desc_size, VNIC_DESC_SIZE_ALIGN);



	ring->size = ring->desc_count * ring->desc_size;

	ring->size_unaligned = ring->size + ring->base_align;

drivers/net/ethernet/cisco/enic/vnic_dev.h

+5 −0
Original line number Diff line number Diff line
@@ -31,6 +31,11 @@ static inline void writeq(u64 val, void __iomem *reg) 
#undef pr_fmt

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#define VNIC_DESC_SIZE_ALIGN	16

#define VNIC_DESC_COUNT_ALIGN	32

#define VNIC_DESC_BASE_ALIGN	512

#define VNIC_DESC_MAX_COUNT	4096



enum vnic_dev_intr_mode {

	VNIC_DEV_INTR_MODE_UNKNOWN,

	VNIC_DEV_INTR_MODE_INTX,