From patchwork Wed May 25 15:03:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 626228 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3rFFtB4HMBz9sdg; Thu, 26 May 2016 01:04:18 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical-com.20150623.gappssmtp.com header.i=@canonical-com.20150623.gappssmtp.com header.b=w8A/+LTN; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1b5aM3-0001xq-GN; Wed, 25 May 2016 15:04:15 +0000 Received: from mail-ig0-f179.google.com ([209.85.213.179]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1b5aLt-0001wZ-Ve for kernel-team@lists.ubuntu.com; Wed, 25 May 2016 15:04:06 +0000 Received: by mail-ig0-f179.google.com with SMTP id bi2so73112415igb.0 for ; Wed, 25 May 2016 08:04:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=xd0Qh8q8u9CNWopYp+mo4MfrqJWSRILIhe+wAGfHYFQ=; b=w8A/+LTNycerAx/1vH8TOfvUgSlJ107vBChKhfq7749gM2lxf6Cck/GDdWcIY32LkS ffx47t2Z1bDHOwP8dPkdCJhM0dmN8ZEZEVO8xbkVSeMNQqptGrd71JSpa+jXCp+HliP4 ztpJ5MaGWi4pyk5FEOBtKQlsQ56fnqFGmQe9pMuvD0sEpRHQnIdh6LC1GkJQLv279ANN YzaHq1gQXm1zbHU7NDDNp8qpy6Wa+Gonxme6dxxEAcOCXcsckXOALpe2Cjc9JpWzxJd+ z8B7EReivIphXlUNeG7G1JoxWupsH8dw6QM1er7DJ3QcnEv1KWoAdpTraMVoPdflFsy7 AAyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=xd0Qh8q8u9CNWopYp+mo4MfrqJWSRILIhe+wAGfHYFQ=; b=CJCqMDJfG3wKhJBpBA7bx5EqqAIJbnfE2JLYMLvqCOHKMSH9e1RTkc35vEBLLjSBbg sd+net8cQGkrrbbkKR/1rVEN2i4CFwWFuIFQg2el4qOOd5S6DiW4SyG4bE7O8bJdjo2T C9wAsdFm0QLk6M1VKpbdx/aPndEF8tXfsyMF6DKwtfjq8pJxuvca8fcntdHKaAX0jZc2 YwoObz1XydXVuDssLU3sTYML98qIOgcNffH2jvdlfYJRn+vMXT4kAW41BsDTMh7dnSBc 6kNlPZ8e8+exf1ndVrrFdd7xTnW5zsW5KXMM2ZHvxrP1po2NIqHFyQC/Nt4mNSsXU0sJ D37Q== X-Gm-Message-State: AOPr4FWGKfD9oOeGYCzkpBIbNNom/Nm4S1xpXVJcJr1wRS17QXEymTg0NhcpV9GllRvNy7Nj X-Received: by 10.51.18.165 with SMTP id gn5mr22966593igd.24.1464188644760; Wed, 25 May 2016 08:04:04 -0700 (PDT) Received: from localhost.localdomain (host-174-45-44-32.hln-mt.client.bresnan.net. [174.45.44.32]) by smtp.gmail.com with ESMTPSA id f189sm2916981ioe.44.2016.05.25.08.04.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 25 May 2016 08:04:04 -0700 (PDT) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH 3/3 Xenial SRU v2] cxl: Increase timeout for detection of AFU mmio hang Date: Wed, 25 May 2016 09:03:53 -0600 Message-Id: <1464188633-4251-3-git-send-email-tim.gardner@canonical.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1464188633-4251-1-git-send-email-tim.gardner@canonical.com> References: <20160525070451.GM3722@brain> <1464188633-4251-1-git-send-email-tim.gardner@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com From: Frederic Barrat BugLink: http://bugs.launchpad.net/bugs/1584066 PSL designers recommend a larger value for the mmio hang pulse, 256 us instead of 1 us. The CAIA architecture states that it needs to be smaller than 1/2 of the RTOS timeout set in the PHB for outbound non-posted transactions, which is still (easily) the case here. Signed-off-by: Frederic Barrat Acked-by: Ian Munsie Tested-by: Frank Haverkamp Tested-by: Manoj Kumar Signed-off-by: Michael Ellerman (cherry picked from commit 4aec6ec0da9c72c0fa1a5b0d1133707481347bb3) Signed-off-by: Tim Gardner --- drivers/misc/cxl/pci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/misc/cxl/pci.c b/drivers/misc/cxl/pci.c index 6a91565..b5d3ec5 100644 --- a/drivers/misc/cxl/pci.c +++ b/drivers/misc/cxl/pci.c @@ -394,8 +394,10 @@ static int init_implementation_adapter_regs(struct cxl *adapter, struct pci_dev return -ENODEV; } + psl_dsnctl = 0x0000900000000000ULL; /* pteupd ttype, scdone */ + psl_dsnctl |= (0x2ULL << (63-38)); /* MMIO hang pulse: 256 us */ /* Tell PSL where to route data to */ - psl_dsnctl = 0x0000900002000000ULL | (chipid << (63-5)); + psl_dsnctl |= (chipid << (63-5)); psl_dsnctl |= (capp_unit_id << (63-13)); cxl_p1_write(adapter, CXL_PSL_DSNDCTL, psl_dsnctl);