From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5CE77C43387 for ; Tue, 15 Jan 2019 17:00:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2C3C820645 for ; Tue, 15 Jan 2019 17:00:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547571650; bh=TXPJLmLLL5CQmATLvnS3rYdpYZrlKBEOLix+mo6tivo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=UY4Gh2tw8uRwP3+08Diqx484FGm0rquLArVCAsN3vzMSHvXpxl3cwjdtQVdl5mIY4 id226IS25E8E/UWOvgdXGULDgJSHDHUOdLZPIv4R5K+DpaXdEOK/Y7dF38wdSQNlBo lpOsQ+L9kzhuJCzVY/FMktt3srQuh2UGzUEsA9Mc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732056AbfAOQiS (ORCPT ); Tue, 15 Jan 2019 11:38:18 -0500 Received: from mail.kernel.org ([198.145.29.99]:54098 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732051AbfAOQiR (ORCPT ); Tue, 15 Jan 2019 11:38:17 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6820B20859; Tue, 15 Jan 2019 16:38:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547570296; bh=TXPJLmLLL5CQmATLvnS3rYdpYZrlKBEOLix+mo6tivo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QRK2/ZNy7HoIw1pLIaxXq0XbJwd+VR6o1gp+S6cA1lyswIbtPDbuTJNrZng67L+EB QXsDCkPbEj/gpUiuG0cBJA594dnOCXxd9H08ndKI2ZP2oqM9kAKZmtyFA3PYcxej35 gjtzu3BDp85wmVtypeayUp08WIYSVdcShYEPU5ro= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ley Foon Tan , Bjorn Helgaas , Claudius Heine Subject: [PATCH 4.4 40/51] PCI: altera: Fix altera_pcie_link_is_up() Date: Tue, 15 Jan 2019 17:35:36 +0100 Message-Id: <20190115154853.050447253@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190115154846.928796000@linuxfoundation.org> References: <20190115154846.928796000@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ley Foon Tan commit eff31f4002c4e25b9b8c39d0a3a551c6c64c77e8 upstream. Originally altera_pcie_link_is_up() decided the link was up if any of the low four bits of the LTSSM register were set. But the link is only up if the LTSSM state is L0, so check for that exact value. [bhelgaas: changelog] Signed-off-by: Ley Foon Tan Signed-off-by: Bjorn Helgaas Cc: Claudius Heine Signed-off-by: Greg Kroah-Hartman --- drivers/pci/host/pcie-altera.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/pci/host/pcie-altera.c +++ b/drivers/pci/host/pcie-altera.c @@ -40,6 +40,7 @@ #define P2A_INT_ENABLE 0x3070 #define P2A_INT_ENA_ALL 0xf #define RP_LTSSM 0x3c64 +#define RP_LTSSM_MASK 0x1f #define LTSSM_L0 0xf /* TLP configuration type 0 and 1 */ @@ -140,7 +141,7 @@ static void tlp_write_tx(struct altera_p static bool altera_pcie_link_is_up(struct altera_pcie *pcie) { - return !!(cra_readl(pcie, RP_LTSSM) & LTSSM_L0); + return !!((cra_readl(pcie, RP_LTSSM) & RP_LTSSM_MASK) == LTSSM_L0); } static bool altera_pcie_valid_config(struct altera_pcie *pcie,