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=-14.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham 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 EAC30C433ED for ; Wed, 12 May 2021 08:58:20 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 30D53613F3 for ; Wed, 12 May 2021 08:58:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 30D53613F3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:From:Cc:To:Subject: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=VE4PI23EELLIpYV5NAVa3ugZ0EgUMMbyf08Bc5eIwm0=; b=oiHNuXFKKteqmkwfi6NID6QVXl dX3vzO5r4EfnSZyytfXahtGWuT/sF0lKKjH82nRdTLcn/Pb2hAzZ+SrvbujWlncIV42gc0yRd5r4S Q7Pfh3MVWvGseLaSQ0otc2O5jgVnrqf8w8YRk3mQHQPDqlboB6xpSfoc4s0BVUPx84spVmTLZB1cb Bhj6ir4+rLVe1gPaCL/mBWBlFR21E7fcIvM47m7qLsIr9KJrqbPrY3kqz+JQRLFlPf0AH+qL4ibls WPUdttn3sshGK10+wCdlqDPPcq2dIugdSNxLxZO3eSNT7IF8+YjtJ9lQEzOCCWpNO3P9RWFz7lfod vRRQ0Fwg==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lgkgw-002Nag-2D; Wed, 12 May 2021 08:58:06 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lgkgt-002NaT-Nz for linux-mediatek@desiato.infradead.org; Wed, 12 May 2021 08:58:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: Content-Type:MIME-Version:Message-ID:Date:From:Cc:To:Subject:Sender:Reply-To: Content-ID:Content-Description:In-Reply-To:References; bh=CtldSd3BfMc55xtuEpdmA3soUnaTpd1tDWthVJCQed0=; b=4kiPcrHfOwpw7/VcBZ0GO4zOSW ejtk8BxjgHPqpfpt6qCMbOzfV14snTMXqMqv79HD0Z/vs/i4iFhrXV8UEoKo0tTw2kmxEEokcodSl EwOVHH7g1ejbpHuGhRpzSSnqI3UyPbBIuc0figUFU3y8+tpH5XNx8Kz4Q/3MArac1E4Ryg9simdMb x9noO+sm3udN9mXOdCuZuXHCIE7qlFNCS2Io51pKPiDoDl4tzxmj09CqQIqUdDQKZXIbT3YWPlLJz 612VI7PO9I9raInuVT6eGE/qoyq8K2czt3FZCJ0kpnhwEInL2J+On3VuwgH3rCDSOfZIiNfYEp6xP SKMdMaGA==; Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lgkgq-00AES2-Uq for linux-mediatek@lists.infradead.org; Wed, 12 May 2021 08:58:02 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id A704E6121E; Wed, 12 May 2021 08:57:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620809880; bh=77/iZK405++keo0USYUubQ5pBenw8MXyV7GP7y+hcEY=; h=Subject:To:Cc:From:Date:From; b=QBTH1J2GtHdQHlcsi7/UtWHQ8uGac97cMgM2Jjgs1LWQp7nTWfjzBksky81iP7+pn lztWbQmYTCR0qvXv6v7VbtvhS7b37dS2FV8+V1uyBBsm2j2FyyLjuvzKsM4TD0cxC3 w1BLpxTeQRe/Prk/sH4QM7tC3Phv2vAbqMEHs33k= Subject: Patch "MIPS: pci-mt7620: fix PLL lock check" has been added to the 5.4-stable tree To: gregkh@linuxfoundation.org, ilya.lipnitskiy@gmail.com, john@phrozen.org, linux-mediatek@lists.infradead.org, tsbogend@alpha.franken.de Cc: From: Date: Wed, 12 May 2021 10:57:34 +0200 Message-ID: <16208098543515@kroah.com> MIME-Version: 1.0 X-stable: commit X-Patchwork-Hint: ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210512_015801_064281_F6EBC71E X-CRM114-Status: GOOD ( 14.48 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org This is a note to let you know that I've just added the patch titled MIPS: pci-mt7620: fix PLL lock check to the 5.4-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: mips-pci-mt7620-fix-pll-lock-check.patch and it can be found in the queue-5.4 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >From c15b99ae2ba9ea30da3c7cd4765b8a4707e530a6 Mon Sep 17 00:00:00 2001 From: Ilya Lipnitskiy Date: Sat, 6 Mar 2021 20:17:24 -0800 Subject: MIPS: pci-mt7620: fix PLL lock check From: Ilya Lipnitskiy commit c15b99ae2ba9ea30da3c7cd4765b8a4707e530a6 upstream. Upstream a long-standing OpenWrt patch [0] that fixes MT7620 PCIe PLL lock check. The existing code checks the wrong register bit: PPLL_SW_SET is not defined in PPLL_CFG1 and bit 31 of PPLL_CFG1 is marked as reserved in the MT7620 Programming Guide. The correct bit to check for PLL lock is PPLL_LD (bit 23). Also reword the error message for clarity. Without this change it is unlikely that this driver ever worked with mainline kernel. [0]: https://lists.infradead.org/pipermail/lede-commits/2017-July/004441.html Signed-off-by: Ilya Lipnitskiy Cc: John Crispin Cc: linux-mips@vger.kernel.org Cc: linux-mediatek@lists.infradead.org Cc: linux-kernel@vger.kernel.org Cc: stable@vger.kernel.org Signed-off-by: Thomas Bogendoerfer Signed-off-by: Greg Kroah-Hartman --- arch/mips/pci/pci-mt7620.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/arch/mips/pci/pci-mt7620.c +++ b/arch/mips/pci/pci-mt7620.c @@ -30,6 +30,7 @@ #define RALINK_GPIOMODE 0x60 #define PPLL_CFG1 0x9c +#define PPLL_LD BIT(23) #define PPLL_DRV 0xa0 #define PDRV_SW_SET BIT(31) @@ -239,8 +240,8 @@ static int mt7620_pci_hw_init(struct pla rt_sysc_m32(0, RALINK_PCIE0_CLK_EN, RALINK_CLKCFG1); mdelay(100); - if (!(rt_sysc_r32(PPLL_CFG1) & PDRV_SW_SET)) { - dev_err(&pdev->dev, "MT7620 PPLL unlock\n"); + if (!(rt_sysc_r32(PPLL_CFG1) & PPLL_LD)) { + dev_err(&pdev->dev, "pcie PLL not locked, aborting init\n"); reset_control_assert(rstpcie0); rt_sysc_m32(RALINK_PCIE0_CLK_EN, 0, RALINK_CLKCFG1); return -1; Patches currently in stable-queue which might be from ilya.lipnitskiy@gmail.com are queue-5.4/mips-pci-mt7620-fix-pll-lock-check.patch queue-5.4/mips-pci-rt2880-fix-slot-0-configuration.patch _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek