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 AE72DC433F5 for ; Wed, 24 Nov 2021 16:00:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347867AbhKXQD0 (ORCPT ); Wed, 24 Nov 2021 11:03:26 -0500 Received: from mail.kernel.org ([198.145.29.99]:57622 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347849AbhKXQDZ (ORCPT ); Wed, 24 Nov 2021 11:03:25 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 55C576108E; Wed, 24 Nov 2021 16:00:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1637769615; bh=PZyyQQxVBHKPs4NzfewlxUERce2SHAqvb2qqk/d1sGM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ABOx0YVV236if5mMBU5Jwb/HPw8NjNdf6/9ERUwRxDp0+wj5x4Ny6PuD9t4od/say ThmAWC/Dv1QkkFcEQfvY7oa59l3/K6BGlbnaWpdM42M6YW4IMWeNEHa1LaneHk9wuI WrLpxKlY8OY8NvCEBB7XTBp7Msaj99Sk4pepiRvL5oGRRFk/B4Zd88LnsFXnC97XhQ s7Rt5Ql5au7ig/y8LWJU8Pc9QIOFJikKv8LevhCFBPEMfiTDlD8g9WAk+oiVe2nTbC 2QnvEosKg/m9Lh352RJKgTpC5MPPhXeukIGnieEu4yQfQ+TJkaLVhj+oRdoYkKDzYs qaCV5YgpvSmYQ== Received: by pali.im (Postfix) id 1751C56D; Wed, 24 Nov 2021 17:00:15 +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 4/6] PCI: pci-bridge-emul: Fix definitions of reserved bits Date: Wed, 24 Nov 2021 16:59:42 +0100 Message-Id: <20211124155944.1290-5-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211124155944.1290-1-pali@kernel.org> References: <20211124155944.1290-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 Some bits in PCI_EXP registers are reserved for non-root ports. Driver pci-bridge-emul.c implements PCIe Root Port device therefore it should not allow setting reserved bits of registers. Properly define non-reserved bits for all PCI_EXP registers. Signed-off-by: Pali Rohár Fixes: 23a5fba4d941 ("PCI: Introduce PCI bridge emulated config space common logic") Cc: stable@vger.kernel.org --- drivers/pci/pci-bridge-emul.c | 36 ++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/drivers/pci/pci-bridge-emul.c b/drivers/pci/pci-bridge-emul.c index 31ff7448bded..9a348f99641b 100644 --- a/drivers/pci/pci-bridge-emul.c +++ b/drivers/pci/pci-bridge-emul.c @@ -176,41 +176,55 @@ struct pci_bridge_reg_behavior pcie_cap_regs_behavior[PCI_CAP_PCIE_SIZEOF / 4] = [PCI_CAP_LIST_ID / 4] = { /* * Capability ID, Next Capability Pointer and - * Capabilities register are all read-only. + * bits [14:0] of Capabilities register are all read-only. + * Bit 15 of Capabilities register is reserved. */ - .ro = ~0, + .ro = GENMASK(30, 0), }, [PCI_EXP_DEVCAP / 4] = { - .ro = ~0, + /* + * Bits [31:29] and [17:16] are reserved. + * Bits [27:18] are reserved for non-upstream ports. + * Bits 28 and [14:6] are reserved for non-endpoint devices. + * Other bits are read-only. + */ + .ro = BIT(15) | GENMASK(5, 0), }, [PCI_EXP_DEVCTL / 4] = { - /* Device control register is RW */ - .rw = GENMASK(15, 0), + /* + * Device control register is RW, except bit 15 which is + * reserved for non-endpoints or non-PCIe-to-PCI/X bridges. + */ + .rw = GENMASK(14, 0), /* * Device status register has bits 6 and [3:0] W1C, [5:4] RO, - * the rest is reserved + * the rest is reserved. Also bit 6 is reserved for non-upstream + * ports. */ - .w1c = (BIT(6) | GENMASK(3, 0)) << 16, + .w1c = GENMASK(3, 0) << 16, .ro = GENMASK(5, 4) << 16, }, [PCI_EXP_LNKCAP / 4] = { - /* All bits are RO, except bit 23 which is reserved */ - .ro = lower_32_bits(~BIT(23)), + /* + * All bits are RO, except bit 23 which is reserved and + * bit 18 which is reserved for non-upstream ports. + */ + .ro = lower_32_bits(~(BIT(23) | PCI_EXP_LNKCAP_CLKPM)), }, [PCI_EXP_LNKCTL / 4] = { /* * Link control has bits [15:14], [11:3] and [1:0] RW, the - * rest is reserved. + * rest is reserved. Bit 8 is reserved for non-upstream ports. * * Link status has bits [13:0] RO, and bits [15:14] * W1C. */ - .rw = GENMASK(15, 14) | GENMASK(11, 3) | GENMASK(1, 0), + .rw = GENMASK(15, 14) | GENMASK(11, 9) | GENMASK(7, 3) | GENMASK(1, 0), .ro = GENMASK(13, 0) << 16, .w1c = GENMASK(15, 14) << 16, }, -- 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 0F096C433EF for ; Wed, 24 Nov 2021 16:02:31 +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=uIVJLWrjsvm3rqgSenqghCQJjamycyES3n0SpcMNOU4=; b=2aKJWCh/vt559t 7EEENYBWp/4QArIbBfNycPzicGgU6G4k8ueiSjVSg7j2F6noToCv5O/mee2AKNWd0+/W/xpjc8ADi a6QzjQNVmwpiVidVDg9/jLhwJcgCFzq8WQU3n77Dovd+Y2DIYkMM6Py6WzLKPEbwpUiNYU3wpaeyb OCkoyVkxLM3Ou1vIoJfAkONIZxHwilwttqEKg3KA1zcRH2DVvBv5kPMQI4JMPzEgHg8LgkCfrnEAy /1RmSgj99apG/Uy5T7yHC5hNU+Fg+bHR8V6eoT7A0qeEXBlOQwtFbVX4fYC6Y1j4CoLj5yqijLekw MSLkd9x6mTy7Y5az553w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mpuhl-005BiS-3e; Wed, 24 Nov 2021 16:01:05 +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 1mpugx-005BTU-R0 for linux-arm-kernel@lists.infradead.org; Wed, 24 Nov 2021 16:00:17 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 55C576108E; Wed, 24 Nov 2021 16:00:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1637769615; bh=PZyyQQxVBHKPs4NzfewlxUERce2SHAqvb2qqk/d1sGM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ABOx0YVV236if5mMBU5Jwb/HPw8NjNdf6/9ERUwRxDp0+wj5x4Ny6PuD9t4od/say ThmAWC/Dv1QkkFcEQfvY7oa59l3/K6BGlbnaWpdM42M6YW4IMWeNEHa1LaneHk9wuI WrLpxKlY8OY8NvCEBB7XTBp7Msaj99Sk4pepiRvL5oGRRFk/B4Zd88LnsFXnC97XhQ s7Rt5Ql5au7ig/y8LWJU8Pc9QIOFJikKv8LevhCFBPEMfiTDlD8g9WAk+oiVe2nTbC 2QnvEosKg/m9Lh352RJKgTpC5MPPhXeukIGnieEu4yQfQ+TJkaLVhj+oRdoYkKDzYs qaCV5YgpvSmYQ== Received: by pali.im (Postfix) id 1751C56D; Wed, 24 Nov 2021 17:00:15 +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 4/6] PCI: pci-bridge-emul: Fix definitions of reserved bits Date: Wed, 24 Nov 2021 16:59:42 +0100 Message-Id: <20211124155944.1290-5-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211124155944.1290-1-pali@kernel.org> References: <20211124155944.1290-1-pali@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211124_080015_944868_D77BB7F5 X-CRM114-Status: GOOD ( 13.85 ) 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 U29tZSBiaXRzIGluIFBDSV9FWFAgcmVnaXN0ZXJzIGFyZSByZXNlcnZlZCBmb3Igbm9uLXJvb3Qg cG9ydHMuIERyaXZlcgpwY2ktYnJpZGdlLWVtdWwuYyBpbXBsZW1lbnRzIFBDSWUgUm9vdCBQb3J0 IGRldmljZSB0aGVyZWZvcmUgaXQgc2hvdWxkIG5vdAphbGxvdyBzZXR0aW5nIHJlc2VydmVkIGJp dHMgb2YgcmVnaXN0ZXJzLgoKUHJvcGVybHkgZGVmaW5lIG5vbi1yZXNlcnZlZCBiaXRzIGZvciBh bGwgUENJX0VYUCByZWdpc3RlcnMuCgpTaWduZWQtb2ZmLWJ5OiBQYWxpIFJvaMOhciA8cGFsaUBr ZXJuZWwub3JnPgpGaXhlczogMjNhNWZiYTRkOTQxICgiUENJOiBJbnRyb2R1Y2UgUENJIGJyaWRn ZSBlbXVsYXRlZCBjb25maWcgc3BhY2UgY29tbW9uIGxvZ2ljIikKQ2M6IHN0YWJsZUB2Z2VyLmtl cm5lbC5vcmcKLS0tCiBkcml2ZXJzL3BjaS9wY2ktYnJpZGdlLWVtdWwuYyB8IDM2ICsrKysrKysr KysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMjUgaW5zZXJ0aW9u cygrKSwgMTEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9wY2kvcGNpLWJyaWRn ZS1lbXVsLmMgYi9kcml2ZXJzL3BjaS9wY2ktYnJpZGdlLWVtdWwuYwppbmRleCAzMWZmNzQ0OGJk ZWQuLjlhMzQ4Zjk5NjQxYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9wY2kvcGNpLWJyaWRnZS1lbXVs LmMKKysrIGIvZHJpdmVycy9wY2kvcGNpLWJyaWRnZS1lbXVsLmMKQEAgLTE3Niw0MSArMTc2LDU1 IEBAIHN0cnVjdCBwY2lfYnJpZGdlX3JlZ19iZWhhdmlvciBwY2llX2NhcF9yZWdzX2JlaGF2aW9y W1BDSV9DQVBfUENJRV9TSVpFT0YgLyA0XSA9CiAJW1BDSV9DQVBfTElTVF9JRCAvIDRdID0gewog CQkvKgogCQkgKiBDYXBhYmlsaXR5IElELCBOZXh0IENhcGFiaWxpdHkgUG9pbnRlciBhbmQKLQkJ ICogQ2FwYWJpbGl0aWVzIHJlZ2lzdGVyIGFyZSBhbGwgcmVhZC1vbmx5LgorCQkgKiBiaXRzIFsx NDowXSBvZiBDYXBhYmlsaXRpZXMgcmVnaXN0ZXIgYXJlIGFsbCByZWFkLW9ubHkuCisJCSAqIEJp dCAxNSBvZiBDYXBhYmlsaXRpZXMgcmVnaXN0ZXIgaXMgcmVzZXJ2ZWQuCiAJCSAqLwotCQkucm8g PSB+MCwKKwkJLnJvID0gR0VOTUFTSygzMCwgMCksCiAJfSwKIAogCVtQQ0lfRVhQX0RFVkNBUCAv IDRdID0gewotCQkucm8gPSB+MCwKKwkJLyoKKwkJICogQml0cyBbMzE6MjldIGFuZCBbMTc6MTZd IGFyZSByZXNlcnZlZC4KKwkJICogQml0cyBbMjc6MThdIGFyZSByZXNlcnZlZCBmb3Igbm9uLXVw c3RyZWFtIHBvcnRzLgorCQkgKiBCaXRzIDI4IGFuZCBbMTQ6Nl0gYXJlIHJlc2VydmVkIGZvciBu b24tZW5kcG9pbnQgZGV2aWNlcy4KKwkJICogT3RoZXIgYml0cyBhcmUgcmVhZC1vbmx5LgorCQkg Ki8KKwkJLnJvID0gQklUKDE1KSB8IEdFTk1BU0soNSwgMCksCiAJfSwKIAogCVtQQ0lfRVhQX0RF VkNUTCAvIDRdID0gewotCQkvKiBEZXZpY2UgY29udHJvbCByZWdpc3RlciBpcyBSVyAqLwotCQku cncgPSBHRU5NQVNLKDE1LCAwKSwKKwkJLyoKKwkJICogRGV2aWNlIGNvbnRyb2wgcmVnaXN0ZXIg aXMgUlcsIGV4Y2VwdCBiaXQgMTUgd2hpY2ggaXMKKwkJICogcmVzZXJ2ZWQgZm9yIG5vbi1lbmRw b2ludHMgb3Igbm9uLVBDSWUtdG8tUENJL1ggYnJpZGdlcy4KKwkJICovCisJCS5ydyA9IEdFTk1B U0soMTQsIDApLAogCiAJCS8qCiAJCSAqIERldmljZSBzdGF0dXMgcmVnaXN0ZXIgaGFzIGJpdHMg NiBhbmQgWzM6MF0gVzFDLCBbNTo0XSBSTywKLQkJICogdGhlIHJlc3QgaXMgcmVzZXJ2ZWQKKwkJ ICogdGhlIHJlc3QgaXMgcmVzZXJ2ZWQuIEFsc28gYml0IDYgaXMgcmVzZXJ2ZWQgZm9yIG5vbi11 cHN0cmVhbQorCQkgKiBwb3J0cy4KIAkJICovCi0JCS53MWMgPSAoQklUKDYpIHwgR0VOTUFTSygz LCAwKSkgPDwgMTYsCisJCS53MWMgPSBHRU5NQVNLKDMsIDApIDw8IDE2LAogCQkucm8gPSBHRU5N QVNLKDUsIDQpIDw8IDE2LAogCX0sCiAKIAlbUENJX0VYUF9MTktDQVAgLyA0XSA9IHsKLQkJLyog QWxsIGJpdHMgYXJlIFJPLCBleGNlcHQgYml0IDIzIHdoaWNoIGlzIHJlc2VydmVkICovCi0JCS5y byA9IGxvd2VyXzMyX2JpdHMofkJJVCgyMykpLAorCQkvKgorCQkgKiBBbGwgYml0cyBhcmUgUk8s IGV4Y2VwdCBiaXQgMjMgd2hpY2ggaXMgcmVzZXJ2ZWQgYW5kCisJCSAqIGJpdCAxOCB3aGljaCBp cyByZXNlcnZlZCBmb3Igbm9uLXVwc3RyZWFtIHBvcnRzLgorCQkgKi8KKwkJLnJvID0gbG93ZXJf MzJfYml0cyh+KEJJVCgyMykgfCBQQ0lfRVhQX0xOS0NBUF9DTEtQTSkpLAogCX0sCiAKIAlbUENJ X0VYUF9MTktDVEwgLyA0XSA9IHsKIAkJLyoKIAkJICogTGluayBjb250cm9sIGhhcyBiaXRzIFsx NToxNF0sIFsxMTozXSBhbmQgWzE6MF0gUlcsIHRoZQotCQkgKiByZXN0IGlzIHJlc2VydmVkLgor CQkgKiByZXN0IGlzIHJlc2VydmVkLiBCaXQgOCBpcyByZXNlcnZlZCBmb3Igbm9uLXVwc3RyZWFt IHBvcnRzLgogCQkgKgogCQkgKiBMaW5rIHN0YXR1cyBoYXMgYml0cyBbMTM6MF0gUk8sIGFuZCBi aXRzIFsxNToxNF0KIAkJICogVzFDLgogCQkgKi8KLQkJLnJ3ID0gR0VOTUFTSygxNSwgMTQpIHwg R0VOTUFTSygxMSwgMykgfCBHRU5NQVNLKDEsIDApLAorCQkucncgPSBHRU5NQVNLKDE1LCAxNCkg fCBHRU5NQVNLKDExLCA5KSB8IEdFTk1BU0soNywgMykgfCBHRU5NQVNLKDEsIDApLAogCQkucm8g PSBHRU5NQVNLKDEzLCAwKSA8PCAxNiwKIAkJLncxYyA9IEdFTk1BU0soMTUsIDE0KSA8PCAxNiwK IAl9LAotLSAKMi4yMC4xCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KbGludXgtYXJtLWtlcm5lbCBtYWlsaW5nIGxpc3QKbGludXgtYXJtLWtlcm5lbEBs aXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlz dGluZm8vbGludXgtYXJtLWtlcm5lbAo=