From patchwork Tue Apr 3 13:27:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Bergheaud X-Patchwork-Id: 894870 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40GGZG6Q9vz9s0n for ; Wed, 4 Apr 2018 16:41:10 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 40GGZG2LXHzF1qK for ; Wed, 4 Apr 2018 16:41:10 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=linux.ibm.com (client-ip=148.163.158.5; helo=mx0a-001b2d01.pphosted.com; envelope-from=prvs=06319afd6d=felix@linux.ibm.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 40Fv3S3jghzF288 for ; Wed, 4 Apr 2018 02:01:39 +1000 (AEST) Received: from pps.filterd (m0098419.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w33DKt86019627 for ; Tue, 3 Apr 2018 09:28:08 -0400 Received: from e06smtp13.uk.ibm.com (e06smtp13.uk.ibm.com [195.75.94.109]) by mx0b-001b2d01.pphosted.com with ESMTP id 2h499fvqwh-1 (version=TLSv1.2 cipher=AES256-SHA256 bits=256 verify=NOT) for ; Tue, 03 Apr 2018 09:28:08 -0400 Received: from localhost by e06smtp13.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 3 Apr 2018 14:28:06 +0100 Received: from b06cxnps4076.portsmouth.uk.ibm.com (9.149.109.198) by e06smtp13.uk.ibm.com (192.168.101.143) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 3 Apr 2018 14:28:05 +0100 Received: from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com [9.149.105.232]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w33DS4Ib43647208; Tue, 3 Apr 2018 13:28:04 GMT Received: from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6B02B52043; Tue, 3 Apr 2018 13:19:13 +0100 (BST) Received: from smtp.lab.toulouse-stg.fr.ibm.com (unknown [9.101.4.1]) by d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTP id 58D5352041; Tue, 3 Apr 2018 13:19:13 +0100 (BST) Received: from w541.lab.toulouse-stg.fr.ibm.com (t42p.lab.toulouse-stg.fr.ibm.com [9.101.4.37]) by smtp.lab.toulouse-stg.fr.ibm.com (Postfix) with ESMTP id B02E0220078; Tue, 3 Apr 2018 15:28:03 +0200 (CEST) From: Philippe Bergheaud To: skiboot@lists.ozlabs.org Date: Tue, 3 Apr 2018 15:27:46 +0200 X-Mailer: git-send-email 2.16.2 X-TM-AS-GCONF: 00 x-cbid: 18040313-0012-0000-0000-000005C67D5F X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18040313-0013-0000-0000-000019428B8C Message-Id: <20180403132746.29597-1-felix@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2018-04-03_05:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1011 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1804030141 X-Mailman-Approved-At: Wed, 04 Apr 2018 16:41:03 +1000 Subject: [Skiboot] [PATCH] phb4: Do not set the PBCQ Tunnel BAR register when enabling capi mode. X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: clombard@linux.ibm.com, Philippe Bergheaud , benh@au1.ibm.com MIME-Version: 1.0 Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" The cxl driver will set the capi value, like other drivers already do. Signed-off-by: Philippe Bergheaud --- hw/phb4.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/hw/phb4.c b/hw/phb4.c index e45be01f..7ef6f3d4 100644 --- a/hw/phb4.c +++ b/hw/phb4.c @@ -3900,25 +3900,6 @@ static int64_t enable_capi_mode(struct phb4 *p, uint64_t pe_number, ((u64)CAPIMASK << 32) | PHB_CAPI_CMPM_ENABLE); if (!(p->rev == PHB4_REV_NIMBUS_DD10)) { - /* - * PBCQ Tunnel Bar Register - * - * If set, for example by a driver that may already have - * tweaked the tunnel bar, then we do not touch it when - * entering capi mode. It's up to the driver to handle it. - * - * If unset, then we use the PSL_TNR_ADDR[TNR_Addr] reset - * value. For fpga/cxl, this code will define the tunnel bar. - */ - xscom_read(p->chip_id, - p->pe_stk_xscom + XPEC_NEST_STK_TUNNEL_BAR, ®); - if (!reg) { - reg = 0x00020000E0000000ull << 8; - xscom_write(p->chip_id, - p->pe_stk_xscom + XPEC_NEST_STK_TUNNEL_BAR, - reg); - } - /* PB AIB Hardware Control Register * Wait 32 PCI clocks for a credit to become available * before rejecting.