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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D3839C433EF for ; Thu, 25 Nov 2021 12:50:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245494AbhKYMxS (ORCPT ); Thu, 25 Nov 2021 07:53:18 -0500 Received: from mail.kernel.org ([198.145.29.99]:45586 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353575AbhKYMvp (ORCPT ); Thu, 25 Nov 2021 07:51:45 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 312CC610F9; Thu, 25 Nov 2021 12:46:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1637844401; bh=I22+rZTnzG+DDCPyUEnV19dYpz4cUH9W+Ns6gKnI/bo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GjVCqedx94OmhYlagOgMOGMSEpsMVcpvrjaii9/oLYfZ+dIP4NAKEhhvly67MOgJo fJUmifie6FJwo2wUCExn+EZ5MI11dPLKBQIUrhm/zhkwnl6OEZ8UMiX6q+zgb8UdKV t4Jv5i1cVtFsK+Kq/nrw58A0ABDbcxY9R4Thkvq4qNMOnOv+5QqAQLUKMUMHrtdRI1 JNf3J6y21K2JNRS10MM0spUFI6P5Wib+7kZPvtFQDrCI5rnrqjW2PWY/GqXXPTJtUB eOl0XW5GwHXTiUU1O/Z67bJMpM/amWj1r+dk7j3n3P0Xz0hAMJWrivQh6eNA88KPQh LwLQjFtRvh+kQ== Received: by pali.im (Postfix) id 8AD9767E; Thu, 25 Nov 2021 13:46:40 +0100 (CET) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Thomas Petazzoni , Lorenzo Pieralisi , Rob Herring , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Bjorn Helgaas , =?UTF-8?q?Marek=20Beh=C3=BAn?= Cc: linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 10/15] PCI: mvebu: Set PCI Bridge Class Code to PCI Bridge Date: Thu, 25 Nov 2021 13:46:00 +0100 Message-Id: <20211125124605.25915-11-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211125124605.25915-1-pali@kernel.org> References: <20211125124605.25915-1-pali@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org The default value of Class Code of this bridge corresponds to a Memory controller, though. This is probably relict from the past when old Marvell/Galileo PCI-based controllers were used as standalone PCI device for connecting SDRAM or workaround for PCs with broken BIOS. Details are in commit 36de23a4c5f0 ("MIPS: Cobalt: Explain GT64111 early PCI fixup"). Change the Class Code to correspond to a PCI Bridge. Add comment explaining this change. Signed-off-by: Pali Rohár Cc: stable@vger.kernel.org --- drivers/pci/controller/pci-mvebu.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/drivers/pci/controller/pci-mvebu.c b/drivers/pci/controller/pci-mvebu.c index 017ae9f869ac..4edce441901c 100644 --- a/drivers/pci/controller/pci-mvebu.c +++ b/drivers/pci/controller/pci-mvebu.c @@ -225,7 +225,7 @@ static void mvebu_pcie_setup_wins(struct mvebu_pcie_port *port) static void mvebu_pcie_setup_hw(struct mvebu_pcie_port *port) { - u32 ctrl, cmd, mask; + u32 ctrl, cmd, dev_rev, mask; /* Setup PCIe controller to Root Complex mode. */ ctrl = mvebu_readl(port, PCIE_CTRL_OFF); @@ -237,6 +237,32 @@ static void mvebu_pcie_setup_hw(struct mvebu_pcie_port *port) cmd &= ~(PCI_COMMAND_IO | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER); mvebu_writel(port, cmd, PCIE_CMD_OFF); + /* + * Change Class Code of PCI Bridge device to PCI Bridge (0x6004) + * because default value is Memory controller (0x5080). + * + * Note that this mvebu PCI Bridge does not have compliant Type 1 + * Configuration Space. Header Type is reported as Type 0 and it + * has format of Type 0 config space. + * + * Moreover Type 0 BAR registers (ranges 0x10 - 0x28 and 0x30 - 0x34) + * have the same format in Marvell's specification as in PCIe + * specification, but their meaning is totally different and they do + * different things: they are aliased into internal mvebu registers + * (e.g. PCIE_BAR_LO_OFF) and these should not be changed or + * reconfigured by pci device drivers. + * + * Therefore driver uses emulation of PCI Bridge which emulates + * access to configuration space via internal mvebu registers or + * emulated configuration buffer. Driver access these PCI Bridge + * directly for simplification, but these registers can be accessed + * also via standard mvebu way for accessing PCI config space. + */ + dev_rev = mvebu_readl(port, PCIE_DEV_REV_OFF); + dev_rev &= ~0xffffff00; + dev_rev |= (PCI_CLASS_BRIDGE_PCI << 8) << 8; + mvebu_writel(port, dev_rev, PCIE_DEV_REV_OFF); + /* Point PCIe unit MBUS decode windows to DRAM space. */ mvebu_pcie_setup_wins(port); -- 2.20.1 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 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 E6381C433EF for ; Thu, 25 Nov 2021 12:53:56 +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=RRpvgd9gYqNM6GIlQHVp3Rkv+rCrnNowsN580YBTZ+A=; b=IEq7/xnlP0lNDL 0dVnA9hmUhoCwRPl1Gn50zZCopMhTwVUynfmt6RFrWrkciyVlnOPYrewoC65OOCikG2pwHFRozPJU /FKgkxWgkZHc0RykIwiBcQK2zPeRWAuBCgpJOX9W7MFwvUdOKLJUJPIEwhFp0Gda2+glX5hySQAJ2 QQzgCSURrHFlEn6hMO3o4vGDkZ5HPRzeIjFMIhpwm0kDPCymV73xsyCsYBXnzm5zj6E6nDtDML0t5 tOtkdZg13YRylQfZVcZULXqU99+/c3NyuzL1SeTARoLhNoW8M/tjbYnHAHZcAwmlCGm8qpLA+rh3Q BZltMbbIzfmSEaPuvesQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mqEE9-007VKs-Hu; Thu, 25 Nov 2021 12:51:49 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mqE9B-007Sqa-FG for linux-arm-kernel@lists.infradead.org; Thu, 25 Nov 2021 12:46:42 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 312CC610F9; Thu, 25 Nov 2021 12:46:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1637844401; bh=I22+rZTnzG+DDCPyUEnV19dYpz4cUH9W+Ns6gKnI/bo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GjVCqedx94OmhYlagOgMOGMSEpsMVcpvrjaii9/oLYfZ+dIP4NAKEhhvly67MOgJo fJUmifie6FJwo2wUCExn+EZ5MI11dPLKBQIUrhm/zhkwnl6OEZ8UMiX6q+zgb8UdKV t4Jv5i1cVtFsK+Kq/nrw58A0ABDbcxY9R4Thkvq4qNMOnOv+5QqAQLUKMUMHrtdRI1 JNf3J6y21K2JNRS10MM0spUFI6P5Wib+7kZPvtFQDrCI5rnrqjW2PWY/GqXXPTJtUB eOl0XW5GwHXTiUU1O/Z67bJMpM/amWj1r+dk7j3n3P0Xz0hAMJWrivQh6eNA88KPQh LwLQjFtRvh+kQ== Received: by pali.im (Postfix) id 8AD9767E; Thu, 25 Nov 2021 13:46:40 +0100 (CET) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Thomas Petazzoni , Lorenzo Pieralisi , Rob Herring , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Bjorn Helgaas , =?UTF-8?q?Marek=20Beh=C3=BAn?= Cc: linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 10/15] PCI: mvebu: Set PCI Bridge Class Code to PCI Bridge Date: Thu, 25 Nov 2021 13:46:00 +0100 Message-Id: <20211125124605.25915-11-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211125124605.25915-1-pali@kernel.org> References: <20211125124605.25915-1-pali@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211125_044641_612405_589D4D07 X-CRM114-Status: GOOD ( 14.50 ) X-BeenThere: linux-arm-kernel@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="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org VGhlIGRlZmF1bHQgdmFsdWUgb2YgQ2xhc3MgQ29kZSBvZiB0aGlzIGJyaWRnZSBjb3JyZXNwb25k cyB0byBhIE1lbW9yeQpjb250cm9sbGVyLCB0aG91Z2guIFRoaXMgaXMgcHJvYmFibHkgcmVsaWN0 IGZyb20gdGhlIHBhc3Qgd2hlbiBvbGQKTWFydmVsbC9HYWxpbGVvIFBDSS1iYXNlZCBjb250cm9s bGVycyB3ZXJlIHVzZWQgYXMgc3RhbmRhbG9uZSBQQ0kgZGV2aWNlCmZvciBjb25uZWN0aW5nIFNE UkFNIG9yIHdvcmthcm91bmQgZm9yIFBDcyB3aXRoIGJyb2tlbiBCSU9TLiBEZXRhaWxzIGFyZQpp biBjb21taXQgMzZkZTIzYTRjNWYwICgiTUlQUzogQ29iYWx0OiBFeHBsYWluIEdUNjQxMTEgZWFy bHkgUENJIGZpeHVwIikuCgpDaGFuZ2UgdGhlIENsYXNzIENvZGUgdG8gY29ycmVzcG9uZCB0byBh IFBDSSBCcmlkZ2UuCgpBZGQgY29tbWVudCBleHBsYWluaW5nIHRoaXMgY2hhbmdlLgoKU2lnbmVk LW9mZi1ieTogUGFsaSBSb2jDoXIgPHBhbGlAa2VybmVsLm9yZz4KQ2M6IHN0YWJsZUB2Z2VyLmtl cm5lbC5vcmcKLS0tCiBkcml2ZXJzL3BjaS9jb250cm9sbGVyL3BjaS1tdmVidS5jIHwgMjggKysr KysrKysrKysrKysrKysrKysrKysrKysrLQogMSBmaWxlIGNoYW5nZWQsIDI3IGluc2VydGlvbnMo KyksIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL3BjaS9jb250cm9sbGVyL3Bj aS1tdmVidS5jIGIvZHJpdmVycy9wY2kvY29udHJvbGxlci9wY2ktbXZlYnUuYwppbmRleCAwMTdh ZTlmODY5YWMuLjRlZGNlNDQxOTAxYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9wY2kvY29udHJvbGxl ci9wY2ktbXZlYnUuYworKysgYi9kcml2ZXJzL3BjaS9jb250cm9sbGVyL3BjaS1tdmVidS5jCkBA IC0yMjUsNyArMjI1LDcgQEAgc3RhdGljIHZvaWQgbXZlYnVfcGNpZV9zZXR1cF93aW5zKHN0cnVj dCBtdmVidV9wY2llX3BvcnQgKnBvcnQpCiAKIHN0YXRpYyB2b2lkIG12ZWJ1X3BjaWVfc2V0dXBf aHcoc3RydWN0IG12ZWJ1X3BjaWVfcG9ydCAqcG9ydCkKIHsKLQl1MzIgY3RybCwgY21kLCBtYXNr OworCXUzMiBjdHJsLCBjbWQsIGRldl9yZXYsIG1hc2s7CiAKIAkvKiBTZXR1cCBQQ0llIGNvbnRy b2xsZXIgdG8gUm9vdCBDb21wbGV4IG1vZGUuICovCiAJY3RybCA9IG12ZWJ1X3JlYWRsKHBvcnQs IFBDSUVfQ1RSTF9PRkYpOwpAQCAtMjM3LDYgKzIzNywzMiBAQCBzdGF0aWMgdm9pZCBtdmVidV9w Y2llX3NldHVwX2h3KHN0cnVjdCBtdmVidV9wY2llX3BvcnQgKnBvcnQpCiAJY21kICY9IH4oUENJ X0NPTU1BTkRfSU8gfCBQQ0lfQ09NTUFORF9NRU1PUlkgfCBQQ0lfQ09NTUFORF9NQVNURVIpOwog CW12ZWJ1X3dyaXRlbChwb3J0LCBjbWQsIFBDSUVfQ01EX09GRik7CiAKKwkvKgorCSAqIENoYW5n ZSBDbGFzcyBDb2RlIG9mIFBDSSBCcmlkZ2UgZGV2aWNlIHRvIFBDSSBCcmlkZ2UgKDB4NjAwNCkK KwkgKiBiZWNhdXNlIGRlZmF1bHQgdmFsdWUgaXMgTWVtb3J5IGNvbnRyb2xsZXIgKDB4NTA4MCku CisJICoKKwkgKiBOb3RlIHRoYXQgdGhpcyBtdmVidSBQQ0kgQnJpZGdlIGRvZXMgbm90IGhhdmUg Y29tcGxpYW50IFR5cGUgMQorCSAqIENvbmZpZ3VyYXRpb24gU3BhY2UuIEhlYWRlciBUeXBlIGlz IHJlcG9ydGVkIGFzIFR5cGUgMCBhbmQgaXQKKwkgKiBoYXMgZm9ybWF0IG9mIFR5cGUgMCBjb25m aWcgc3BhY2UuCisJICoKKwkgKiBNb3Jlb3ZlciBUeXBlIDAgQkFSIHJlZ2lzdGVycyAocmFuZ2Vz IDB4MTAgLSAweDI4IGFuZCAweDMwIC0gMHgzNCkKKwkgKiBoYXZlIHRoZSBzYW1lIGZvcm1hdCBp biBNYXJ2ZWxsJ3Mgc3BlY2lmaWNhdGlvbiBhcyBpbiBQQ0llCisJICogc3BlY2lmaWNhdGlvbiwg YnV0IHRoZWlyIG1lYW5pbmcgaXMgdG90YWxseSBkaWZmZXJlbnQgYW5kIHRoZXkgZG8KKwkgKiBk aWZmZXJlbnQgdGhpbmdzOiB0aGV5IGFyZSBhbGlhc2VkIGludG8gaW50ZXJuYWwgbXZlYnUgcmVn aXN0ZXJzCisJICogKGUuZy4gUENJRV9CQVJfTE9fT0ZGKSBhbmQgdGhlc2Ugc2hvdWxkIG5vdCBi ZSBjaGFuZ2VkIG9yCisJICogcmVjb25maWd1cmVkIGJ5IHBjaSBkZXZpY2UgZHJpdmVycy4KKwkg KgorCSAqIFRoZXJlZm9yZSBkcml2ZXIgdXNlcyBlbXVsYXRpb24gb2YgUENJIEJyaWRnZSB3aGlj aCBlbXVsYXRlcworCSAqIGFjY2VzcyB0byBjb25maWd1cmF0aW9uIHNwYWNlIHZpYSBpbnRlcm5h bCBtdmVidSByZWdpc3RlcnMgb3IKKwkgKiBlbXVsYXRlZCBjb25maWd1cmF0aW9uIGJ1ZmZlci4g RHJpdmVyIGFjY2VzcyB0aGVzZSBQQ0kgQnJpZGdlCisJICogZGlyZWN0bHkgZm9yIHNpbXBsaWZp Y2F0aW9uLCBidXQgdGhlc2UgcmVnaXN0ZXJzIGNhbiBiZSBhY2Nlc3NlZAorCSAqIGFsc28gdmlh IHN0YW5kYXJkIG12ZWJ1IHdheSBmb3IgYWNjZXNzaW5nIFBDSSBjb25maWcgc3BhY2UuCisJICov CisJZGV2X3JldiA9IG12ZWJ1X3JlYWRsKHBvcnQsIFBDSUVfREVWX1JFVl9PRkYpOworCWRldl9y ZXYgJj0gfjB4ZmZmZmZmMDA7CisJZGV2X3JldiB8PSAoUENJX0NMQVNTX0JSSURHRV9QQ0kgPDwg OCkgPDwgODsKKwltdmVidV93cml0ZWwocG9ydCwgZGV2X3JldiwgUENJRV9ERVZfUkVWX09GRik7 CisKIAkvKiBQb2ludCBQQ0llIHVuaXQgTUJVUyBkZWNvZGUgd2luZG93cyB0byBEUkFNIHNwYWNl LiAqLwogCW12ZWJ1X3BjaWVfc2V0dXBfd2lucyhwb3J0KTsKIAotLSAKMi4yMC4xCgoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KbGludXgtYXJtLWtlcm5l bCBtYWlsaW5nIGxpc3QKbGludXgtYXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6 Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8vbGludXgtYXJtLWtlcm5lbAo=