From 3758210e9da107b6e9d28c77a5ae0e9021ec143e Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Fri, 4 Mar 2011 11:00:07 -0800 Subject: [PATCH] refresh --- meta | 7 +++--- patches/port_up | 29 ++++++++++++++-------- patches/refresh-temp | 58 -------------------------------------------- 3 files changed, 22 insertions(+), 72 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index 881a0f5..0896a10 100644 --- a/meta +++ b/meta @@ -1,14 +1,13 @@ Version: 1 -Previous: 53dde5d91cac4c9b7ee44773c273e48e06b33802 -Head: 7a186f44d9d88c2b968d0c039b800e93f0b5a287 +Previous: b6e4c36f4d0ffb6c2becd9ce70de36fbf95b5587 +Head: 1af4666bab8720dd46666a4c13bd93f6dcc1bd1a Applied: addr_open: 1fd2bfd86e2e2fe78f9d5d6d39aa5502938923f0 open_dev: 4687a6571146acd8d9a1553a96e2e4f7e8318761 ep_active: 77fc3b61749ca5785e28bf487a5df84189466ecb sm_lid: eb7c2092cc0a44cf84428c536c9dd65da97b8069 sm_lid_get: dc8017769d3dfcbd85ae7ec037c871ac476a4c2d - port_up: 7927dc62a19804b42a061a7fd6e6a1752af1376c - refresh-temp: 7a186f44d9d88c2b968d0c039b800e93f0b5a287 + port_up: 1af4666bab8720dd46666a4c13bd93f6dcc1bd1a Unapplied: port_down: 031a7808b7954968250070946cb6a99dbc7f2581 autoaddr: 36281f18de15f2482e21ae1304f2e34e9ecf187d diff --git a/patches/port_up b/patches/port_up index 29d4371..3181643 100644 --- a/patches/port_up +++ b/patches/port_up @@ -1,5 +1,5 @@ Bottom: 74ae0221f2792e6abb76fa789cd3beb3d720e95b -Top: b2ee0aae3b7f67bb7f9cf6d8579cdea8dea2b2e2 +Top: 01085cac91eb836b6602afd4fa2a60476e32c6ae Author: Sean Hefty Date: 2011-02-22 10:26:01 -0800 @@ -15,15 +15,15 @@ Signed-off-by: Sean Hefty --- diff --git a/src/acm.c b/src/acm.c -index 3590c16..c723fe3 100644 +index 3590c16..5040159 100644 --- a/src/acm.c +++ b/src/acm.c -@@ -2499,14 +2499,36 @@ static int acm_init_ep_loopback(struct acm_ep *ep) +@@ -2499,14 +2499,37 @@ static int acm_init_ep_loopback(struct acm_ep *ep) return 0; } -static int acm_ep_up(struct acm_port *port, struct acm_ep *ep, uint16_t pkey_index) -+static acm_ep *acm_find_ep(struct acm_port *port, uint16_t pkey) ++static struct acm_ep *acm_find_ep(struct acm_port *port, uint16_t pkey) { - struct ibv_qp_init_attr init_attr; - struct ibv_qp_attr attr; @@ -35,7 +35,7 @@ index 3590c16..c723fe3 100644 + + lock_acquire(&port->lock); + for (entry = port->ep_list.Next; entry != &port->ep_list; entry = entry->Next) { -+ ep = container_of(ep_entry, struct acm_ep, entry); ++ ep = container_of(entry, struct acm_ep, entry); + if (ep->pkey == pkey) { + res = ep; + break; @@ -45,7 +45,8 @@ index 3590c16..c723fe3 100644 + return res; +} + -+static struct acm_alloc_ep(struct acm_port *port, uint16_t pkey, uint16_t pkey_index) ++static struct acm_ep * ++acm_alloc_ep(struct acm_port *port, uint16_t pkey, uint16_t pkey_index) +{ + struct acm_ep *ep; @@ -59,7 +60,7 @@ index 3590c16..c723fe3 100644 ep->pkey_index = pkey_index; ep->resolve_queue.credits = resolve_depth; ep->sa_queue.credits = sa_depth; -@@ -2517,15 +2539,33 @@ static int acm_ep_up(struct acm_port *port, struct acm_ep *ep, uint16_t pkey_ind +@@ -2517,15 +2540,33 @@ static int acm_ep_up(struct acm_port *port, struct acm_ep *ep, uint16_t pkey_ind DListInit(&ep->active_queue); DListInit(&ep->wait_queue); lock_init(&ep->lock); @@ -96,7 +97,7 @@ index 3590c16..c723fe3 100644 } sq_size = resolve_depth + sa_depth + send_depth; -@@ -2533,7 +2573,7 @@ static int acm_ep_up(struct acm_port *port, struct acm_ep *ep, uint16_t pkey_ind +@@ -2533,7 +2574,7 @@ static int acm_ep_up(struct acm_port *port, struct acm_ep *ep, uint16_t pkey_ind ep, port->dev->channel, 0); if (!ep->cq) { acm_log(0, "ERROR - failed to create CQ\n"); @@ -105,7 +106,7 @@ index 3590c16..c723fe3 100644 } ret = ibv_req_notify_cq(ep->cq, 0); -@@ -2593,13 +2633,17 @@ static int acm_ep_up(struct acm_port *port, struct acm_ep *ep, uint16_t pkey_ind +@@ -2593,13 +2634,17 @@ static int acm_ep_up(struct acm_port *port, struct acm_ep *ep, uint16_t pkey_ind acm_log(0, "ERROR - unable to init loopback\n"); goto err2; } @@ -125,6 +126,14 @@ index 3590c16..c723fe3 100644 } static void acm_port_up(struct acm_port *port) +@@ -2607,7 +2652,6 @@ static void acm_port_up(struct acm_port *port) + struct ibv_port_attr attr; + union ibv_gid gid; + uint16_t pkey; +- struct acm_ep *ep; + int i, ret; + + acm_log(1, "%s %d\n", port->dev->verbs->device->name, port->port_num); @@ -2624,13 +2668,13 @@ static void acm_port_up(struct acm_port *port) port->mtu = attr.active_mtu; port->rate = acm_get_rate(attr.active_width, attr.active_speed); @@ -160,7 +169,7 @@ index 3590c16..c723fe3 100644 - } - } + for (i = 0; i < port->pkey_cnt; i++) -+ acm_ep_up(port, ep, (uint16_t) i); ++ acm_ep_up(port, (uint16_t) i); acm_port_join(port); - lock_acquire(&port->lock); diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index f3a27a5..0000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,58 +0,0 @@ -Bottom: b2ee0aae3b7f67bb7f9cf6d8579cdea8dea2b2e2 -Top: 01085cac91eb836b6602afd4fa2a60476e32c6ae -Author: Sean Hefty -Date: 2011-03-04 11:00:07 -0800 - -Refresh of port_up - ---- - -diff --git a/src/acm.c b/src/acm.c -index c723fe3..5040159 100644 ---- a/src/acm.c -+++ b/src/acm.c -@@ -2499,7 +2499,7 @@ static int acm_init_ep_loopback(struct acm_ep *ep) - return 0; - } - --static acm_ep *acm_find_ep(struct acm_port *port, uint16_t pkey) -+static struct acm_ep *acm_find_ep(struct acm_port *port, uint16_t pkey) - { - struct acm_ep *ep, *res = NULL; - DLIST_ENTRY *entry; -@@ -2508,7 +2508,7 @@ static acm_ep *acm_find_ep(struct acm_port *port, uint16_t pkey) - - lock_acquire(&port->lock); - for (entry = port->ep_list.Next; entry != &port->ep_list; entry = entry->Next) { -- ep = container_of(ep_entry, struct acm_ep, entry); -+ ep = container_of(entry, struct acm_ep, entry); - if (ep->pkey == pkey) { - res = ep; - break; -@@ -2518,7 +2518,8 @@ static acm_ep *acm_find_ep(struct acm_port *port, uint16_t pkey) - return res; - } - --static struct acm_alloc_ep(struct acm_port *port, uint16_t pkey, uint16_t pkey_index) -+static struct acm_ep * -+acm_alloc_ep(struct acm_port *port, uint16_t pkey, uint16_t pkey_index) - { - struct acm_ep *ep; - -@@ -2651,7 +2652,6 @@ static void acm_port_up(struct acm_port *port) - struct ibv_port_attr attr; - union ibv_gid gid; - uint16_t pkey; -- struct acm_ep *ep; - int i, ret; - - acm_log(1, "%s %d\n", port->dev->verbs->device->name, port->port_num); -@@ -2696,7 +2696,7 @@ static void acm_port_up(struct acm_port *port) - return; - - for (i = 0; i < port->pkey_cnt; i++) -- acm_ep_up(port, ep, (uint16_t) i); -+ acm_ep_up(port, (uint16_t) i); - - acm_port_join(port); - port->state = IBV_PORT_ACTIVE; -- 2.41.0