Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755209AbbETVV4 (ORCPT ); Wed, 20 May 2015 17:21:56 -0400 Received: from mail-qk0-f182.google.com ([209.85.220.182]:36248 "EHLO mail-qk0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754819AbbETVVw (ORCPT ); Wed, 20 May 2015 17:21:52 -0400 MIME-Version: 1.0 In-Reply-To: References: From: Bjorn Helgaas Date: Wed, 20 May 2015 16:21:31 -0500 Message-ID: Subject: Re: [PATCH 03/16] ntb: Enable link training for RP mode in the driver probe To: Allen Hubbe Cc: linux-ntb@googlegroups.com, "linux-kernel@vger.kernel.org" , "linux-pci@vger.kernel.org" , Jon Mason , Dave Jiang Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2742 Lines: 71 Please run "git log --oneline drivers/ntb" and make your subject lines consistent. The convention I use in PCI (and what was used in NTB until recently) is - Acronyms and initialisms are capitalized - Subject line is a subsystem prefix ("PCI:", "NTB:", etc.) followed by a complete sentence starting with a capitalized verb, with no period at the end On Wed, May 20, 2015 at 10:41 AM, Allen Hubbe wrote: > From: Dave Jiang > > Link training for RP should be enabled in the driver probe. We should > not have to wait for transport loaded for this to hapen. Otherwise the s/hapen/happen/ > device will not show up on the transparent bridge side. > > Signed-off-by: Dave Jiang > --- > drivers/ntb/hw/intel/ntb_hw_intel.c | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/drivers/ntb/hw/intel/ntb_hw_intel.c b/drivers/ntb/hw/intel/ntb_hw_intel.c > index 05c4b77..d162f22 100644 > --- a/drivers/ntb/hw/intel/ntb_hw_intel.c > +++ b/drivers/ntb/hw/intel/ntb_hw_intel.c > @@ -1333,6 +1333,9 @@ static int snb_poll_link(struct intel_ntb_dev *ndev) > > static int snb_link_is_up(struct intel_ntb_dev *ndev) > { > + if (ndev->ntb.topo == NTB_TOPO_SEC) > + return 1; > + > return NTB_LNK_STA_ACTIVE(ndev->lnk_sta); > } > > @@ -1642,6 +1645,7 @@ static int snb_setup_b2b_mw(struct intel_ntb_dev *ndev, > static int snb_init_ntb(struct intel_ntb_dev *ndev) > { > int rc; > + u32 ntb_ctl; > > if (ndev->bar4_split) > ndev->mw_count = HSX_SPLIT_BAR_MW_COUNT; > @@ -1658,6 +1662,12 @@ static int snb_init_ntb(struct intel_ntb_dev *ndev) > dev_err(ndev_dev(ndev), "NTB Primary config disabled\n"); > return -EINVAL; > } > + > + /* enable link to allow secondary side device to appear */ > + ntb_ctl = ioread32(ndev->self_mmio + ndev->reg->ntb_ctl); > + ntb_ctl &= ~NTB_CTL_DISABLE; > + iowrite32(ntb_ctl, ndev->self_mmio + ndev->reg->ntb_ctl); > + > /* use half the spads for the peer */ > ndev->spad_count >>= 1; > ndev->self_reg = &snb_pri_reg; > -- > 2.4.0.rc0.43.gcf8a8c6 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-pci" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/