openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

cxgb4: Increase max number of tc u32 links 

Make max number of supported tc u32 links equal to max number of filters
supported by hardware.

Signed-off-by: Arjun V <arjun@chelsio.com>
Signed-off-by: Rahul Lakkireddy <rahul.lakkireddy@chelsio.com>
Signed-off-by: Casey Leedom <leedom@chelsio.com>
Signed-off-by: Ganesh Goudar <ganeshgr@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Arjun V 2017-02-16 12:22:45 +05:30 committed by David S. Miller
parent b973154a22
commit 45da1ca2e2
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
View File

@ -4907,8 +4907,7 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
"continuing\n"); "continuing\n");
adapter->params.offload = 0; adapter->params.offload = 0;
} else { } else {
adapter->tc_u32 = cxgb4_init_tc_u32(adapter, adapter->tc_u32 = cxgb4_init_tc_u32(adapter);
CXGB4_MAX_LINK_HANDLE);
if (!adapter->tc_u32) if (!adapter->tc_u32)
dev_warn(&pdev->dev, dev_warn(&pdev->dev,
"could not offload tc u32, continuing\n"); "could not offload tc u32, continuing\n");

12
drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.c
View File

@ -437,28 +437,26 @@ void cxgb4_cleanup_tc_u32(struct adapter *adap)
t4_free_mem(adap->tc_u32); t4_free_mem(adap->tc_u32);
} }
struct cxgb4_tc_u32_table *cxgb4_init_tc_u32(struct adapter *adap, struct cxgb4_tc_u32_table *cxgb4_init_tc_u32(struct adapter *adap)
unsigned int size)
{ {
unsigned int max_tids = adap->tids.nftids;
struct cxgb4_tc_u32_table *t; struct cxgb4_tc_u32_table *t;
unsigned int i; unsigned int i;
if (!size) if (!max_tids)
return NULL; return NULL;
t = t4_alloc_mem(sizeof(*t) + t = t4_alloc_mem(sizeof(*t) +
(size * sizeof(struct cxgb4_link))); (max_tids * sizeof(struct cxgb4_link)));
if (!t) if (!t)
return NULL; return NULL;
t->size = size; t->size = max_tids;
for (i = 0; i < t->size; i++) { for (i = 0; i < t->size; i++) {
struct cxgb4_link *link = &t->table[i]; struct cxgb4_link *link = &t->table[i];
unsigned int bmap_size; unsigned int bmap_size;
unsigned int max_tids;
max_tids = adap->tids.nftids;
bmap_size = BITS_TO_LONGS(max_tids); bmap_size = BITS_TO_LONGS(max_tids);
link->tid_map = t4_alloc_mem(sizeof(unsigned long) * bmap_size); link->tid_map = t4_alloc_mem(sizeof(unsigned long) * bmap_size);
if (!link->tid_map) if (!link->tid_map)

5
drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.h
View File

@ -37,8 +37,6 @@
#include <net/pkt_cls.h> #include <net/pkt_cls.h>
#define CXGB4_MAX_LINK_HANDLE 32
static inline bool can_tc_u32_offload(struct net_device *dev) static inline bool can_tc_u32_offload(struct net_device *dev)
{ {
struct adapter *adap = netdev2adap(dev); struct adapter *adap = netdev2adap(dev);
@ -52,6 +50,5 @@ int cxgb4_delete_knode(struct net_device *dev, __be16 protocol,
struct tc_cls_u32_offload *cls); struct tc_cls_u32_offload *cls);
void cxgb4_cleanup_tc_u32(struct adapter *adapter); void cxgb4_cleanup_tc_u32(struct adapter *adapter);
struct cxgb4_tc_u32_table *cxgb4_init_tc_u32(struct adapter *adap, struct cxgb4_tc_u32_table *cxgb4_init_tc_u32(struct adapter *adap);
unsigned int size);
#endif /* __CXGB4_TC_U32_H */ #endif /* __CXGB4_TC_U32_H */