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 E0E79C433F5 for ; Wed, 5 Jan 2022 09:36:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238904AbiAEJgM (ORCPT ); Wed, 5 Jan 2022 04:36:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59780 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238896AbiAEJgL (ORCPT ); Wed, 5 Jan 2022 04:36:11 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 99AC5C061761; Wed, 5 Jan 2022 01:36:11 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 261E06164C; Wed, 5 Jan 2022 09:36:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6C4B8C36AEB; Wed, 5 Jan 2022 09:36:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1641375370; bh=yavQwAI4HRXXhMr+MS64YOLNNUOWumphyROhMVNBb78=; h=From:To:Cc:Subject:Date:From; b=aL1rtyiVFWmFII3cxefiiJn9n6ax/jI47lS1L0WtPUS39sYTpXb5rs7jis2abTzzI hIa/VwDo0VjrRjIenLclVLMwc4i2F2K9oUxTGTiYaDvoFxIS5jWquhvF7mSqa9SoLf PEBe6MSikAIlBe1KxWHc7qfJ75DipZe9ojupZ3i8+DC4IZ0LQHKukCuR5shE4enPty HV6IOQaL5hhms5XMbspWVP14O7W1MTmAsoKjKAi7OmnCEan3M3CG8bVFToG3Z0Ofdu WmrHRvVuVN6dkd3mPYXGe+UBz6dbf05Z32GOFGIMGhAmC1fPj//YinoU565z0G1L3y xHLev+ILRkMvQ== Received: by pali.im (Postfix) id 7898482A; Wed, 5 Jan 2022 10:36:07 +0100 (CET) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Roman Bacik , Lorenzo Pieralisi , Rob Herring , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Bjorn Helgaas Cc: bcm-kernel-feedback-list@broadcom.com, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] PCI: iproc: Set all 24 bits of PCI class code Date: Wed, 5 Jan 2022 10:35:52 +0100 Message-Id: <20220105093552.27542-1-pali@kernel.org> X-Mailer: git-send-email 2.20.1 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 Register 0x43c in its low 24 bits contains PCI class code. Update code to set all 24 bits of PCI class code and not only upper 16 bits of PCI class code. Use a new macro PCI_CLASS_BRIDGE_PCI_NORMAL which represents whole 24 bits of normal PCI bridge class. Signed-off-by: Pali Rohár --- Roman helped me with this change and confirmed that class code is stored really in bits [23:0] of custom register 0x43c (normally class code is stored in bits [31:8] of pci register 0x08). This patch depends on patch which adds PCI_CLASS_BRIDGE_PCI_NORMAL macro: https://lore.kernel.org/linux-pci/20211220145140.31898-1-pali@kernel.org/ --- drivers/pci/controller/pcie-iproc.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/pci/controller/pcie-iproc.c b/drivers/pci/controller/pcie-iproc.c index 3df4ab209253..2519201b0e51 100644 --- a/drivers/pci/controller/pcie-iproc.c +++ b/drivers/pci/controller/pcie-iproc.c @@ -789,14 +789,13 @@ static int iproc_pcie_check_link(struct iproc_pcie *pcie) return -EFAULT; } - /* force class to PCI_CLASS_BRIDGE_PCI (0x0604) */ + /* force class to PCI_CLASS_BRIDGE_PCI_NORMAL (0x060400) */ #define PCI_BRIDGE_CTRL_REG_OFFSET 0x43c -#define PCI_CLASS_BRIDGE_MASK 0xffff00 -#define PCI_CLASS_BRIDGE_SHIFT 8 +#define PCI_BRIDGE_CTRL_REG_CLASS_MASK 0xffffff iproc_pci_raw_config_read32(pcie, 0, PCI_BRIDGE_CTRL_REG_OFFSET, 4, &class); - class &= ~PCI_CLASS_BRIDGE_MASK; - class |= (PCI_CLASS_BRIDGE_PCI << PCI_CLASS_BRIDGE_SHIFT); + class &= ~PCI_BRIDGE_CTRL_REG_CLASS_MASK; + class |= PCI_CLASS_BRIDGE_PCI_NORMAL; iproc_pci_raw_config_write32(pcie, 0, PCI_BRIDGE_CTRL_REG_OFFSET, 4, class); -- 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 00F51C433EF for ; Wed, 5 Jan 2022 09:37:37 +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: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:In-Reply-To:References: List-Owner; bh=Dn1rJz3s8kNLgNOrx84SeHF4j9PN8wMxgQm0f9eExi8=; b=2pS0RCQha0zRDE 3CeDkEG2M3KzdNico3BorPr1+KDxePyY7IEVYhyl0WZIKxlGa0eDmWolFDB4J8SN6W6Qtp9z0oR7k 8/ZDek+CrjklM/OObFaJUvppMuimjEKAuOuJj96M7ibJJsU764yOhaH+JGDXG4SJ5DeTuUc9qEw62 dEBHLH3z3VwVN7Kt/fbdZ9J9fhLsa9G8vak0VX78QcPa27u0+q9lOPxb25FfTHJQecrfJWV+9I2Z+ m+Xf+s1Ri5yf4OzOt5K57qSXPfwMkSH8hK2uKoTyTnpQRZs941Q1TL2uvnnavq+PY+I0Mf3ixMn9w WwJG0FqCQCaBYadMm8Og==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n52iM-00EM6m-Ik; Wed, 05 Jan 2022 09:36:14 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n52iJ-00EM5m-IG for linux-arm-kernel@lists.infradead.org; Wed, 05 Jan 2022 09:36:12 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 260366163B; Wed, 5 Jan 2022 09:36:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6C4B8C36AEB; Wed, 5 Jan 2022 09:36:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1641375370; bh=yavQwAI4HRXXhMr+MS64YOLNNUOWumphyROhMVNBb78=; h=From:To:Cc:Subject:Date:From; b=aL1rtyiVFWmFII3cxefiiJn9n6ax/jI47lS1L0WtPUS39sYTpXb5rs7jis2abTzzI hIa/VwDo0VjrRjIenLclVLMwc4i2F2K9oUxTGTiYaDvoFxIS5jWquhvF7mSqa9SoLf PEBe6MSikAIlBe1KxWHc7qfJ75DipZe9ojupZ3i8+DC4IZ0LQHKukCuR5shE4enPty HV6IOQaL5hhms5XMbspWVP14O7W1MTmAsoKjKAi7OmnCEan3M3CG8bVFToG3Z0Ofdu WmrHRvVuVN6dkd3mPYXGe+UBz6dbf05Z32GOFGIMGhAmC1fPj//YinoU565z0G1L3y xHLev+ILRkMvQ== Received: by pali.im (Postfix) id 7898482A; Wed, 5 Jan 2022 10:36:07 +0100 (CET) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Roman Bacik , Lorenzo Pieralisi , Rob Herring , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Bjorn Helgaas Cc: bcm-kernel-feedback-list@broadcom.com, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] PCI: iproc: Set all 24 bits of PCI class code Date: Wed, 5 Jan 2022 10:35:52 +0100 Message-Id: <20220105093552.27542-1-pali@kernel.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220105_013611_663287_A7714F35 X-CRM114-Status: GOOD ( 13.61 ) 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 UmVnaXN0ZXIgMHg0M2MgaW4gaXRzIGxvdyAyNCBiaXRzIGNvbnRhaW5zIFBDSSBjbGFzcyBjb2Rl LgoKVXBkYXRlIGNvZGUgdG8gc2V0IGFsbCAyNCBiaXRzIG9mIFBDSSBjbGFzcyBjb2RlIGFuZCBu b3Qgb25seSB1cHBlciAxNiBiaXRzCm9mIFBDSSBjbGFzcyBjb2RlLgoKVXNlIGEgbmV3IG1hY3Jv IFBDSV9DTEFTU19CUklER0VfUENJX05PUk1BTCB3aGljaCByZXByZXNlbnRzIHdob2xlIDI0IGJp dHMKb2Ygbm9ybWFsIFBDSSBicmlkZ2UgY2xhc3MuCgpTaWduZWQtb2ZmLWJ5OiBQYWxpIFJvaMOh ciA8cGFsaUBrZXJuZWwub3JnPgoKLS0tClJvbWFuIGhlbHBlZCBtZSB3aXRoIHRoaXMgY2hhbmdl IGFuZCBjb25maXJtZWQgdGhhdCBjbGFzcyBjb2RlIGlzIHN0b3JlZApyZWFsbHkgaW4gYml0cyBb MjM6MF0gb2YgY3VzdG9tIHJlZ2lzdGVyIDB4NDNjIChub3JtYWxseSBjbGFzcyBjb2RlIGlzCnN0 b3JlZCBpbiBiaXRzIFszMTo4XSBvZiBwY2kgcmVnaXN0ZXIgMHgwOCkuCgpUaGlzIHBhdGNoIGRl cGVuZHMgb24gcGF0Y2ggd2hpY2ggYWRkcyBQQ0lfQ0xBU1NfQlJJREdFX1BDSV9OT1JNQUwgbWFj cm86Cmh0dHBzOi8vbG9yZS5rZXJuZWwub3JnL2xpbnV4LXBjaS8yMDIxMTIyMDE0NTE0MC4zMTg5 OC0xLXBhbGlAa2VybmVsLm9yZy8KLS0tCiBkcml2ZXJzL3BjaS9jb250cm9sbGVyL3BjaWUtaXBy b2MuYyB8IDkgKysrKy0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNCBpbnNlcnRpb25zKCspLCA1IGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvcGNpL2NvbnRyb2xsZXIvcGNpZS1pcHJv Yy5jIGIvZHJpdmVycy9wY2kvY29udHJvbGxlci9wY2llLWlwcm9jLmMKaW5kZXggM2RmNGFiMjA5 MjUzLi4yNTE5MjAxYjBlNTEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvcGNpL2NvbnRyb2xsZXIvcGNp ZS1pcHJvYy5jCisrKyBiL2RyaXZlcnMvcGNpL2NvbnRyb2xsZXIvcGNpZS1pcHJvYy5jCkBAIC03 ODksMTQgKzc4OSwxMyBAQCBzdGF0aWMgaW50IGlwcm9jX3BjaWVfY2hlY2tfbGluayhzdHJ1Y3Qg aXByb2NfcGNpZSAqcGNpZSkKIAkJcmV0dXJuIC1FRkFVTFQ7CiAJfQogCi0JLyogZm9yY2UgY2xh c3MgdG8gUENJX0NMQVNTX0JSSURHRV9QQ0kgKDB4MDYwNCkgKi8KKwkvKiBmb3JjZSBjbGFzcyB0 byBQQ0lfQ0xBU1NfQlJJREdFX1BDSV9OT1JNQUwgKDB4MDYwNDAwKSAqLwogI2RlZmluZSBQQ0lf QlJJREdFX0NUUkxfUkVHX09GRlNFVAkweDQzYwotI2RlZmluZSBQQ0lfQ0xBU1NfQlJJREdFX01B U0sJCTB4ZmZmZjAwCi0jZGVmaW5lIFBDSV9DTEFTU19CUklER0VfU0hJRlQJCTgKKyNkZWZpbmUg UENJX0JSSURHRV9DVFJMX1JFR19DTEFTU19NQVNLCTB4ZmZmZmZmCiAJaXByb2NfcGNpX3Jhd19j b25maWdfcmVhZDMyKHBjaWUsIDAsIFBDSV9CUklER0VfQ1RSTF9SRUdfT0ZGU0VULAogCQkJCSAg ICA0LCAmY2xhc3MpOwotCWNsYXNzICY9IH5QQ0lfQ0xBU1NfQlJJREdFX01BU0s7Ci0JY2xhc3Mg fD0gKFBDSV9DTEFTU19CUklER0VfUENJIDw8IFBDSV9DTEFTU19CUklER0VfU0hJRlQpOworCWNs YXNzICY9IH5QQ0lfQlJJREdFX0NUUkxfUkVHX0NMQVNTX01BU0s7CisJY2xhc3MgfD0gUENJX0NM QVNTX0JSSURHRV9QQ0lfTk9STUFMOwogCWlwcm9jX3BjaV9yYXdfY29uZmlnX3dyaXRlMzIocGNp ZSwgMCwgUENJX0JSSURHRV9DVFJMX1JFR19PRkZTRVQsCiAJCQkJICAgICA0LCBjbGFzcyk7CiAK LS0gCjIuMjAuMQoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCmxpbnV4LWFybS1rZXJuZWwgbWFpbGluZyBsaXN0CmxpbnV4LWFybS1rZXJuZWxAbGlzdHMu aW5mcmFkZWFkLm9yZwpodHRwOi8vbGlzdHMuaW5mcmFkZWFkLm9yZy9tYWlsbWFuL2xpc3RpbmZv L2xpbnV4LWFybS1rZXJuZWwK