From patchwork Tue Apr 26 13:21:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Wunderlich X-Patchwork-Id: 12827191 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CEA6BC433EF for ; Tue, 26 Apr 2022 13:25:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=MURNdS9JFxy6LuGZGYFPJYPXE3R5F/K9ItSHa3UZjc0=; b=mS/1SVO0KoPyeW J3yK6cS0K63eK6zaWd0r94dypc5rfx/G3BlqJDz7m7MAJsc+4MxGe9shhvHVEmGMx14Op1WMNXGPS LuNInNe7AVzNq+zIususklRQSeitKjGZ0N5TryxPGyT0RfN12tqMHn5FRWQBvUyBLsgv2lWkmGOg8 ph7mDP2dAMjritC8FcmC1yQpFxu5Th0hpAVihxj+NkGk2IH3zU+fnbgrmJce2A95phm3KOLFffYB1 mEqtwO0JfDYBmzJa+6oR5CBqoolIUAzXw3fb6uHjG8Qe2xnRuuHKAON7VHYDWLXIQp/3B38uzvLYJ iwFLmxSYoT/A1tLfzNjQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1njLBr-00EZZ6-8X; Tue, 26 Apr 2022 13:25:15 +0000 Received: from mxout3.routing.net ([2a03:2900:1:a::8]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1njL8o-00EXoQ-CJ; Tue, 26 Apr 2022 13:22:08 +0000 Received: from mxbox1.masterlogin.de (unknown [192.168.10.88]) by mxout3.routing.net (Postfix) with ESMTP id E0502603D5; Tue, 26 Apr 2022 13:22:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailerdienst.de; s=20200217; t=1650979324; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EP/4HyFu5fE1FWV2bSGg4OigpJgql6J8UxiMncmb55g=; b=b2J8CHK05TJhuJsV1YzrcrVB5YFprHk1U3MaIj3KXtDmKaiPtj4Cxh3CMlkhrIx2xjGDkd AXx1hkjRIJzg9O+VGS1KhBsQT+u6ABRlnPquNcbxFXrtOro1Rk821cy7f84QKB9yq6Koxu z4foqaWiIOmwAYr3o+bvW8uaIqmIt4c= Received: from localhost.localdomain (fttx-pool-80.245.77.37.bambit.de [80.245.77.37]) by mxbox1.masterlogin.de (Postfix) with ESMTPSA id B5570401C9; Tue, 26 Apr 2022 13:22:03 +0000 (UTC) From: Frank Wunderlich To: linux-rockchip@lists.infradead.org Cc: Frank Wunderlich , Bjorn Helgaas , Rob Herring , Krzysztof Kozlowski , Heiko Stuebner , Kishon Vijay Abraham I , Vinod Koul , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Philipp Zabel , Johan Jonker , Peter Geis , Michael Riesch , linux-pci@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-phy@lists.infradead.org Subject: [RFC/RFT v2 10/11] PCI: rockchip: add a lane-map to rockchip pcie driver Date: Tue, 26 Apr 2022 15:21:38 +0200 Message-Id: <20220426132139.26761-11-linux@fw-web.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220426132139.26761-1-linux@fw-web.de> References: <20220426132139.26761-1-linux@fw-web.de> MIME-Version: 1.0 X-Mail-ID: b94f3b49-ffe6-4505-9833-b0b59dbfd0ed X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220426_062206_632774_C9EA3756 X-CRM114-Status: GOOD ( 16.82 ) X-BeenThere: linux-phy@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Linux Phy Mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-phy" Errors-To: linux-phy-bounces+linux-phy=archiver.kernel.org@lists.infradead.org From: Frank Wunderlich Add a basic lane-map to define which PCIe lanes should be used with this controller. Rockchip driver uses this for bifurcation (true/false) based on lanes should be splitted across controllers or not. On rk3568 there are 2 PCIe Controllers which share PCIe lanes. pcie3x1: pcie@fe270000 //lane1 when using 1+1 pcie3x2: pcie@fe280000 //lane0 when using 1+1 This ends up in one Controller (pcie3x1) uses lane-map = <0 1>; and the other lane-map = <1 0>; (pcie3x2) This means there are 2 lanes (count of numbers), one (by position) is mapped to the first controller, the other one is used on the other controller. In this driver the lane-map is simply converted to the bifurcation bool instead of direct mapping a specific lane to a controller. Signed-off-by: Frank Wunderlich --- v2: - new patch --- drivers/pci/controller/dwc/pcie-dw-rockchip.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/pci/controller/dwc/pcie-dw-rockchip.c b/drivers/pci/controller/dwc/pcie-dw-rockchip.c index 79e909df241c..21cb697a5be1 100644 --- a/drivers/pci/controller/dwc/pcie-dw-rockchip.c +++ b/drivers/pci/controller/dwc/pcie-dw-rockchip.c @@ -60,6 +60,7 @@ struct rockchip_pcie { struct regulator *vpcie3v3; struct irq_domain *irq_domain; bool bifurcation; + u32 lane_map[2]; }; static int rockchip_pcie_readl_apb(struct rockchip_pcie *rockchip, @@ -293,8 +294,10 @@ static int rockchip_pcie_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; struct rockchip_pcie *rockchip; + unsigned int lanecnt = 0; struct pcie_port *pp; int ret; + int len; rockchip = devm_kzalloc(dev, sizeof(*rockchip), GFP_KERNEL); if (!rockchip) @@ -327,8 +330,16 @@ static int rockchip_pcie_probe(struct platform_device *pdev) } } - if (device_property_read_bool(dev, "bifurcation")) - rockchip->bifurcation = true; + len = of_property_read_variable_u32_array(dev->of_node, "lane-map", rockchip->lane_map, + 2, ARRAY_SIZE(rockchip->lane_map)); + + for (int i = 0; i < len; i++) + if (rockchip->lane_map[i]) + lanecnt++; + + rockchip->bifurcation = ((lanecnt > 0) && (lanecnt != len)); + + dev_info(dev, "bifurcation: %s\n", rockchip->bifurcation ? "true" : "false"); ret = rockchip_pcie_phy_init(rockchip); if (ret)