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 71040C433F5 for ; Thu, 25 Nov 2021 12:48:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352392AbhKYMv6 (ORCPT ); Thu, 25 Nov 2021 07:51:58 -0500 Received: from mail.kernel.org ([198.145.29.99]:45590 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1354618AbhKYMvq (ORCPT ); Thu, 25 Nov 2021 07:51:46 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id EFC5961131; Thu, 25 Nov 2021 12:46:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1637844403; bh=7IW9blK/IMJBVLWjKlB8p1LQPUnBoN7J+3jnRgIKmoI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Bln5kbB7dLx5PJDb/oLLEqvWOKQ1+NmzcCexth7QJp7mASDPM8LN05ujos6LP1die YP5RhuPz8TosihuoAqXObqM6Hz8IcdT/Rd23nd/YZP3U5KmMMqJLJg0srm3wRlrJ9z QKOj77j+j6CK2pcI/Zt/vVAuVZOXmEwrf89UzUUCdqWwJAc+T2dyiuTQT0gWExlN77 MMD50tp2zFGhA2EsXUJ8Y475YGWs66fB8DAVeGB0vMhSgHIYz9GXdls6b1IhaBIw9d Dm91B52G/O1PUO8ZcUUUT67n383bila83NW/P2IQELZGPlCpMR+I4goKC0sddc80i2 izijHrwr0gt3g== Received: by pali.im (Postfix) id B096767E; Thu, 25 Nov 2021 13:46:42 +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 12/15] PCI: mvebu: Fix support for PCI_BRIDGE_CTL_BUS_RESET on emulated bridge Date: Thu, 25 Nov 2021 13:46:02 +0100 Message-Id: <20211125124605.25915-13-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 Hardware supports PCIe Hot Reset via PCIE_CTRL_OFF register. Use it for implementing PCI_BRIDGE_CTL_BUS_RESET bit of PCI_BRIDGE_CONTROL register on emulated bridge. With this change the function pci_reset_secondary_bus() starts working and can reset connected PCIe card. Signed-off-by: Pali Rohár Fixes: 1f08673eef12 ("PCI: mvebu: Convert to PCI emulated bridge config space") Cc: stable@vger.kernel.org --- drivers/pci/controller/pci-mvebu.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/drivers/pci/controller/pci-mvebu.c b/drivers/pci/controller/pci-mvebu.c index 36fbdc4f0e06..3075ea98c131 100644 --- a/drivers/pci/controller/pci-mvebu.c +++ b/drivers/pci/controller/pci-mvebu.c @@ -57,6 +57,7 @@ #define PCIE_CTRL_OFF 0x1a00 #define PCIE_CTRL_X1_MODE 0x0001 #define PCIE_CTRL_RC_MODE BIT(1) +#define PCIE_CTRL_MASTER_HOT_RESET BIT(24) #define PCIE_STAT_OFF 0x1a04 #define PCIE_STAT_BUS 0xff00 #define PCIE_STAT_DEV 0x1f0000 @@ -509,6 +510,22 @@ mvebu_pci_bridge_emul_base_conf_read(struct pci_bridge_emul *bridge, break; } + case PCI_INTERRUPT_LINE: { + /* + * From the whole 32bit register we support reading from HW only + * one bit: PCI_BRIDGE_CTL_BUS_RESET. + * Other bits are retrieved only from emulated config buffer. + */ + __le32 *cfgspace = (__le32 *)&bridge->conf; + u32 val = le32_to_cpu(cfgspace[PCI_INTERRUPT_LINE / 4]); + if (mvebu_readl(port, PCIE_CTRL_OFF) & PCIE_CTRL_MASTER_HOT_RESET) + val |= PCI_BRIDGE_CTL_BUS_RESET << 16; + else + val &= ~(PCI_BRIDGE_CTL_BUS_RESET << 16); + *value = val; + break; + } + default: return PCI_BRIDGE_EMUL_NOT_HANDLED; } @@ -617,6 +634,17 @@ mvebu_pci_bridge_emul_base_conf_write(struct pci_bridge_emul *bridge, mvebu_pcie_set_local_bus_nr(port, conf->secondary_bus); break; + case PCI_INTERRUPT_LINE: + if (mask & (PCI_BRIDGE_CTL_BUS_RESET << 16)) { + u32 ctrl = mvebu_readl(port, PCIE_CTRL_OFF); + if (new & (PCI_BRIDGE_CTL_BUS_RESET << 16)) + ctrl |= PCIE_CTRL_MASTER_HOT_RESET; + else + ctrl &= ~PCIE_CTRL_MASTER_HOT_RESET; + mvebu_writel(port, ctrl, PCIE_CTRL_OFF); + } + break; + default: break; } -- 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 517A0C433EF for ; Thu, 25 Nov 2021 12:55:01 +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=RZxN2q1/rqA6UGYDM1CcgWwa3vSOhFpyo1e+/p1rvsc=; b=n2LwvNsWZS/NUw L4oyQ9MJF/g1/tVoLcXn0yD37Pxtw9Ha6wwFixAMSBWc4Qj3ubiOQnYxq6YXFukTGgcJ+WQUFkieG Ubuo2XKxYbxtAUWP+CI5xAhqNscRjVL+wWf4ROdyw7Zd8XzTg+rzgAFrsl3KdfZzFK/EAYAIclvIE 0OC8OYKVCT34enVuLau6vvKOQsxOwttmcLBX9KgnHgq4l5M806bka2Y6P8kP2nVRN8j8Px8zySl4t tH81Gr1/eTEjNKkWnrzyOebCGO+pZ7G/cVSeHx9DZQFxTINaRyF/PHaSP/+OH0lM5rGFCIP0jcP0f cyWAekpNW2Vrz3vOOTBA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mqEFA-007VpB-5R; Thu, 25 Nov 2021 12:52:52 +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 1mqE9D-007Sqa-86 for linux-arm-kernel@lists.infradead.org; Thu, 25 Nov 2021 12:46:45 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id EFC5961131; Thu, 25 Nov 2021 12:46:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1637844403; bh=7IW9blK/IMJBVLWjKlB8p1LQPUnBoN7J+3jnRgIKmoI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Bln5kbB7dLx5PJDb/oLLEqvWOKQ1+NmzcCexth7QJp7mASDPM8LN05ujos6LP1die YP5RhuPz8TosihuoAqXObqM6Hz8IcdT/Rd23nd/YZP3U5KmMMqJLJg0srm3wRlrJ9z QKOj77j+j6CK2pcI/Zt/vVAuVZOXmEwrf89UzUUCdqWwJAc+T2dyiuTQT0gWExlN77 MMD50tp2zFGhA2EsXUJ8Y475YGWs66fB8DAVeGB0vMhSgHIYz9GXdls6b1IhaBIw9d Dm91B52G/O1PUO8ZcUUUT67n383bila83NW/P2IQELZGPlCpMR+I4goKC0sddc80i2 izijHrwr0gt3g== Received: by pali.im (Postfix) id B096767E; Thu, 25 Nov 2021 13:46:42 +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 12/15] PCI: mvebu: Fix support for PCI_BRIDGE_CTL_BUS_RESET on emulated bridge Date: Thu, 25 Nov 2021 13:46:02 +0100 Message-Id: <20211125124605.25915-13-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_044643_370187_F4BDCED4 X-CRM114-Status: GOOD ( 11.81 ) 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 SGFyZHdhcmUgc3VwcG9ydHMgUENJZSBIb3QgUmVzZXQgdmlhIFBDSUVfQ1RSTF9PRkYgcmVnaXN0 ZXIuIFVzZSBpdCBmb3IKaW1wbGVtZW50aW5nIFBDSV9CUklER0VfQ1RMX0JVU19SRVNFVCBiaXQg b2YgUENJX0JSSURHRV9DT05UUk9MIHJlZ2lzdGVyIG9uCmVtdWxhdGVkIGJyaWRnZS4KCldpdGgg dGhpcyBjaGFuZ2UgdGhlIGZ1bmN0aW9uIHBjaV9yZXNldF9zZWNvbmRhcnlfYnVzKCkgc3RhcnRz IHdvcmtpbmcgYW5kCmNhbiByZXNldCBjb25uZWN0ZWQgUENJZSBjYXJkLgoKU2lnbmVkLW9mZi1i eTogUGFsaSBSb2jDoXIgPHBhbGlAa2VybmVsLm9yZz4KRml4ZXM6IDFmMDg2NzNlZWYxMiAoIlBD STogbXZlYnU6IENvbnZlcnQgdG8gUENJIGVtdWxhdGVkIGJyaWRnZSBjb25maWcgc3BhY2UiKQpD Yzogc3RhYmxlQHZnZXIua2VybmVsLm9yZwotLS0KIGRyaXZlcnMvcGNpL2NvbnRyb2xsZXIvcGNp LW12ZWJ1LmMgfCAyOCArKysrKysrKysrKysrKysrKysrKysrKysrKysrCiAxIGZpbGUgY2hhbmdl ZCwgMjggaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvcGNpL2NvbnRyb2xsZXIv cGNpLW12ZWJ1LmMgYi9kcml2ZXJzL3BjaS9jb250cm9sbGVyL3BjaS1tdmVidS5jCmluZGV4IDM2 ZmJkYzRmMGUwNi4uMzA3NWVhOThjMTMxIDEwMDY0NAotLS0gYS9kcml2ZXJzL3BjaS9jb250cm9s bGVyL3BjaS1tdmVidS5jCisrKyBiL2RyaXZlcnMvcGNpL2NvbnRyb2xsZXIvcGNpLW12ZWJ1LmMK QEAgLTU3LDYgKzU3LDcgQEAKICNkZWZpbmUgUENJRV9DVFJMX09GRgkJMHgxYTAwCiAjZGVmaW5l ICBQQ0lFX0NUUkxfWDFfTU9ERQkJMHgwMDAxCiAjZGVmaW5lICBQQ0lFX0NUUkxfUkNfTU9ERQkJ QklUKDEpCisjZGVmaW5lICBQQ0lFX0NUUkxfTUFTVEVSX0hPVF9SRVNFVAlCSVQoMjQpCiAjZGVm aW5lIFBDSUVfU1RBVF9PRkYJCTB4MWEwNAogI2RlZmluZSAgUENJRV9TVEFUX0JVUyAgICAgICAg ICAgICAgICAgIDB4ZmYwMAogI2RlZmluZSAgUENJRV9TVEFUX0RFViAgICAgICAgICAgICAgICAg IDB4MWYwMDAwCkBAIC01MDksNiArNTEwLDIyIEBAIG12ZWJ1X3BjaV9icmlkZ2VfZW11bF9iYXNl X2NvbmZfcmVhZChzdHJ1Y3QgcGNpX2JyaWRnZV9lbXVsICpicmlkZ2UsCiAJCWJyZWFrOwogCX0K IAorCWNhc2UgUENJX0lOVEVSUlVQVF9MSU5FOiB7CisJCS8qCisJCSAqIEZyb20gdGhlIHdob2xl IDMyYml0IHJlZ2lzdGVyIHdlIHN1cHBvcnQgcmVhZGluZyBmcm9tIEhXIG9ubHkKKwkJICogb25l IGJpdDogUENJX0JSSURHRV9DVExfQlVTX1JFU0VULgorCQkgKiBPdGhlciBiaXRzIGFyZSByZXRy aWV2ZWQgb25seSBmcm9tIGVtdWxhdGVkIGNvbmZpZyBidWZmZXIuCisJCSAqLworCQlfX2xlMzIg KmNmZ3NwYWNlID0gKF9fbGUzMiAqKSZicmlkZ2UtPmNvbmY7CisJCXUzMiB2YWwgPSBsZTMyX3Rv X2NwdShjZmdzcGFjZVtQQ0lfSU5URVJSVVBUX0xJTkUgLyA0XSk7CisJCWlmIChtdmVidV9yZWFk bChwb3J0LCBQQ0lFX0NUUkxfT0ZGKSAmIFBDSUVfQ1RSTF9NQVNURVJfSE9UX1JFU0VUKQorCQkJ dmFsIHw9IFBDSV9CUklER0VfQ1RMX0JVU19SRVNFVCA8PCAxNjsKKwkJZWxzZQorCQkJdmFsICY9 IH4oUENJX0JSSURHRV9DVExfQlVTX1JFU0VUIDw8IDE2KTsKKwkJKnZhbHVlID0gdmFsOworCQli cmVhazsKKwl9CisKIAlkZWZhdWx0OgogCQlyZXR1cm4gUENJX0JSSURHRV9FTVVMX05PVF9IQU5E TEVEOwogCX0KQEAgLTYxNyw2ICs2MzQsMTcgQEAgbXZlYnVfcGNpX2JyaWRnZV9lbXVsX2Jhc2Vf Y29uZl93cml0ZShzdHJ1Y3QgcGNpX2JyaWRnZV9lbXVsICpicmlkZ2UsCiAJCQltdmVidV9wY2ll X3NldF9sb2NhbF9idXNfbnIocG9ydCwgY29uZi0+c2Vjb25kYXJ5X2J1cyk7CiAJCWJyZWFrOwog CisJY2FzZSBQQ0lfSU5URVJSVVBUX0xJTkU6CisJCWlmIChtYXNrICYgKFBDSV9CUklER0VfQ1RM X0JVU19SRVNFVCA8PCAxNikpIHsKKwkJCXUzMiBjdHJsID0gbXZlYnVfcmVhZGwocG9ydCwgUENJ RV9DVFJMX09GRik7CisJCQlpZiAobmV3ICYgKFBDSV9CUklER0VfQ1RMX0JVU19SRVNFVCA8PCAx NikpCisJCQkJY3RybCB8PSBQQ0lFX0NUUkxfTUFTVEVSX0hPVF9SRVNFVDsKKwkJCWVsc2UKKwkJ CQljdHJsICY9IH5QQ0lFX0NUUkxfTUFTVEVSX0hPVF9SRVNFVDsKKwkJCW12ZWJ1X3dyaXRlbChw b3J0LCBjdHJsLCBQQ0lFX0NUUkxfT0ZGKTsKKwkJfQorCQlicmVhazsKKwogCWRlZmF1bHQ6CiAJ CWJyZWFrOwogCX0KLS0gCjIuMjAuMQoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCmxpbnV4LWFybS1rZXJuZWwgbWFpbGluZyBsaXN0CmxpbnV4LWFybS1r ZXJuZWxAbGlzdHMuaW5mcmFkZWFkLm9yZwpodHRwOi8vbGlzdHMuaW5mcmFkZWFkLm9yZy9tYWls bWFuL2xpc3RpbmZvL2xpbnV4LWFybS1rZXJuZWwK