diff options
| author | mav <mav@FreeBSD.org> | 2016-08-18 10:54:21 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2016-08-18 10:54:21 +0000 |
| commit | d8423b981ecefc5d5a96513d5919d273ef27414d (patch) | |
| tree | baf3483c4b0f04036387cce20edeba70ee9eee1e | |
| parent | a2b4eb0d950a332d417f7e6b1e7a60e330c24fe2 (diff) | |
| download | FreeBSD-src-d8423b981ecefc5d5a96513d5919d273ef27414d.zip FreeBSD-src-d8423b981ecefc5d5a96513d5919d273ef27414d.tar.gz | |
MFC r303266: Postpone ntb_get_msix_info() till we need to negotiate MSIX.
Calling it earlier increases the window when MSIX info may change.
This change does not solve the problem completely, but seems logical.
Complete solution should probably include link reset in case of MSIX
remap to trigger new negotiation, but we have no way to get notified
about that now.
| -rw-r--r-- | sys/dev/ntb/ntb_hw/ntb_hw.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/dev/ntb/ntb_hw/ntb_hw.c b/sys/dev/ntb/ntb_hw/ntb_hw.c index 34a60c3..db249db 100644 --- a/sys/dev/ntb/ntb_hw/ntb_hw.c +++ b/sys/dev/ntb/ntb_hw/ntb_hw.c @@ -1099,8 +1099,6 @@ ntb_init_isr(struct ntb_softc *ntb) ntb_create_msix_vec(ntb, num_vectors); rc = ntb_setup_msix(ntb, num_vectors); - if (rc == 0 && HAS_FEATURE(ntb, NTB_SB01BASE_LOCKUP)) - ntb_get_msix_info(ntb); } if (rc != 0) { device_printf(ntb->device, @@ -2735,6 +2733,7 @@ ntb_exchange_msix(void *ctx) if (ntb->peer_msix_done) goto msix_done; + ntb_get_msix_info(ntb); for (i = 0; i < XEON_NONLINK_DB_MSIX_BITS; i++) { ntb_peer_spad_write(ntb->device, NTB_MSIX_DATA0 + i, ntb->msix_data[i].nmd_data); |
