Date: Wed, 11 Nov 2015 18:55:07 +0000 (UTC) From: "Conrad E. Meyer" <cem@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r290680 - head/sys/dev/ntb/ntb_hw Message-ID: <201511111855.tABIt7GF007887@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cem Date: Wed Nov 11 18:55:07 2015 New Revision: 290680 URL: https://svnweb.freebsd.org/changeset/base/290680 Log: ntb_hw: In INTx fallback, correct db shift from 15 to 16 Sponsored by: EMC / Isilon Storage Division Modified: head/sys/dev/ntb/ntb_hw/ntb_hw.c head/sys/dev/ntb/ntb_hw/ntb_regs.h Modified: head/sys/dev/ntb/ntb_hw/ntb_hw.c ============================================================================== --- head/sys/dev/ntb/ntb_hw/ntb_hw.c Wed Nov 11 18:54:58 2015 (r290679) +++ head/sys/dev/ntb/ntb_hw/ntb_hw.c Wed Nov 11 18:55:07 2015 (r290680) @@ -905,7 +905,7 @@ ntb_init_isr(struct ntb_softc *ntb) if (ntb->type == NTB_XEON && num_vectors < ntb->db_vec_count) { ntb->db_vec_count = 1; - ntb->db_vec_shift = ntb->db_count; + ntb->db_vec_shift = XEON_DB_TOTAL_SHIFT; rc = ntb_setup_legacy_interrupt(ntb); } else { ntb_create_msix_vec(ntb, num_vectors); Modified: head/sys/dev/ntb/ntb_hw/ntb_regs.h ============================================================================== --- head/sys/dev/ntb/ntb_hw/ntb_regs.h Wed Nov 11 18:54:58 2015 (r290679) +++ head/sys/dev/ntb/ntb_hw/ntb_regs.h Wed Nov 11 18:55:07 2015 (r290680) @@ -39,6 +39,7 @@ #define XEON_HSX_SPLIT_MW_COUNT 3 /* Reserve the uppermost bit for link interrupt */ #define XEON_DB_COUNT 15 +#define XEON_DB_TOTAL_SHIFT 16 #define XEON_DB_LINK 15 #define XEON_DB_MSIX_VECTOR_COUNT 4 #define XEON_DB_MSIX_VECTOR_SHIFT 5
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511111855.tABIt7GF007887>