Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[safe/jmp/linux-2.6] / drivers / net / vxge / vxge-config.h

diff --git a/drivers/net/vxge/vxge-config.h b/drivers/net/vxge/vxge-config.h
index 13f5416..4ae2625 100644 (file)
--- a/drivers/net/vxge/vxge-config.h
+++ b/drivers/net/vxge/vxge-config.h
@@ -765,10 +765,18 @@ struct vxge_hw_device_hw_info {
 #define VXGE_HW_SR_VH_VIRTUAL_FUNCTION                         6
 #define VXGE_HW_VH_NORMAL_FUNCTION                             7
        u64             function_mode;
-#define VXGE_HW_FUNCTION_MODE_MULTI_FUNCTION                   0
-#define VXGE_HW_FUNCTION_MODE_SINGLE_FUNCTION                  1
+#define VXGE_HW_FUNCTION_MODE_SINGLE_FUNCTION                  0
+#define VXGE_HW_FUNCTION_MODE_MULTI_FUNCTION                   1
 #define VXGE_HW_FUNCTION_MODE_SRIOV                            2
 #define VXGE_HW_FUNCTION_MODE_MRIOV                            3
+#define VXGE_HW_FUNCTION_MODE_MRIOV_8                          4
+#define VXGE_HW_FUNCTION_MODE_MULTI_FUNCTION_17                        5
+#define VXGE_HW_FUNCTION_MODE_SRIOV_8                          6
+#define VXGE_HW_FUNCTION_MODE_SRIOV_4                          7
+#define VXGE_HW_FUNCTION_MODE_MULTI_FUNCTION_2                 8
+#define VXGE_HW_FUNCTION_MODE_MULTI_FUNCTION_4                 9
+#define VXGE_HW_FUNCTION_MODE_MRIOV_4                          10
+
        u32             func_id;
        u64             vpath_mask;
        struct vxge_hw_device_version fw_version;
@@ -1915,20 +1923,32 @@ static inline void *vxge_os_dma_malloc(struct pci_dev *pdev,
        gfp_t flags;
        void *vaddr;
        unsigned long misaligned = 0;
+       int realloc_flag = 0;
        *p_dma_acch = *p_dmah = NULL;
 
        if (in_interrupt())
                flags = GFP_ATOMIC | GFP_DMA;
        else
                flags = GFP_KERNEL | GFP_DMA;
-
-       size += VXGE_CACHE_LINE_SIZE;
-
+realloc:
        vaddr = kmalloc((size), flags);
        if (vaddr == NULL)
                return vaddr;
-       misaligned = (unsigned long)VXGE_ALIGN(*((u64 *)&vaddr),
+       misaligned = (unsigned long)VXGE_ALIGN((unsigned long)vaddr,
                                VXGE_CACHE_LINE_SIZE);
+       if (realloc_flag)
+               goto out;
+
+       if (misaligned) {
+               /* misaligned, free current one and try allocating
+                * size + VXGE_CACHE_LINE_SIZE memory
+                */
+               kfree((void *) vaddr);
+               size += VXGE_CACHE_LINE_SIZE;
+               realloc_flag = 1;
+               goto realloc;
+       }
+out:
        *(unsigned long *)p_dma_acch = misaligned;
        vaddr = (void *)((u8 *)vaddr + misaligned);
        return vaddr;
@@ -2254,4 +2274,6 @@ enum vxge_hw_status vxge_hw_vpath_rts_rth_set(
        struct vxge_hw_rth_hash_types *hash_type,
        u16 bucket_size);
 
+enum vxge_hw_status
+__vxge_hw_device_is_privilaged(u32 host_type, u32 func_id);
 #endif