From patchwork Fri Jan 4 16:53:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 10748523 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9EC0113B5 for ; Fri, 4 Jan 2019 16:54:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 89C4628742 for ; Fri, 4 Jan 2019 16:54:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7C0B62875C; Fri, 4 Jan 2019 16:54:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 16DFC28742 for ; Fri, 4 Jan 2019 16:54:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Gw9SrZYOUrzsfu4q5Ma+8u1yIMrbOpQmAQRlnHRiEtU=; b=u+FqtC6UuhuZVi vjdfvGpJjj/N8pWz5JO6p6CADp+Sy7uL0HTZ1kMPhjapoCN7RB1fFEj/+LnNXRzEHVFwT83hTzlBn yj3B9kRx1AHedXUs5VGk1uJmK+M+QcYFQ7cMzq3xc6sH1unQlY2Q6eIoNGcBUlvsgYBSDWHkRE6O/ nvOTWNXlzAAaiUc8foNRe5OgSuC8CxCfEomxX4mXg1LjOlFwx+HNNIstzhhbWJM5pPYQR0iEDT0Df OzCx2FZtAwYbuTro6VFgMii2XZxp3B5ueX3qtU5ev7ob4WGu1wMrIWB8N2g+iFAxlpy1ZyCGMXbER RrsAI3UAs5GhZU7D/j5g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gfSkG-0007pe-8x; Fri, 04 Jan 2019 16:54:52 +0000 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gfSjS-00076j-N2 for linux-arm-kernel@lists.infradead.org; Fri, 04 Jan 2019 16:54:09 +0000 Received: by mail-pg1-x542.google.com with SMTP id w6so17728194pgl.6 for ; Fri, 04 Jan 2019 08:54:02 -0800 (PST) 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=wen/FB8xaUFRJwJXXt0R071jVcMb73q9WaXaVpXXDfA=; b=FePXJ2vyM0DPkriOlPZTp3kGEMXUHOGovkdT6hC8rn+HKoNeujx++uYJMfMzgBBvDp w5XToiAKE9P7QsjAklDWWhRt+NvmubYgPXDCznK7vsTcZRXROEUsWb6vATZXvPJY0ySj I7CKvojal83UJMbnVs9pHzSuDOCo8EGQtcsnpfdhKnFa+Tgo2hYHP5DGL+lLwZV1/SvK /bd0QgFNH6yjd15uQfgTgpWcsnAYzDHgZF4l2plr8lajr3+UBM/KDTQUB6J7Hl2byY+2 B3t09mRJhpi80/wqD+zcIlJmhVy349ZQObFmXRYzgJpjrN8bdc+pOsswHjPuH4yITtc/ ku/g== 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=wen/FB8xaUFRJwJXXt0R071jVcMb73q9WaXaVpXXDfA=; b=jR7v/lO+lKvc8bF/l5IiKipjD7wCF/QnjkJk64MQv6oMsAijNZjSPUd8eghPuxn0+/ MAIe+ubTq1YaCAJEaZGs/bo4eqwKg8zgmzC/8XD9TqROh7HG4OIk3eYfEgU2RC4ZXEiA YWC4VZc5J7KBqPqtN37a6BSXdo4FF/XUcYMKa4RQfdE8GUivD5HzCbI4NdD4XFW/m5ZB 8j8Ob9wK1Ass8vSzl3ThqHRnzSDFVscKeo+BIa17kjC8eV6erdy6UQydcSYXCM+dk80h F9oesVceA6HabPs2OUWIcA3KZE2NXN57vy7gX8sRl7Cs7NHJV04sBvZcoLUjypdUF8Xj RIgg== X-Gm-Message-State: AJcUuke5TS5muVWIAN0dn7EmucfraDmZoY8fbRn87awKnKuLjf9Naq/S oQfPZ0+X9g9dTKq/ty0wYAf6KpydqcE= X-Google-Smtp-Source: ALg8bN6axIlHUN8YBoIZXHGhmJez6SO7ebOJKVW8lj+LNj2C7gYLbQAgjUtkWDm5S1tno2aj3Y9X7A== X-Received: by 2002:a63:1013:: with SMTP id f19mr2283258pgl.38.1546620841974; Fri, 04 Jan 2019 08:54:01 -0800 (PST) Received: from squirtle.lan (c-24-22-235-96.hsd1.wa.comcast.net. [24.22.235.96]) by smtp.gmail.com with ESMTPSA id p67sm101900564pfg.44.2019.01.04.08.54.00 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Jan 2019 08:54:01 -0800 (PST) From: Andrey Smirnov To: Lorenzo Pieralisi Subject: [PATCH v4 3/4] PCI: imx6: Convert DIRECT_SPEED_CHANGE quirk code to use a flag Date: Fri, 4 Jan 2019 08:53:34 -0800 Message-Id: <20190104165335.13205-4-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190104165335.13205-1-andrew.smirnov@gmail.com> References: <20190104165335.13205-1-andrew.smirnov@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190104_085403_278317_4C983891 X-CRM114-Status: GOOD ( 14.07 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "A.s. Dong" , Richard Zhu , linux-arm-kernel@lists.infradead.org, Andrey Smirnov , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Fabio Estevam , linux-imx@nxp.com, Bjorn Helgaas , Leonard Crestez , Chris Healy , Lucas Stach Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Both i.MX7D and i.MX8MQ have the same behaviour when it comes to clearing DIRECT_SPEED_CHANGE bit when no speed change occur. To account for that change the code handling that to use a generic flag instead of checking IP block variant. Cc: Bjorn Helgaas Cc: Fabio Estevam Cc: Chris Healy Cc: Lucas Stach Cc: Leonard Crestez Cc: "A.s. Dong" Cc: Richard Zhu Cc: linux-imx@nxp.com Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Cc: linux-pci@vger.kernel.org Signed-off-by: Andrey Smirnov Reviewed-by: Lucas Stach --- drivers/pci/controller/dwc/pci-imx6.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index c55d93c1187d..75ee0cd7af3b 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -42,6 +42,7 @@ enum imx6_pcie_variants { }; #define IMX6_PCIE_FLAG_IMX6_PHY BIT(0) +#define IMX6_PCIE_FLAG_IMX6_SPEED_CHANGE BIT(1) struct imx6_pcie_drvdata { enum imx6_pcie_variants variant; @@ -711,7 +712,8 @@ static int imx6_pcie_establish_link(struct imx6_pcie *imx6_pcie) tmp |= PORT_LOGIC_SPEED_CHANGE; dw_pcie_writel_dbi(pci, PCIE_LINK_WIDTH_SPEED_CONTROL, tmp); - if (imx6_pcie->drvdata->variant != IMX7D) { + if (imx6_pcie->drvdata->flags & + IMX6_PCIE_FLAG_IMX6_SPEED_CHANGE) { /* * On i.MX7, DIRECT_SPEED_CHANGE behaves differently * from i.MX6 family when no link speed transition @@ -1097,15 +1099,18 @@ static void imx6_pcie_shutdown(struct platform_device *pdev) static const struct imx6_pcie_drvdata drvdata[] = { [IMX6Q] = { .variant = IMX6Q, - .flags = IMX6_PCIE_FLAG_IMX6_PHY, + .flags = IMX6_PCIE_FLAG_IMX6_PHY | + IMX6_PCIE_FLAG_IMX6_SPEED_CHANGE, }, [IMX6SX] = { .variant = IMX6SX, - .flags = IMX6_PCIE_FLAG_IMX6_PHY, + .flags = IMX6_PCIE_FLAG_IMX6_PHY | + IMX6_PCIE_FLAG_IMX6_SPEED_CHANGE, }, [IMX6QP] = { .variant = IMX6QP, - .flags = IMX6_PCIE_FLAG_IMX6_PHY, + .flags = IMX6_PCIE_FLAG_IMX6_PHY | + IMX6_PCIE_FLAG_IMX6_SPEED_CHANGE, }, [IMX7D] = { .variant = IMX7D,