diff options
| -rw-r--r-- | drivers/staging/rdma/hfi1/driver.c | 13 | ||||
| -rw-r--r-- | drivers/staging/rdma/hfi1/mad.c | 24 |
2 files changed, 30 insertions, 7 deletions
diff --git a/drivers/staging/rdma/hfi1/driver.c b/drivers/staging/rdma/hfi1/driver.c index 76ed5f7784a0..45818646eb99 100644 --- a/drivers/staging/rdma/hfi1/driver.c +++ b/drivers/staging/rdma/hfi1/driver.c @@ -1169,6 +1169,12 @@ void shutdown_led_override(struct hfi1_pportdata *ppd) { struct hfi1_devdata *dd = ppd->dd; + /* + * This pairs with the memory barrier implied by the atomic_dec in + * hfi1_set_led_override to ensure that we read the correct state of + * LED beaconing represented by led_override_timer_active + */ + smp_mb(); if (atomic_read(&ppd->led_override_timer_active)) { del_timer_sync(&ppd->led_override_timer); atomic_set(&ppd->led_override_timer_active, 0); @@ -1199,11 +1205,14 @@ static void run_led_override(unsigned long opaque) * don't re-fire the timer if user asked for it to be off; we let * it fire one more time after they turn it off to simplify */ - if (ppd->led_override_vals[0] || ppd->led_override_vals[1]) + if (ppd->led_override_vals[0] || ppd->led_override_vals[1]) { mod_timer(&ppd->led_override_timer, jiffies + timeout); - else + } else { /* Hand control of the LED to the DC for normal operation */ write_csr(dd, DCC_CFG_LED_CNTRL, 0); + /* Record that we did not re-fire the timer */ + atomic_dec(&ppd->led_override_timer_active); + } } /* diff --git a/drivers/staging/rdma/hfi1/mad.c b/drivers/staging/rdma/hfi1/mad.c index 78931fccbac0..5925798db4d1 100644 --- a/drivers/staging/rdma/hfi1/mad.c +++ b/drivers/staging/rdma/hfi1/mad.c @@ -516,6 +516,7 @@ static int __subn_get_opa_portinfo(struct opa_smp *smp, u32 am, u8 *data, struct opa_port_info *pi = (struct opa_port_info *)data; u8 mtu; u8 credit_rate; + u8 is_beaconing_active; u32 state; u32 num_ports = OPA_AM_NPORT(am); u32 start_of_sm_config = OPA_AM_START_SM_CFG(am); @@ -581,6 +582,14 @@ static int __subn_get_opa_portinfo(struct opa_smp *smp, u32 am, u8 *data, pi->port_states.ledenable_offlinereason = ppd->neighbor_normal << 4; pi->port_states.ledenable_offlinereason |= ppd->is_sm_config_started << 5; + /* + * This pairs with the memory barrier implied by the atomic_dec in + * hfi1_set_led_override to ensure that we read the correct state of + * LED beaconing represented by led_override_timer_active + */ + smp_mb(); + is_beaconing_active = !!atomic_read(&ppd->led_override_timer_active); + pi->port_states.ledenable_offlinereason |= is_beaconing_active << 6; pi->port_states.ledenable_offlinereason |= ppd->offline_disabled_reason; #else @@ -3578,19 +3587,24 @@ static int __subn_get_opa_led_info(struct opa_smp *smp, u32 am, u8 *data, u32 *resp_len) { struct hfi1_devdata *dd = dd_from_ibdev(ibdev); + struct hfi1_pportdata *ppd = dd->pport; struct opa_led_info *p = (struct opa_led_info *)data; u32 nport = OPA_AM_NPORT(am); - u64 reg; + u32 is_beaconing_active; if (nport != 1) { smp->status |= IB_SMP_INVALID_FIELD; return reply((struct ib_mad_hdr *)smp); } - reg = read_csr(dd, DCC_CFG_LED_CNTRL); - if ((reg & DCC_CFG_LED_CNTRL_LED_CNTRL_SMASK) && - ((reg & DCC_CFG_LED_CNTRL_LED_SW_BLINK_RATE_SMASK) == 0xf)) - p->rsvd_led_mask = cpu_to_be32(OPA_LED_MASK); + /* + * This pairs with the memory barrier implied by the atomic_dec in + * hfi1_set_led_override to ensure that we read the correct state of + * LED beaconing represented by led_override_timer_active + */ + smp_mb(); + is_beaconing_active = !!atomic_read(&ppd->led_override_timer_active); + p->rsvd_led_mask = cpu_to_be32(is_beaconing_active << OPA_LED_SHIFT); if (resp_len) *resp_len += sizeof(struct opa_led_info); |