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 D1E6EC433F5 for ; Mon, 21 Mar 2022 10:49:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346473AbiCUKuq (ORCPT ); Mon, 21 Mar 2022 06:50:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59864 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346463AbiCUKuo (ORCPT ); Mon, 21 Mar 2022 06:50:44 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 14AAF201A2; Mon, 21 Mar 2022 03:49:18 -0700 (PDT) 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 67EE06137A; Mon, 21 Mar 2022 10:49:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BAB0BC340ED; Mon, 21 Mar 2022 10:49:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647859757; bh=RIu+LXbN2Vd3SrS65/dHGNLCz/e0MWpxYGJO0vbxywE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZtpfwaMxuKoYZI9dfMWrZJW47CdBEWMC10xbCnJX+GphS97HSt3aGI/RbuHGtUTZe GII1olTOMtH0ZafOlhsXNy9F9UFOm1lYszayLUOHtXzh3OVIm2t4RTtrzqWaqWiVfj i7yUFUu3P7V1n7OBZL2EFs2AHT3RdLnx1AtQtiOugKwxB0g8HjwDUNLn90IpNexp0U D6X2o9LetOTSd6glJRNkBAbN/Kwxf8EeQmiADwO+vzwQgp/wXAQARFEl7dmn0O5urq JFX7jc8YqmgpFo7cMN/kloOxyuu6BVOPR4boTpf+2W2GgXyupbB2OipG6QQZfxbqly sp++pKZHGfHUA== Received: from sofa.misterjones.org ([185.219.108.64] helo=why.lan) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nWFb9-00FvJp-Dh; Mon, 21 Mar 2022 10:49:15 +0000 From: Marc Zyngier To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org Cc: Rob Herring , Toan Le , Lorenzo Pieralisi , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Bjorn Helgaas , =?UTF-8?q?St=C3=A9phane=20Graber?= , dann frazier , kernel-team@android.com, stable@vger.kernel.org Subject: [PATCH v2 2/2] PCI: xgene: Revert "PCI: xgene: Fix IB window setup" Date: Mon, 21 Mar 2022 10:48:43 +0000 Message-Id: <20220321104843.949645-3-maz@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220321104843.949645-1-maz@kernel.org> References: <20220321104843.949645-1-maz@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, robh@kernel.org, toan@os.amperecomputing.com, lorenzo.pieralisi@arm.com, kw@linux.com, bhelgaas@google.com, stgraber@ubuntu.com, dann.frazier@canonical.com, kernel-team@android.com, stable@vger.kernel.org X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Commit c7a75d07827a ("PCI: xgene: Fix IB window setup") tried to fix the damages that 6dce5aa59e0b ("PCI: xgene: Use inbound resources for setup") caused, but actually didn't improve anything for some plarforms (at least Mustang and m400 are still broken). Given that 6dce5aa59e0b has been reverted, revert this patch as well, restoring the PCIe support on XGene to its pre-5.5, working state. Cc: Rob Herring Cc: Toan Le Cc: Lorenzo Pieralisi Cc: Krzysztof Wilczyński Cc: Bjorn Helgaas Cc: Stéphane Graber Cc: dann frazier Cc: stable@vger.kernel.org Signed-off-by: Marc Zyngier Fixes: c7a75d07827a ("PCI: xgene: Fix IB window setup") Link: https://lore.kernel.org/r/YjN8pT5e6/8cRohQ@xps13.dannf --- drivers/pci/controller/pci-xgene.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/controller/pci-xgene.c b/drivers/pci/controller/pci-xgene.c index aa41ceaf031f..7c763d820c52 100644 --- a/drivers/pci/controller/pci-xgene.c +++ b/drivers/pci/controller/pci-xgene.c @@ -465,7 +465,7 @@ static int xgene_pcie_select_ib_reg(u8 *ib_reg_mask, u64 size) return 1; } - if ((size > SZ_1K) && (size < SZ_4G) && !(*ib_reg_mask & (1 << 0))) { + if ((size > SZ_1K) && (size < SZ_1T) && !(*ib_reg_mask & (1 << 0))) { *ib_reg_mask |= (1 << 0); return 0; } -- 2.34.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 1F131C433EF for ; Mon, 21 Mar 2022 10:50:51 +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=gkS+iumu8tKchpyY5gwsL8Fso4cijFZr5geQKA8yFv4=; b=uL2rsqrgwUSbns XK29EgnLnCStNNjkBLtDU1yIALCPhEaWFnCmRw1c4a40HzmjKGB5BzERkiMC4lmAXPHeYWwT1Y6Ol G5J1pCTgMR6tXEYFlRLrSdTDyCycirDL1VVbbYkN+IoZ0mmz0PmjW57HIgGAK7gAXc5aHhwHhE+MB 6GzXStnIFFlzTUxrTazlObBQTFILh5b69erJb0L0wUIslQmuSKYkK/jy1o/nf4+ZVB8VrAhbwqCla a3aqMncnPDkV2MgUNSxaO02Hb0H5sZnjXiJJAwTFqPtSDlpcI066meoiDb2JbrJY09xT2IjFMpckk yuWc/3M0zKfoNjJJhAJg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nWFbg-007MiT-7R; Mon, 21 Mar 2022 10:49:48 +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 1nWFbC-007MXN-Vf for linux-arm-kernel@lists.infradead.org; Mon, 21 Mar 2022 10:49:21 +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 EE6D461377; Mon, 21 Mar 2022 10:49:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BAB0BC340ED; Mon, 21 Mar 2022 10:49:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647859757; bh=RIu+LXbN2Vd3SrS65/dHGNLCz/e0MWpxYGJO0vbxywE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZtpfwaMxuKoYZI9dfMWrZJW47CdBEWMC10xbCnJX+GphS97HSt3aGI/RbuHGtUTZe GII1olTOMtH0ZafOlhsXNy9F9UFOm1lYszayLUOHtXzh3OVIm2t4RTtrzqWaqWiVfj i7yUFUu3P7V1n7OBZL2EFs2AHT3RdLnx1AtQtiOugKwxB0g8HjwDUNLn90IpNexp0U D6X2o9LetOTSd6glJRNkBAbN/Kwxf8EeQmiADwO+vzwQgp/wXAQARFEl7dmn0O5urq JFX7jc8YqmgpFo7cMN/kloOxyuu6BVOPR4boTpf+2W2GgXyupbB2OipG6QQZfxbqly sp++pKZHGfHUA== Received: from sofa.misterjones.org ([185.219.108.64] helo=why.lan) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nWFb9-00FvJp-Dh; Mon, 21 Mar 2022 10:49:15 +0000 From: Marc Zyngier To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org Cc: Rob Herring , Toan Le , Lorenzo Pieralisi , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Bjorn Helgaas , =?UTF-8?q?St=C3=A9phane=20Graber?= , dann frazier , kernel-team@android.com, stable@vger.kernel.org Subject: [PATCH v2 2/2] PCI: xgene: Revert "PCI: xgene: Fix IB window setup" Date: Mon, 21 Mar 2022 10:48:43 +0000 Message-Id: <20220321104843.949645-3-maz@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220321104843.949645-1-maz@kernel.org> References: <20220321104843.949645-1-maz@kernel.org> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, robh@kernel.org, toan@os.amperecomputing.com, lorenzo.pieralisi@arm.com, kw@linux.com, bhelgaas@google.com, stgraber@ubuntu.com, dann.frazier@canonical.com, kernel-team@android.com, stable@vger.kernel.org X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220321_034919_185305_AFEA1360 X-CRM114-Status: GOOD ( 14.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 Q29tbWl0IGM3YTc1ZDA3ODI3YSAoIlBDSTogeGdlbmU6IEZpeCBJQiB3aW5kb3cgc2V0dXAiKSB0 cmllZCB0bwpmaXggdGhlIGRhbWFnZXMgdGhhdCA2ZGNlNWFhNTllMGIgKCJQQ0k6IHhnZW5lOiBV c2UgaW5ib3VuZCByZXNvdXJjZXMKZm9yIHNldHVwIikgY2F1c2VkLCBidXQgYWN0dWFsbHkgZGlk bid0IGltcHJvdmUgYW55dGhpbmcgZm9yIHNvbWUKcGxhcmZvcm1zIChhdCBsZWFzdCBNdXN0YW5n IGFuZCBtNDAwIGFyZSBzdGlsbCBicm9rZW4pLgoKR2l2ZW4gdGhhdCA2ZGNlNWFhNTllMGIgaGFz IGJlZW4gcmV2ZXJ0ZWQsIHJldmVydCB0aGlzIHBhdGNoIGFzIHdlbGwsCnJlc3RvcmluZyB0aGUg UENJZSBzdXBwb3J0IG9uIFhHZW5lIHRvIGl0cyBwcmUtNS41LCB3b3JraW5nIHN0YXRlLgoKQ2M6 IFJvYiBIZXJyaW5nIDxyb2JoQGtlcm5lbC5vcmc+CkNjOiBUb2FuIExlIDx0b2FuQG9zLmFtcGVy ZWNvbXB1dGluZy5jb20+CkNjOiBMb3JlbnpvIFBpZXJhbGlzaSA8bG9yZW56by5waWVyYWxpc2lA YXJtLmNvbT4KQ2M6IEtyenlzenRvZiBXaWxjennFhHNraSA8a3dAbGludXguY29tPgpDYzogQmpv cm4gSGVsZ2FhcyA8YmhlbGdhYXNAZ29vZ2xlLmNvbT4KQ2M6IFN0w6lwaGFuZSBHcmFiZXIgPHN0 Z3JhYmVyQHVidW50dS5jb20+CkNjOiBkYW5uIGZyYXppZXIgPGRhbm4uZnJhemllckBjYW5vbmlj YWwuY29tPgpDYzogc3RhYmxlQHZnZXIua2VybmVsLm9yZwpTaWduZWQtb2ZmLWJ5OiBNYXJjIFp5 bmdpZXIgPG1hekBrZXJuZWwub3JnPgpGaXhlczogYzdhNzVkMDc4MjdhICgiUENJOiB4Z2VuZTog Rml4IElCIHdpbmRvdyBzZXR1cCIpCkxpbms6IGh0dHBzOi8vbG9yZS5rZXJuZWwub3JnL3IvWWpO OHBUNWU2LzhjUm9oUUB4cHMxMy5kYW5uZgotLS0KIGRyaXZlcnMvcGNpL2NvbnRyb2xsZXIvcGNp LXhnZW5lLmMgfCAyICstCiAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRpb24oKyksIDEgZGVsZXRp b24oLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL3BjaS9jb250cm9sbGVyL3BjaS14Z2VuZS5jIGIv ZHJpdmVycy9wY2kvY29udHJvbGxlci9wY2kteGdlbmUuYwppbmRleCBhYTQxY2VhZjAzMWYuLjdj NzYzZDgyMGM1MiAxMDA2NDQKLS0tIGEvZHJpdmVycy9wY2kvY29udHJvbGxlci9wY2kteGdlbmUu YworKysgYi9kcml2ZXJzL3BjaS9jb250cm9sbGVyL3BjaS14Z2VuZS5jCkBAIC00NjUsNyArNDY1 LDcgQEAgc3RhdGljIGludCB4Z2VuZV9wY2llX3NlbGVjdF9pYl9yZWcodTggKmliX3JlZ19tYXNr LCB1NjQgc2l6ZSkKIAkJcmV0dXJuIDE7CiAJfQogCi0JaWYgKChzaXplID4gU1pfMUspICYmIChz aXplIDwgU1pfNEcpICYmICEoKmliX3JlZ19tYXNrICYgKDEgPDwgMCkpKSB7CisJaWYgKChzaXpl ID4gU1pfMUspICYmIChzaXplIDwgU1pfMVQpICYmICEoKmliX3JlZ19tYXNrICYgKDEgPDwgMCkp KSB7CiAJCSppYl9yZWdfbWFzayB8PSAoMSA8PCAwKTsKIAkJcmV0dXJuIDA7CiAJfQotLSAKMi4z NC4xCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KbGlu dXgtYXJtLWtlcm5lbCBtYWlsaW5nIGxpc3QKbGludXgtYXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRl YWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8vbGludXgt YXJtLWtlcm5lbAo=