From owner-svn-src-head@freebsd.org Wed Nov 11 18:56:04 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 40DDDA2CAAA; Wed, 11 Nov 2015 18:56:04 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E5EE01FC2; Wed, 11 Nov 2015 18:56:03 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tABIu2EF008188; Wed, 11 Nov 2015 18:56:02 GMT (envelope-from cem@FreeBSD.org) Received: (from cem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tABIu2JC008186; Wed, 11 Nov 2015 18:56:02 GMT (envelope-from cem@FreeBSD.org) Message-Id: <201511111856.tABIu2JC008186@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org using -f From: "Conrad E. Meyer" Date: Wed, 11 Nov 2015 18:56:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r290686 - in head/sys/dev/ntb: if_ntb ntb_hw X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Nov 2015 18:56:04 -0000 Author: cem Date: Wed Nov 11 18:56:02 2015 New Revision: 290686 URL: https://svnweb.freebsd.org/changeset/base/290686 Log: ntb: volatile some members set by interrupt routines Sponsored by: EMC / Isilon Storage Division Modified: head/sys/dev/ntb/if_ntb/if_ntb.c head/sys/dev/ntb/ntb_hw/ntb_hw.c Modified: head/sys/dev/ntb/if_ntb/if_ntb.c ============================================================================== --- head/sys/dev/ntb/if_ntb/if_ntb.c Wed Nov 11 18:55:53 2015 (r290685) +++ head/sys/dev/ntb/if_ntb/if_ntb.c Wed Nov 11 18:56:02 2015 (r290686) @@ -144,7 +144,7 @@ struct ntb_transport_qp { void *cb_data; bool client_ready; - bool link_is_up; + volatile bool link_is_up; uint8_t qp_num; /* Only 64 QPs are allowed. 0-63 */ struct ntb_rx_info *rx_info; @@ -225,7 +225,7 @@ struct ntb_transport_ctx { struct _qpset qp_bitmap_free; unsigned mw_count; unsigned qp_count; - enum ntb_link_event link_is_up; + volatile bool link_is_up; struct callout link_work; struct task link_cleanup; uint64_t bufsize; Modified: head/sys/dev/ntb/ntb_hw/ntb_hw.c ============================================================================== --- head/sys/dev/ntb/ntb_hw/ntb_hw.c Wed Nov 11 18:55:53 2015 (r290685) +++ head/sys/dev/ntb/ntb_hw/ntb_hw.c Wed Nov 11 18:56:02 2015 (r290686) @@ -209,8 +209,8 @@ struct ntb_softc { #define DB_MASK_ASSERT(sc,f) mtx_assert(&(sc)->db_mask_lock, (f)) struct mtx db_mask_lock; - uint32_t ntb_ctl; - uint32_t lnk_sta; + volatile uint32_t ntb_ctl; + volatile uint32_t lnk_sta; uint64_t db_valid_mask; uint64_t db_link_mask; @@ -1976,9 +1976,11 @@ ntb_sysctl_init(struct ntb_softc *ntb) "Features/errata of this NTB device"); SYSCTL_ADD_UINT(ctx, tree_par, OID_AUTO, "ntb_ctl", CTLFLAG_RD, - &ntb->ntb_ctl, 0, "NTB CTL register (cached)"); + __DEVOLATILE(uint32_t *, &ntb->ntb_ctl), 0, + "NTB CTL register (cached)"); SYSCTL_ADD_UINT(ctx, tree_par, OID_AUTO, "lnk_sta", CTLFLAG_RD, - &ntb->lnk_sta, 0, "LNK STA register (cached)"); + __DEVOLATILE(uint32_t *, &ntb->lnk_sta), 0, + "LNK STA register (cached)"); SYSCTL_ADD_PROC(ctx, tree_par, OID_AUTO, "link_status", CTLFLAG_RD | CTLTYPE_STRING, ntb, 0, sysctl_handle_link_status,