Skip to content

L
linux
Commit d339a1f2 authored by Thomas Pugliese's avatar Thomas Pugliese Committed by Greg Kroah-Hartman
Browse files
Options

uwb: whitespace and line length cleanups 

Fix whitespace and line length issues reported by checkpatch.
Signed-off-by: default avatarThomas Pugliese <thomas.pugliese@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a838ec7b
Hide whitespace changes
Inline Side-by-side
Showing with 166 additions and 128 deletions
drivers/uwb/drp.c
View file @ d339a1f2
...@@ -29,19 +29,19 @@ ...@@ -29,19 +29,19 @@
enum uwb_drp_conflict_action { enum uwb_drp_conflict_action {
/* Reservation is maintained, no action needed */ /* Reservation is maintained, no action needed */
UWB_DRP_CONFLICT_MANTAIN = 0, UWB_DRP_CONFLICT_MANTAIN = 0,
/* the device shall not transmit frames in conflicting MASs in /* the device shall not transmit frames in conflicting MASs in
* the following superframe. If the device is the reservation * the following superframe. If the device is the reservation
* target, it shall also set the Reason Code in its DRP IE to * target, it shall also set the Reason Code in its DRP IE to
* Conflict in its beacon in the following superframe. * Conflict in its beacon in the following superframe.
*/ */
UWB_DRP_CONFLICT_ACT1, UWB_DRP_CONFLICT_ACT1,
/* the device shall not set the Reservation Status bit to ONE /* the device shall not set the Reservation Status bit to ONE
* and shall not transmit frames in conflicting MASs. If the * and shall not transmit frames in conflicting MASs. If the
* device is the reservation target, it shall also set the * device is the reservation target, it shall also set the
* Reason Code in its DRP IE to Conflict. * Reason Code in its DRP IE to Conflict.
*/ */
UWB_DRP_CONFLICT_ACT2, UWB_DRP_CONFLICT_ACT2,
/* the device shall not transmit frames in conflicting MASs in /* the device shall not transmit frames in conflicting MASs in
...@@ -115,7 +115,8 @@ int uwb_rc_send_all_drp_ie(struct uwb_rc *rc) ...@@ -115,7 +115,8 @@ int uwb_rc_send_all_drp_ie(struct uwb_rc *rc)
if (uwb_rsv_has_two_drp_ies(rsv) && if (uwb_rsv_has_two_drp_ies(rsv) &&
(rsv->mv.companion_drp_ie != NULL)) { (rsv->mv.companion_drp_ie != NULL)) {
mv = &rsv->mv; mv = &rsv->mv;
num_bytes += mv->companion_drp_ie->hdr.length + 2; num_bytes +=
mv->companion_drp_ie->hdr.length + 2;
} }
} }
} }
...@@ -139,21 +140,23 @@ int uwb_rc_send_all_drp_ie(struct uwb_rc *rc) ...@@ -139,21 +140,23 @@ int uwb_rc_send_all_drp_ie(struct uwb_rc *rc)
memcpy(IEDataptr, rsv->drp_ie, memcpy(IEDataptr, rsv->drp_ie,
rsv->drp_ie->hdr.length + 2); rsv->drp_ie->hdr.length + 2);
IEDataptr += rsv->drp_ie->hdr.length + 2; IEDataptr += rsv->drp_ie->hdr.length + 2;
if (uwb_rsv_has_two_drp_ies(rsv) && if (uwb_rsv_has_two_drp_ies(rsv) &&
(rsv->mv.companion_drp_ie != NULL)) { (rsv->mv.companion_drp_ie != NULL)) {
mv = &rsv->mv; mv = &rsv->mv;
memcpy(IEDataptr, mv->companion_drp_ie, memcpy(IEDataptr, mv->companion_drp_ie,
mv->companion_drp_ie->hdr.length + 2); mv->companion_drp_ie->hdr.length + 2);
IEDataptr += mv->companion_drp_ie->hdr.length + 2; IEDataptr +=
mv->companion_drp_ie->hdr.length + 2;
} }
} }
} }
result = uwb_rc_cmd_async(rc, "SET-DRP-IE", &cmd->rccb, sizeof(*cmd) + num_bytes, result = uwb_rc_cmd_async(rc, "SET-DRP-IE",
UWB_RC_CET_GENERAL, UWB_RC_CMD_SET_DRP_IE, &cmd->rccb, sizeof(*cmd) + num_bytes,
uwb_rc_set_drp_cmd_done, NULL); UWB_RC_CET_GENERAL, UWB_RC_CMD_SET_DRP_IE,
uwb_rc_set_drp_cmd_done, NULL);
rc->set_drp_ie_pending = 1; rc->set_drp_ie_pending = 1;
kfree(cmd); kfree(cmd);
...@@ -176,8 +179,8 @@ static int evaluate_conflict_action(struct uwb_ie_drp *ext_drp_ie, int ext_beaco ...@@ -176,8 +179,8 @@ static int evaluate_conflict_action(struct uwb_ie_drp *ext_drp_ie, int ext_beaco
int ext_tie_breaker = uwb_ie_drp_tiebreaker(ext_drp_ie); int ext_tie_breaker = uwb_ie_drp_tiebreaker(ext_drp_ie);
int ext_status = uwb_ie_drp_status(ext_drp_ie); int ext_status = uwb_ie_drp_status(ext_drp_ie);
int ext_type = uwb_ie_drp_type(ext_drp_ie); int ext_type = uwb_ie_drp_type(ext_drp_ie);
/* [ECMA-368 2nd Edition] 17.4.6 */ /* [ECMA-368 2nd Edition] 17.4.6 */
if (ext_type == UWB_DRP_TYPE_PCA && our_type == UWB_DRP_TYPE_PCA) { if (ext_type == UWB_DRP_TYPE_PCA && our_type == UWB_DRP_TYPE_PCA) {
return UWB_DRP_CONFLICT_MANTAIN; return UWB_DRP_CONFLICT_MANTAIN;
...@@ -187,7 +190,7 @@ static int evaluate_conflict_action(struct uwb_ie_drp *ext_drp_ie, int ext_beaco ...@@ -187,7 +190,7 @@ static int evaluate_conflict_action(struct uwb_ie_drp *ext_drp_ie, int ext_beaco
if (our_type == UWB_DRP_TYPE_ALIEN_BP) { if (our_type == UWB_DRP_TYPE_ALIEN_BP) {
return UWB_DRP_CONFLICT_MANTAIN; return UWB_DRP_CONFLICT_MANTAIN;
} }
/* [ECMA-368 2nd Edition] 17.4.6-2 */ /* [ECMA-368 2nd Edition] 17.4.6-2 */
if (ext_type == UWB_DRP_TYPE_ALIEN_BP) { if (ext_type == UWB_DRP_TYPE_ALIEN_BP) {
/* here we know our_type != UWB_DRP_TYPE_ALIEN_BP */ /* here we know our_type != UWB_DRP_TYPE_ALIEN_BP */
...@@ -215,7 +218,7 @@ static int evaluate_conflict_action(struct uwb_ie_drp *ext_drp_ie, int ext_beaco ...@@ -215,7 +218,7 @@ static int evaluate_conflict_action(struct uwb_ie_drp *ext_drp_ie, int ext_beaco
our_beacon_slot > ext_beacon_slot) { our_beacon_slot > ext_beacon_slot) {
return UWB_DRP_CONFLICT_MANTAIN; return UWB_DRP_CONFLICT_MANTAIN;
} }
if (our_status == 0) { if (our_status == 0) {
if (our_tie_breaker == ext_tie_breaker) { if (our_tie_breaker == ext_tie_breaker) {
/* [ECMA-368 2nd Edition] 17.4.6-6a */ /* [ECMA-368 2nd Edition] 17.4.6-6a */
...@@ -244,9 +247,9 @@ static int evaluate_conflict_action(struct uwb_ie_drp *ext_drp_ie, int ext_beaco ...@@ -244,9 +247,9 @@ static int evaluate_conflict_action(struct uwb_ie_drp *ext_drp_ie, int ext_beaco
return UWB_DRP_CONFLICT_MANTAIN; return UWB_DRP_CONFLICT_MANTAIN;
} }
static void handle_conflict_normal(struct uwb_ie_drp *drp_ie, static void handle_conflict_normal(struct uwb_ie_drp *drp_ie,
int ext_beacon_slot, int ext_beacon_slot,
struct uwb_rsv *rsv, struct uwb_rsv *rsv,
struct uwb_mas_bm *conflicting_mas) struct uwb_mas_bm *conflicting_mas)
{ {
struct uwb_rc *rc = rsv->rc; struct uwb_rc *rc = rsv->rc;
...@@ -263,7 +266,7 @@ static void handle_conflict_normal(struct uwb_ie_drp *drp_ie, ...@@ -263,7 +266,7 @@ static void handle_conflict_normal(struct uwb_ie_drp *drp_ie,
uwb_rsv_set_state(rsv, UWB_RSV_STATE_O_TO_BE_MOVED); uwb_rsv_set_state(rsv, UWB_RSV_STATE_O_TO_BE_MOVED);
if (bow->can_reserve_extra_mases == false) if (bow->can_reserve_extra_mases == false)
uwb_rsv_backoff_win_increment(rc); uwb_rsv_backoff_win_increment(rc);
break; break;
case UWB_DRP_CONFLICT_ACT3: case UWB_DRP_CONFLICT_ACT3:
uwb_rsv_backoff_win_increment(rc); uwb_rsv_backoff_win_increment(rc);
...@@ -278,13 +281,13 @@ static void handle_conflict_normal(struct uwb_ie_drp *drp_ie, ...@@ -278,13 +281,13 @@ static void handle_conflict_normal(struct uwb_ie_drp *drp_ie,
switch(action) { switch(action) {
case UWB_DRP_CONFLICT_ACT2: case UWB_DRP_CONFLICT_ACT2:
case UWB_DRP_CONFLICT_ACT3: case UWB_DRP_CONFLICT_ACT3:
uwb_rsv_set_state(rsv, UWB_RSV_STATE_T_CONFLICT); uwb_rsv_set_state(rsv, UWB_RSV_STATE_T_CONFLICT);
default: default:
break; break;
} }
} }
} }
static void handle_conflict_expanding(struct uwb_ie_drp *drp_ie, int ext_beacon_slot, static void handle_conflict_expanding(struct uwb_ie_drp *drp_ie, int ext_beacon_slot,
...@@ -295,7 +298,7 @@ static void handle_conflict_expanding(struct uwb_ie_drp *drp_ie, int ext_beacon_ ...@@ -295,7 +298,7 @@ static void handle_conflict_expanding(struct uwb_ie_drp *drp_ie, int ext_beacon_
struct uwb_drp_backoff_win *bow = &rc->bow; struct uwb_drp_backoff_win *bow = &rc->bow;
struct uwb_rsv_move *mv = &rsv->mv; struct uwb_rsv_move *mv = &rsv->mv;
int action; int action;
if (companion_only) { if (companion_only) {
/* status of companion is 0 at this point */ /* status of companion is 0 at this point */
action = evaluate_conflict_action(drp_ie, ext_beacon_slot, rsv, 0); action = evaluate_conflict_action(drp_ie, ext_beacon_slot, rsv, 0);
...@@ -303,21 +306,24 @@ static void handle_conflict_expanding(struct uwb_ie_drp *drp_ie, int ext_beacon_ ...@@ -303,21 +306,24 @@ static void handle_conflict_expanding(struct uwb_ie_drp *drp_ie, int ext_beacon_
switch(action) { switch(action) {
case UWB_DRP_CONFLICT_ACT2: case UWB_DRP_CONFLICT_ACT2:
case UWB_DRP_CONFLICT_ACT3: case UWB_DRP_CONFLICT_ACT3:
uwb_rsv_set_state(rsv, UWB_RSV_STATE_O_ESTABLISHED); uwb_rsv_set_state(rsv,
UWB_RSV_STATE_O_ESTABLISHED);
rsv->needs_release_companion_mas = false; rsv->needs_release_companion_mas = false;
if (bow->can_reserve_extra_mases == false) if (bow->can_reserve_extra_mases == false)
uwb_rsv_backoff_win_increment(rc); uwb_rsv_backoff_win_increment(rc);
uwb_drp_avail_release(rsv->rc, &rsv->mv.companion_mas); uwb_drp_avail_release(rsv->rc,
&rsv->mv.companion_mas);
} }
} else { /* rsv is target */ } else { /* rsv is target */
switch(action) { switch(action) {
case UWB_DRP_CONFLICT_ACT2: case UWB_DRP_CONFLICT_ACT2:
case UWB_DRP_CONFLICT_ACT3: case UWB_DRP_CONFLICT_ACT3:
uwb_rsv_set_state(rsv, UWB_RSV_STATE_T_EXPANDING_CONFLICT); uwb_rsv_set_state(rsv,
UWB_RSV_STATE_T_EXPANDING_CONFLICT);
/* send_drp_avail_ie = true; */ /* send_drp_avail_ie = true; */
} }
} }
} else { /* also base part of the reservation is conflicting */ } else { /* also base part of the reservation is conflicting */
if (uwb_rsv_is_owner(rsv)) { if (uwb_rsv_is_owner(rsv)) {
uwb_rsv_backoff_win_increment(rc); uwb_rsv_backoff_win_increment(rc);
/* remove companion part */ /* remove companion part */
...@@ -326,7 +332,8 @@ static void handle_conflict_expanding(struct uwb_ie_drp *drp_ie, int ext_beacon_ ...@@ -326,7 +332,8 @@ static void handle_conflict_expanding(struct uwb_ie_drp *drp_ie, int ext_beacon_
/* drop some mases with reason modified */ /* drop some mases with reason modified */
/* put in the companion the mases to be dropped */ /* put in the companion the mases to be dropped */
bitmap_andnot(mv->companion_mas.bm, rsv->mas.bm, conflicting_mas->bm, UWB_NUM_MAS); bitmap_andnot(mv->companion_mas.bm, rsv->mas.bm,
conflicting_mas->bm, UWB_NUM_MAS);
uwb_rsv_set_state(rsv, UWB_RSV_STATE_O_MODIFIED); uwb_rsv_set_state(rsv, UWB_RSV_STATE_O_MODIFIED);
} else { /* it is a target rsv */ } else { /* it is a target rsv */
uwb_rsv_set_state(rsv, UWB_RSV_STATE_T_CONFLICT); uwb_rsv_set_state(rsv, UWB_RSV_STATE_T_CONFLICT);
...@@ -336,7 +343,7 @@ static void handle_conflict_expanding(struct uwb_ie_drp *drp_ie, int ext_beacon_ ...@@ -336,7 +343,7 @@ static void handle_conflict_expanding(struct uwb_ie_drp *drp_ie, int ext_beacon_
} }
static void uwb_drp_handle_conflict_rsv(struct uwb_rc *rc, struct uwb_rsv *rsv, static void uwb_drp_handle_conflict_rsv(struct uwb_rc *rc, struct uwb_rsv *rsv,
struct uwb_rc_evt_drp *drp_evt, struct uwb_rc_evt_drp *drp_evt,
struct uwb_ie_drp *drp_ie, struct uwb_ie_drp *drp_ie,
struct uwb_mas_bm *conflicting_mas) struct uwb_mas_bm *conflicting_mas)
{ {
...@@ -345,83 +352,107 @@ static void uwb_drp_handle_conflict_rsv(struct uwb_rc *rc, struct uwb_rsv *rsv, ...@@ -345,83 +352,107 @@ static void uwb_drp_handle_conflict_rsv(struct uwb_rc *rc, struct uwb_rsv *rsv,
/* check if the conflicting reservation has two drp_ies */ /* check if the conflicting reservation has two drp_ies */
if (uwb_rsv_has_two_drp_ies(rsv)) { if (uwb_rsv_has_two_drp_ies(rsv)) {
mv = &rsv->mv; mv = &rsv->mv;
if (bitmap_intersects(rsv->mas.bm, conflicting_mas->bm, UWB_NUM_MAS)) { if (bitmap_intersects(rsv->mas.bm, conflicting_mas->bm,
handle_conflict_expanding(drp_ie, drp_evt->beacon_slot_number, UWB_NUM_MAS)) {
rsv, false, conflicting_mas); handle_conflict_expanding(drp_ie,
drp_evt->beacon_slot_number,
rsv, false, conflicting_mas);
} else { } else {
if (bitmap_intersects(mv->companion_mas.bm, conflicting_mas->bm, UWB_NUM_MAS)) { if (bitmap_intersects(mv->companion_mas.bm,
handle_conflict_expanding(drp_ie, drp_evt->beacon_slot_number, conflicting_mas->bm, UWB_NUM_MAS)) {
rsv, true, conflicting_mas); handle_conflict_expanding(
drp_ie, drp_evt->beacon_slot_number,
rsv, true, conflicting_mas);
} }
} }
} else if (bitmap_intersects(rsv->mas.bm, conflicting_mas->bm, UWB_NUM_MAS)) { } else if (bitmap_intersects(rsv->mas.bm, conflicting_mas->bm,
handle_conflict_normal(drp_ie, drp_evt->beacon_slot_number, rsv, conflicting_mas); UWB_NUM_MAS)) {
handle_conflict_normal(drp_ie, drp_evt->beacon_slot_number,
rsv, conflicting_mas);
} }
} }
static void uwb_drp_handle_all_conflict_rsv(struct uwb_rc *rc, static void uwb_drp_handle_all_conflict_rsv(struct uwb_rc *rc,
struct uwb_rc_evt_drp *drp_evt, struct uwb_rc_evt_drp *drp_evt,
struct uwb_ie_drp *drp_ie, struct uwb_ie_drp *drp_ie,
struct uwb_mas_bm *conflicting_mas) struct uwb_mas_bm *conflicting_mas)
{ {
struct uwb_rsv *rsv; struct uwb_rsv *rsv;
list_for_each_entry(rsv, &rc->reservations, rc_node) { list_for_each_entry(rsv, &rc->reservations, rc_node) {
uwb_drp_handle_conflict_rsv(rc, rsv, drp_evt, drp_ie, conflicting_mas); uwb_drp_handle_conflict_rsv(rc, rsv, drp_evt, drp_ie,
conflicting_mas);
}
}
static void uwb_drp_process_target_accepted(struct uwb_rc *rc,
struct uwb_rsv *rsv, struct uwb_rc_evt_drp *drp_evt,
struct uwb_ie_drp *drp_ie, struct uwb_mas_bm *mas)
{
struct uwb_rsv_move *mv = &rsv->mv;
int status;
status = uwb_ie_drp_status(drp_ie);
if (rsv->state == UWB_RSV_STATE_T_CONFLICT) {
uwb_rsv_set_state(rsv, UWB_RSV_STATE_T_CONFLICT);
return;
}
if (rsv->state == UWB_RSV_STATE_T_EXPANDING_ACCEPTED) {
/* drp_ie is companion */
if (!bitmap_equal(rsv->mas.bm, mas->bm, UWB_NUM_MAS)) {
/* stroke companion */
uwb_rsv_set_state(rsv,
UWB_RSV_STATE_T_EXPANDING_ACCEPTED);
}
} else {
if (!bitmap_equal(rsv->mas.bm, mas->bm, UWB_NUM_MAS)) {
if (uwb_drp_avail_reserve_pending(rc, mas) == -EBUSY) {
/* FIXME: there is a conflict, find
* the conflicting reservations and
* take a sensible action. Consider
* that in drp_ie there is the
* "neighbour" */
uwb_drp_handle_all_conflict_rsv(rc, drp_evt,
drp_ie, mas);
} else {
/* accept the extra reservation */
bitmap_copy(mv->companion_mas.bm, mas->bm,
UWB_NUM_MAS);
uwb_rsv_set_state(rsv,
UWB_RSV_STATE_T_EXPANDING_ACCEPTED);
}
} else {
if (status) {
uwb_rsv_set_state(rsv,
UWB_RSV_STATE_T_ACCEPTED);
}
}
} }
} }
/* /*
* Based on the DRP IE, transition a target reservation to a new * Based on the DRP IE, transition a target reservation to a new
* state. * state.
*/ */
static void uwb_drp_process_target(struct uwb_rc *rc, struct uwb_rsv *rsv, static void uwb_drp_process_target(struct uwb_rc *rc, struct uwb_rsv *rsv,
struct uwb_ie_drp *drp_ie, struct uwb_rc_evt_drp *drp_evt) struct uwb_ie_drp *drp_ie, struct uwb_rc_evt_drp *drp_evt)
{ {
struct device *dev = &rc->uwb_dev.dev; struct device *dev = &rc->uwb_dev.dev;
struct uwb_rsv_move *mv = &rsv->mv; struct uwb_rsv_move *mv = &rsv->mv;
int status; int status;
enum uwb_drp_reason reason_code; enum uwb_drp_reason reason_code;
struct uwb_mas_bm mas; struct uwb_mas_bm mas;
status = uwb_ie_drp_status(drp_ie); status = uwb_ie_drp_status(drp_ie);
reason_code = uwb_ie_drp_reason_code(drp_ie); reason_code = uwb_ie_drp_reason_code(drp_ie);
uwb_drp_ie_to_bm(&mas, drp_ie); uwb_drp_ie_to_bm(&mas, drp_ie);
switch (reason_code) { switch (reason_code) {
case UWB_DRP_REASON_ACCEPTED: case UWB_DRP_REASON_ACCEPTED:
uwb_drp_process_target_accepted(rc, rsv, drp_evt, drp_ie, &mas);
if (rsv->state == UWB_RSV_STATE_T_CONFLICT) {
uwb_rsv_set_state(rsv, UWB_RSV_STATE_T_CONFLICT);
break;
}
if (rsv->state == UWB_RSV_STATE_T_EXPANDING_ACCEPTED) {
/* drp_ie is companion */
if (!bitmap_equal(rsv->mas.bm, mas.bm, UWB_NUM_MAS))
/* stroke companion */
uwb_rsv_set_state(rsv, UWB_RSV_STATE_T_EXPANDING_ACCEPTED);
} else {
if (!bitmap_equal(rsv->mas.bm, mas.bm, UWB_NUM_MAS)) {
if (uwb_drp_avail_reserve_pending(rc, &mas) == -EBUSY) {
/* FIXME: there is a conflict, find
* the conflicting reservations and
* take a sensible action. Consider
* that in drp_ie there is the
* "neighbour" */
uwb_drp_handle_all_conflict_rsv(rc, drp_evt, drp_ie, &mas);
} else {
/* accept the extra reservation */
bitmap_copy(mv->companion_mas.bm, mas.bm, UWB_NUM_MAS);
uwb_rsv_set_state(rsv, UWB_RSV_STATE_T_EXPANDING_ACCEPTED);
}
} else {
if (status) {
uwb_rsv_set_state(rsv, UWB_RSV_STATE_T_ACCEPTED);
}
}
}
break; break;
case UWB_DRP_REASON_MODIFIED: case UWB_DRP_REASON_MODIFIED:
...@@ -434,7 +465,8 @@ static void uwb_drp_process_target(struct uwb_rc *rc, struct uwb_rsv *rsv, ...@@ -434,7 +465,8 @@ static void uwb_drp_process_target(struct uwb_rc *rc, struct uwb_rsv *rsv,
/* find if the owner wants to expand or reduce */ /* find if the owner wants to expand or reduce */
if (bitmap_subset(mas.bm, rsv->mas.bm, UWB_NUM_MAS)) { if (bitmap_subset(mas.bm, rsv->mas.bm, UWB_NUM_MAS)) {
/* owner is reducing */ /* owner is reducing */
bitmap_andnot(mv->companion_mas.bm, rsv->mas.bm, mas.bm, UWB_NUM_MAS); bitmap_andnot(mv->companion_mas.bm, rsv->mas.bm, mas.bm,
UWB_NUM_MAS);
uwb_drp_avail_release(rsv->rc, &mv->companion_mas); uwb_drp_avail_release(rsv->rc, &mv->companion_mas);
} }
...@@ -447,6 +479,48 @@ static void uwb_drp_process_target(struct uwb_rc *rc, struct uwb_rsv *rsv, ...@@ -447,6 +479,48 @@ static void uwb_drp_process_target(struct uwb_rc *rc, struct uwb_rsv *rsv,
} }
} }
static void uwb_drp_process_owner_accepted(struct uwb_rsv *rsv,
struct uwb_mas_bm *mas)
{
struct uwb_rsv_move *mv = &rsv->mv;
switch (rsv->state) {
case UWB_RSV_STATE_O_PENDING:
case UWB_RSV_STATE_O_INITIATED:
case UWB_RSV_STATE_O_ESTABLISHED:
uwb_rsv_set_state(rsv, UWB_RSV_STATE_O_ESTABLISHED);
break;
case UWB_RSV_STATE_O_MODIFIED:
if (bitmap_equal(mas->bm, rsv->mas.bm, UWB_NUM_MAS))
uwb_rsv_set_state(rsv, UWB_RSV_STATE_O_ESTABLISHED);
else
uwb_rsv_set_state(rsv, UWB_RSV_STATE_O_MODIFIED);
break;
case UWB_RSV_STATE_O_MOVE_REDUCING: /* shouldn' t be a problem */
if (bitmap_equal(mas->bm, rsv->mas.bm, UWB_NUM_MAS))
uwb_rsv_set_state(rsv, UWB_RSV_STATE_O_ESTABLISHED);
else
uwb_rsv_set_state(rsv, UWB_RSV_STATE_O_MOVE_REDUCING);
break;
case UWB_RSV_STATE_O_MOVE_EXPANDING:
if (bitmap_equal(mas->bm, mv->companion_mas.bm, UWB_NUM_MAS)) {
/* Companion reservation accepted */
uwb_rsv_set_state(rsv, UWB_RSV_STATE_O_MOVE_COMBINING);
} else {
uwb_rsv_set_state(rsv, UWB_RSV_STATE_O_MOVE_EXPANDING);
}
break;
case UWB_RSV_STATE_O_MOVE_COMBINING:
if (bitmap_equal(mas->bm, rsv->mas.bm, UWB_NUM_MAS))
uwb_rsv_set_state(rsv, UWB_RSV_STATE_O_MOVE_REDUCING);
else
uwb_rsv_set_state(rsv, UWB_RSV_STATE_O_MOVE_COMBINING);
break;
default:
break;
}
}
/* /*
* Based on the DRP IE, transition an owner reservation to a new * Based on the DRP IE, transition an owner reservation to a new
* state. * state.
...@@ -456,7 +530,6 @@ static void uwb_drp_process_owner(struct uwb_rc *rc, struct uwb_rsv *rsv, ...@@ -456,7 +530,6 @@ static void uwb_drp_process_owner(struct uwb_rc *rc, struct uwb_rsv *rsv,
struct uwb_rc_evt_drp *drp_evt) struct uwb_rc_evt_drp *drp_evt)
{ {
struct device *dev = &rc->uwb_dev.dev; struct device *dev = &rc->uwb_dev.dev;
struct uwb_rsv_move *mv = &rsv->mv;
int status; int status;
enum uwb_drp_reason reason_code; enum uwb_drp_reason reason_code;
struct uwb_mas_bm mas; struct uwb_mas_bm mas;
...@@ -468,44 +541,7 @@ static void uwb_drp_process_owner(struct uwb_rc *rc, struct uwb_rsv *rsv, ...@@ -468,44 +541,7 @@ static void uwb_drp_process_owner(struct uwb_rc *rc, struct uwb_rsv *rsv,
if (status) { if (status) {
switch (reason_code) { switch (reason_code) {
case UWB_DRP_REASON_ACCEPTED: case UWB_DRP_REASON_ACCEPTED:
switch (rsv->state) { uwb_drp_process_owner_accepted(rsv, &mas);
case UWB_RSV_STATE_O_PENDING:
case UWB_RSV_STATE_O_INITIATED:
case UWB_RSV_STATE_O_ESTABLISHED:
uwb_rsv_set_state(rsv, UWB_RSV_STATE_O_ESTABLISHED);
break;
case UWB_RSV_STATE_O_MODIFIED:
if (bitmap_equal(mas.bm, rsv->mas.bm, UWB_NUM_MAS)) {
uwb_rsv_set_state(rsv, UWB_RSV_STATE_O_ESTABLISHED);
} else {
uwb_rsv_set_state(rsv, UWB_RSV_STATE_O_MODIFIED);
}
break;
case UWB_RSV_STATE_O_MOVE_REDUCING: /* shouldn' t be a problem */
if (bitmap_equal(mas.bm, rsv->mas.bm, UWB_NUM_MAS)) {
uwb_rsv_set_state(rsv, UWB_RSV_STATE_O_ESTABLISHED);
} else {
uwb_rsv_set_state(rsv, UWB_RSV_STATE_O_MOVE_REDUCING);
}
break;
case UWB_RSV_STATE_O_MOVE_EXPANDING:
if (bitmap_equal(mas.bm, mv->companion_mas.bm, UWB_NUM_MAS)) {
/* Companion reservation accepted */
uwb_rsv_set_state(rsv, UWB_RSV_STATE_O_MOVE_COMBINING);
} else {
uwb_rsv_set_state(rsv, UWB_RSV_STATE_O_MOVE_EXPANDING);
}
break;
case UWB_RSV_STATE_O_MOVE_COMBINING:
if (bitmap_equal(mas.bm, rsv->mas.bm, UWB_NUM_MAS))
uwb_rsv_set_state(rsv, UWB_RSV_STATE_O_MOVE_REDUCING);
else
uwb_rsv_set_state(rsv, UWB_RSV_STATE_O_MOVE_COMBINING);
break;
default:
break;
}
break; break;
default: default:
dev_warn(dev, "ignoring invalid DRP IE state (%d/%d)\n", dev_warn(dev, "ignoring invalid DRP IE state (%d/%d)\n",
...@@ -545,9 +581,9 @@ static void uwb_cnflt_update_work(struct work_struct *work) ...@@ -545,9 +581,9 @@ static void uwb_cnflt_update_work(struct work_struct *work)
cnflt_update_work); cnflt_update_work);
struct uwb_cnflt_alien *c; struct uwb_cnflt_alien *c;
struct uwb_rc *rc = cnflt->rc; struct uwb_rc *rc = cnflt->rc;
unsigned long delay_us = UWB_MAS_LENGTH_US * UWB_MAS_PER_ZONE; unsigned long delay_us = UWB_MAS_LENGTH_US * UWB_MAS_PER_ZONE;
mutex_lock(&rc->rsvs_mutex); mutex_lock(&rc->rsvs_mutex);
list_del(&cnflt->rc_node); list_del(&cnflt->rc_node);
...@@ -556,10 +592,12 @@ static void uwb_cnflt_update_work(struct work_struct *work) ...@@ -556,10 +592,12 @@ static void uwb_cnflt_update_work(struct work_struct *work)
bitmap_zero(rc->cnflt_alien_bitmap.bm, UWB_NUM_MAS); bitmap_zero(rc->cnflt_alien_bitmap.bm, UWB_NUM_MAS);
list_for_each_entry(c, &rc->cnflt_alien_list, rc_node) { list_for_each_entry(c, &rc->cnflt_alien_list, rc_node) {
bitmap_or(rc->cnflt_alien_bitmap.bm, rc->cnflt_alien_bitmap.bm, c->mas.bm, UWB_NUM_MAS); bitmap_or(rc->cnflt_alien_bitmap.bm, rc->cnflt_alien_bitmap.bm,
c->mas.bm, UWB_NUM_MAS);
} }
queue_delayed_work(rc->rsv_workq, &rc->rsv_alien_bp_work, usecs_to_jiffies(delay_us)); queue_delayed_work(rc->rsv_workq, &rc->rsv_alien_bp_work,
usecs_to_jiffies(delay_us));
kfree(cnflt); kfree(cnflt);
mutex_unlock(&rc->rsvs_mutex); mutex_unlock(&rc->rsvs_mutex);
...@@ -583,10 +621,10 @@ static void uwb_drp_handle_alien_drp(struct uwb_rc *rc, struct uwb_ie_drp *drp_i ...@@ -583,10 +621,10 @@ static void uwb_drp_handle_alien_drp(struct uwb_rc *rc, struct uwb_ie_drp *drp_i
struct uwb_cnflt_alien *cnflt; struct uwb_cnflt_alien *cnflt;
char buf[72]; char buf[72];
unsigned long delay_us = UWB_MAS_LENGTH_US * UWB_MAS_PER_ZONE; unsigned long delay_us = UWB_MAS_LENGTH_US * UWB_MAS_PER_ZONE;
uwb_drp_ie_to_bm(&mas, drp_ie); uwb_drp_ie_to_bm(&mas, drp_ie);
bitmap_scnprintf(buf, sizeof(buf), mas.bm, UWB_NUM_MAS); bitmap_scnprintf(buf, sizeof(buf), mas.bm, UWB_NUM_MAS);
list_for_each_entry(cnflt, &rc->cnflt_alien_list, rc_node) { list_for_each_entry(cnflt, &rc->cnflt_alien_list, rc_node) {
if (bitmap_equal(cnflt->mas.bm, mas.bm, UWB_NUM_MAS)) { if (bitmap_equal(cnflt->mas.bm, mas.bm, UWB_NUM_MAS)) {
/* Existing alien BP reservation conflicting /* Existing alien BP reservation conflicting
...@@ -612,7 +650,7 @@ static void uwb_drp_handle_alien_drp(struct uwb_rc *rc, struct uwb_ie_drp *drp_i ...@@ -612,7 +650,7 @@ static void uwb_drp_handle_alien_drp(struct uwb_rc *rc, struct uwb_ie_drp *drp_i
cnflt->rc = rc; cnflt->rc = rc;
INIT_WORK(&cnflt->cnflt_update_work, uwb_cnflt_update_work); INIT_WORK(&cnflt->cnflt_update_work, uwb_cnflt_update_work);
bitmap_copy(cnflt->mas.bm, mas.bm, UWB_NUM_MAS); bitmap_copy(cnflt->mas.bm, mas.bm, UWB_NUM_MAS);
list_add_tail(&cnflt->rc_node, &rc->cnflt_alien_list); list_add_tail(&cnflt->rc_node, &rc->cnflt_alien_list);
...@@ -621,17 +659,17 @@ static void uwb_drp_handle_alien_drp(struct uwb_rc *rc, struct uwb_ie_drp *drp_i ...@@ -621,17 +659,17 @@ static void uwb_drp_handle_alien_drp(struct uwb_rc *rc, struct uwb_ie_drp *drp_i
bitmap_or(rc->cnflt_alien_bitmap.bm, rc->cnflt_alien_bitmap.bm, mas.bm, UWB_NUM_MAS); bitmap_or(rc->cnflt_alien_bitmap.bm, rc->cnflt_alien_bitmap.bm, mas.bm, UWB_NUM_MAS);
queue_delayed_work(rc->rsv_workq, &rc->rsv_alien_bp_work, usecs_to_jiffies(delay_us)); queue_delayed_work(rc->rsv_workq, &rc->rsv_alien_bp_work, usecs_to_jiffies(delay_us));
/* start the timer */ /* start the timer */
uwb_cnflt_alien_stroke_timer(cnflt); uwb_cnflt_alien_stroke_timer(cnflt);
} }
static void uwb_drp_process_not_involved(struct uwb_rc *rc, static void uwb_drp_process_not_involved(struct uwb_rc *rc,
struct uwb_rc_evt_drp *drp_evt, struct uwb_rc_evt_drp *drp_evt,
struct uwb_ie_drp *drp_ie) struct uwb_ie_drp *drp_ie)
{ {
struct uwb_mas_bm mas; struct uwb_mas_bm mas;
uwb_drp_ie_to_bm(&mas, drp_ie); uwb_drp_ie_to_bm(&mas, drp_ie);
uwb_drp_handle_all_conflict_rsv(rc, drp_evt, drp_ie, &mas); uwb_drp_handle_all_conflict_rsv(rc, drp_evt, drp_ie, &mas);
} }
...@@ -651,7 +689,7 @@ static void uwb_drp_process_involved(struct uwb_rc *rc, struct uwb_dev *src, ...@@ -651,7 +689,7 @@ static void uwb_drp_process_involved(struct uwb_rc *rc, struct uwb_dev *src,
*/ */
return; return;
} }
/* /*
* Do nothing with DRP IEs for reservations that have been * Do nothing with DRP IEs for reservations that have been
* terminated. * terminated.
...@@ -660,12 +698,12 @@ static void uwb_drp_process_involved(struct uwb_rc *rc, struct uwb_dev *src, ...@@ -660,12 +698,12 @@ static void uwb_drp_process_involved(struct uwb_rc *rc, struct uwb_dev *src,
uwb_rsv_set_state(rsv, UWB_RSV_STATE_NONE); uwb_rsv_set_state(rsv, UWB_RSV_STATE_NONE);
return; return;
} }
if (uwb_ie_drp_owner(drp_ie)) if (uwb_ie_drp_owner(drp_ie))
uwb_drp_process_target(rc, rsv, drp_ie, drp_evt); uwb_drp_process_target(rc, rsv, drp_ie, drp_evt);
else else
uwb_drp_process_owner(rc, rsv, src, drp_ie, drp_evt); uwb_drp_process_owner(rc, rsv, src, drp_ie, drp_evt);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7