From patchwork Wed Jan 30 15:46:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Russell King - ARM Linux X-Patchwork-Id: 216939 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 05F0E2C008E for ; Thu, 31 Jan 2013 02:46:20 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753481Ab3A3PqS (ORCPT ); Wed, 30 Jan 2013 10:46:18 -0500 Received: from caramon.arm.linux.org.uk ([78.32.30.218]:59119 "EHLO caramon.arm.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753444Ab3A3PqS (ORCPT ); Wed, 30 Jan 2013 10:46:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=arm.linux.org.uk; s=caramon; h=Sender:In-Reply-To:Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To:From:Date; bh=BDX29xhIggJpi9A49ofxfR76ipIp2Qmeb4cdYAhNEtM=; b=B8YU4kCSR7HCj0ZVg2w+/5YuF4+a3W5AWaF6/urzSyO38PD/lwQa+Q7JdV+B2O2aLPUSHNdr/ztKmkVpeyOr8fJTXMVL45g8zKhzuJ1kRAm6ciQrDN2Wu1LRAazM6qiA0j6ErBlUNEmxjpFQ4RZ4zTt66th9dhj469WcQ+5qXZ8=; Received: from n2100.arm.linux.org.uk ([2002:4e20:1eda:1:214:fdff:fe10:4f86]:38694) by caramon.arm.linux.org.uk with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.76) (envelope-from ) id 1U0ZrQ-0001XC-HA; Wed, 30 Jan 2013 15:46:04 +0000 Received: from linux by n2100.arm.linux.org.uk with local (Exim 4.76) (envelope-from ) id 1U0ZrP-0007f2-3y; Wed, 30 Jan 2013 15:46:03 +0000 Date: Wed, 30 Jan 2013 15:46:02 +0000 From: Russell King - ARM Linux To: Thomas Petazzoni Cc: Thierry Reding , Andrew Lunn , Jason Cooper , Arnd Bergmann , Maen Suleiman , linux-pci@vger.kernel.org, Stephen Warren , Eran Ben-Avi , Nadav Haklai , Gregory Clement , Lior Amsalem , Shadi Ammouri , Bjorn Helgaas , Tawfik Bayouk , linux-arm-kernel@lists.infradead.org, Jason Gunthorpe Subject: Re: [PATCH v2 19/27] pci: PCIe driver for Marvell Armada 370/XP systems Message-ID: <20130130154602.GL23505@n2100.arm.linux.org.uk> References: <1359399397-29729-1-git-send-email-thomas.petazzoni@free-electrons.com> <1359399397-29729-20-git-send-email-thomas.petazzoni@free-electrons.com> <20130130113245.GH23505@n2100.arm.linux.org.uk> <20130130120344.GA29490@avionic-0098.mockup.avionic-design.de> <20130130150856.GJ23505@n2100.arm.linux.org.uk> <20130130151934.GK23505@n2100.arm.linux.org.uk> <20130130163659.75360dba@skate> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20130130163659.75360dba@skate> User-Agent: Mutt/1.5.19 (2009-01-05) Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org On Wed, Jan 30, 2013 at 04:36:59PM +0100, Thomas Petazzoni wrote: > Dear Russell King - ARM Linux, > > On Wed, 30 Jan 2013 15:19:34 +0000, Russell King - ARM Linux wrote: > > diff --git a/arch/arm/include/asm/mach/pci.h b/arch/arm/include/asm/mach/pci.h > > index db9fedb..bba0cf3 100644 > > --- a/arch/arm/include/asm/mach/pci.h > > +++ b/arch/arm/include/asm/mach/pci.h > > @@ -29,6 +29,7 @@ struct hw_pci { > > void (*postinit)(void); > > u8 (*swizzle)(struct pci_dev *dev, u8 *pin); > > int (*map_irq)(const struct pci_dev *dev, u8 slot, u8 pin); > > + resource_size_t (*window_align)(struct pci_bus *, unsigned long); > > }; > > Didn't you say just yesterday that you would prefer a numerical value > rather than a hook that could do random things? :-) Hrh, right. :) And it also helps if I modify the right struct too! Try this instead. Overwrite sys->win_align_mem / sys->win_align_io in the setup function as required. arch/arm/include/asm/mach/pci.h | 2 ++ arch/arm/kernel/bios32.c | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 0 deletions(-) --- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm/include/asm/mach/pci.h b/arch/arm/include/asm/mach/pci.h index db9fedb..a2301ae 100644 --- a/arch/arm/include/asm/mach/pci.h +++ b/arch/arm/include/asm/mach/pci.h @@ -42,6 +42,8 @@ struct pci_sys_data { int busnr; /* primary bus number */ u64 mem_offset; /* bus->cpu memory mapping offset */ unsigned long io_offset; /* bus->cpu IO mapping offset */ + resource_size_t win_align_mem; + resource_size_t win_align_io; struct pci_bus *bus; /* PCI bus */ struct list_head resources; /* root bus resources (apertures) */ struct resource io_res; diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c index 379cf32..ba81630 100644 --- a/arch/arm/kernel/bios32.c +++ b/arch/arm/kernel/bios32.c @@ -463,6 +463,8 @@ static void __init pcibios_init_hw(struct hw_pci *hw, struct list_head *head) sys->swizzle = hw->swizzle; sys->map_irq = hw->map_irq; INIT_LIST_HEAD(&sys->resources); + sys->win_align_mem = 1; + sys->win_align_io = 1; ret = hw->setup(nr, sys); @@ -581,6 +583,21 @@ resource_size_t pcibios_align_resource(void *data, const struct resource *res, return start; } +resource_size_t pcibios_window_alignment(struct pci_bus *bus, + unsigned long type) +{ + struct pci_sys_data *sys = bus->sysdata; + + /* Ignore downstream buses */ + if (!bus->parent) { + if (type & IORESOURCE_MEM) + return sys->win_align_mem; + if (type & IORESOURCE_IO) + return sys->win_align_io; + } + return 1; +} + /** * pcibios_enable_device - Enable I/O and memory. * @dev: PCI device to be enabled