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 X-Spam-Level: X-Spam-Status: No, score=-14.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 30563C433DB for ; Fri, 26 Mar 2021 12:22:05 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B825D61879 for ; Fri, 26 Mar 2021 12:22:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B825D61879 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=armlinux.org.uk Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Date:Message-Id:MIME-Version:Subject:Cc:To:From: References:In-Reply-To:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=RTo7f/oCXu++swk12k0HCRSgTiagmJM6eVCDKS1Q37k=; b=AIyrnH2GwnHYO3QPIHKnxN604 +4W/J9OsDrcEA8s6Db+i0R3dNVCPIFZbmIyeAkfYE3HTH3tjJ1xhtdVeaWlSQkJw/tJFBW3/xSrCT OYt9h9sXPFyVNZk3lALvcz95zzW+nr7QQqaroAb9qz95+rJQYR+iqFu44R6fZr7lOnJrVmr/zlkR9 i9aMs4QjN1q3OOyrv/USHSvXiue3HzsaX7oWq0smWH39w5EQMjQPVjQ/8UwuIHm2xCMQdxIKVlJQV EKiTub1dXm9G0mTA8rPBiPn+UtwIAswqNo2txkml9NoBRM08QcL8jkQa6bkL2A79/EOPwXgJIHRGa bAo52e/xQ==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lPlRy-003VCt-8X; Fri, 26 Mar 2021 12:20:26 +0000 Received: from pandora.armlinux.org.uk ([2001:4d48:ad52:32c8:5054:ff:fe00:142]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lPlRs-003V0O-AY for linux-arm-kernel@lists.infradead.org; Fri, 26 Mar 2021 12:20:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=armlinux.org.uk; s=pandora-2019; h=Date:Sender:Message-Id:Content-Type: Content-Transfer-Encoding:MIME-Version:Subject:Cc:To:From:References: In-Reply-To:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=lCkP6TmmOSTptKjsDSasPEnzZ9UpHxohV4J/j3eC+8Y=; b=RX/JPBe1yBzFiQq9nCo/oZlbU9 Zhl8di3WLGnFDmZWKmt4f0yrZwmHBXle458JEZdeo2BTN862Zd/AsYVUYQpgF+oJKdEOO3Rw487RL M5qJ/GqkIMJ90eDKhyooRtb12GQK05XV1oFpMEjDI0uquxJrbDO+WtXPO+ZYHzT6P4Z0h2wxtbNZ7 +CzpuoQ3gSuh6qGoF4+q0AW9MiAz0xD8q7O4FCBK5f+xLNSsFYFJY+CkQFr7Ojk9G+MqMv4MNc933 euLWP87IE1EqWwpTJRRZYA8lI2Zb7Do5x3bgthMeU72vEoMoN46u28KQO4MfTuZUrDkEicuVT7LU0 9ZfjagDQ==; Received: from e0022681537dd.dyn.armlinux.org.uk ([fd8f:7570:feb6:1:222:68ff:fe15:37dd]:41132 helo=rmk-PC.armlinux.org.uk) by pandora.armlinux.org.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lPlPu-0005e2-Gi; Fri, 26 Mar 2021 12:18:18 +0000 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.92) (envelope-from ) id 1lPlPu-0007oY-AU; Fri, 26 Mar 2021 12:18:18 +0000 In-Reply-To: <20210326121735.GQ1463@shell.armlinux.org.uk> References: <20210326121735.GQ1463@shell.armlinux.org.uk> From: Russell King To: linux-arm-kernel@lists.infradead.org Cc: Arnd Bergmann ,Rob Herring Subject: [PATCH 3/3] ARM: footbridge: restore allocation of CSR I/O resource MIME-Version: 1.0 Content-Disposition: inline Message-Id: Date: Fri, 26 Mar 2021 12:18:18 +0000 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210326_122020_607616_0B2C6BD2 X-CRM114-Status: GOOD ( 14.43 ) 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="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Commit 8ef6e6201b2 ("ARM: footbridge: use fixed PCI i/o mapping") made two changes: it contains what it says in the summary line, but it also removes the CSR I/O allocation, which effectively means the DC21285 responds to I/O accesses at address 0..0x7f, which overlap Southbridge ISA resources on the same PCI bus. This commit fixes it, but depends on the previous two commits removing the bus level PCI I/O resource: ARM: footbridge: avoid using separate PCI I/O bus resource ARM: pci: make bus I/O resources optional Fixes: 8ef6e6201b2 ("ARM: footbridge: use fixed PCI i/o mapping") Signed-off-by: Russell King --- arch/arm/mach-footbridge/dc21285.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-footbridge/dc21285.c b/arch/arm/mach-footbridge/dc21285.c index f9713dc561cf..d900651a9c8f 100644 --- a/arch/arm/mach-footbridge/dc21285.c +++ b/arch/arm/mach-footbridge/dc21285.c @@ -332,6 +332,19 @@ void __init dc21285_preinit(void) "PCI data parity", NULL); if (cfn_mode) { + static struct resource csrio; + + csrio.flags = IORESOURCE_IO; + csrio.name = "Footbridge"; + + /* + * Put the Footbridge IO space in the top 256 bytes of IO + * space, which should otherwise remain unused. This avoids + * any conflict with ISA peripherals. + */ + allocate_resource(&ioport_resource, &csrio, 128, + 0xff00, 0xffff, 128, NULL, NULL); + /* * Map our SDRAM at a known address in PCI space, just in case * the firmware had other ideas. Using a nonzero base is @@ -339,7 +352,7 @@ void __init dc21285_preinit(void) * in the range 0x000a0000 to 0x000c0000. (eg, S3 cards). */ *CSR_PCICSRBASE = 0xf4000000; - *CSR_PCICSRIOBASE = 0; + *CSR_PCICSRIOBASE = csrio.start; *CSR_PCISDRAMBASE = __virt_to_bus(PAGE_OFFSET); *CSR_PCIROMBASE = 0; *CSR_PCICMD = PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER | -- 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel