From patchwork Wed Mar 20 08:56:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver O'Halloran X-Patchwork-Id: 1058975 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44PPCG5tphz9sNr for ; Wed, 20 Mar 2019 20:05:30 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="rym88nzP"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 44PPCG4jG1zDqRL for ; Wed, 20 Mar 2019 20:05:30 +1100 (AEDT) X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::52e; helo=mail-pg1-x52e.google.com; envelope-from=oohall@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="rym88nzP"; dkim-atps=neutral Received: from mail-pg1-x52e.google.com (mail-pg1-x52e.google.com [IPv6:2607:f8b0:4864:20::52e]) (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 44PP1p61nwzDqNg for ; Wed, 20 Mar 2019 19:57:18 +1100 (AEDT) Received: by mail-pg1-x52e.google.com with SMTP id i2so1287713pgj.11 for ; Wed, 20 Mar 2019 01:57:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=62bo6wvjt4VZvuyyxirz2ZkUl9hvetCM+BNE8Qc9oSU=; b=rym88nzPh4pK6V9Bcx3MB/zRy25mhYwOG/je3KFNmwUbxtswmCanLAN+wM+KYTIYTa PbgNyqx6MQRKTlSA45TZItozRPZKbq5dixze6Spmjvj1F40av6LpgDuIReBJn5TXzgcK TqfDgGChp2u0W5hZ6QymErK7MhGHMl+vXdcaMoluRLJss84O9hdzMo3D9yOYVrK6ZXKe yoYDRsAeQhu8J9FjR0naOTzgzH2BB6SLXWqRPj81wyrpW9rX17yUKL+6boUgMrnlgNTD Jb03MIDwO21l/1cb4LoarCCsS6wQ7g/8OmGe+sARlq7Nk7DJ9XD1XE21aS2HMci2BJzR kwpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=62bo6wvjt4VZvuyyxirz2ZkUl9hvetCM+BNE8Qc9oSU=; b=kKoQU9Za4FD1G7nOdsZY7uj4nAdUf2ZKhG6KNJmEFSpo34mzU2i+JqEE3GVeezJ9/2 u6O1jqDEI91I7qdYmd9tBejgWduZ0tcNkMiqi2c+PXU7+IYi+JjbtG/tdunNAuWaPSJY mTqxaoposPfcH1uqrrEsjhX3Q3tBgmU14lq54JPWnAONV18z/VlOclFNrJ0liXjxIvxd lsgjWQSpoX0n8txUi4F+q2uNClPJKnK8mW7vjd1x9KiMLKBcOuIRK327L7of/EQVzqxV NixTjxuCFsRudlOQzdPUx43VoassmSGF0VPBNTArzmwxA2ri7lVmJmi8sUKrklPneyTQ XeXQ== X-Gm-Message-State: APjAAAWO2tmHsKYc1ywYPHtcOESqzh9qrux3qYOo+Ml5r94u4o/MqbfN YxQnsMm3Ru+dOmjdFroMR1bko8Bi X-Google-Smtp-Source: APXvYqyJElL2IshhvMpEaxKwCRDGHGxy3zORDjCO49u77IP3uRlWn+Dm/jFSGm5b6SMgHJezFhUmCw== X-Received: by 2002:a62:4e8a:: with SMTP id c132mr6642798pfb.24.1553072236316; Wed, 20 Mar 2019 01:57:16 -0700 (PDT) Received: from wafer.ozlabs.ibm.com ([122.99.82.10]) by smtp.gmail.com with ESMTPSA id p20sm1616379pgi.3.2019.03.20.01.57.14 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 20 Mar 2019 01:57:15 -0700 (PDT) From: Oliver O'Halloran To: skiboot@lists.ozlabs.org Date: Wed, 20 Mar 2019 19:56:56 +1100 Message-Id: <20190320085656.32078-4-oohall@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190320085656.32078-1-oohall@gmail.com> References: <20190320085656.32078-1-oohall@gmail.com> MIME-Version: 1.0 Subject: [Skiboot] [PATCH 4/4] hw/phb4: Drop FRESET_DEASSERT_DELAY state X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mikey@neuling.org Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" The delay between the ASSERT_DELAY and DEASSERT_DELAY states is set to one timebase tick. This state seems to have been a hold over from PHB3 where it was used to add a 1s delay between de-asserting PERST and polling the link for the CAPI FPGA. There's no requirement for that here since the link polling on PHB4 is a bit smarter so we should be fine. Signed-off-by: Oliver O'Halloran --- hw/phb4.c | 5 ----- include/phb4.h | 1 - 2 files changed, 6 deletions(-) diff --git a/hw/phb4.c b/hw/phb4.c index 770c11efb99c..65288cfd3072 100644 --- a/hw/phb4.c +++ b/hw/phb4.c @@ -2999,11 +2999,6 @@ static int64_t phb4_freset(struct pci_slot *slot) PHBDBG(p, "FRESET: Deassert\n"); phb4_assert_perst(slot, false); - pci_slot_set_state(slot, PHB4_SLOT_FRESET_DEASSERT_DELAY); - return pci_slot_set_sm_timeout(slot, msecs_to_tb(1)); - - case PHB4_SLOT_FRESET_DEASSERT_DELAY: - PHBDBG(p, "FRESET: Starting training\n"); phb4_training_trace(p); diff --git a/include/phb4.h b/include/phb4.h index 605effecfba1..c52a840d99ca 100644 --- a/include/phb4.h +++ b/include/phb4.h @@ -125,7 +125,6 @@ #define PHB4_SLOT_FRESET PCI_SLOT_STATE_FRESET #define PHB4_SLOT_FRESET_START (PHB4_SLOT_FRESET + 1) #define PHB4_SLOT_FRESET_ASSERT_DELAY (PHB4_SLOT_FRESET + 2) -#define PHB4_SLOT_FRESET_DEASSERT_DELAY (PHB4_SLOT_FRESET + 3) #define PHB4_SLOT_CRESET PCI_SLOT_STATE_CRESET #define PHB4_SLOT_CRESET_START (PHB4_SLOT_CRESET + 1) #define PHB4_SLOT_CRESET_WAIT_CQ (PHB4_SLOT_CRESET + 2)