[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20151013094545.BD37A14029E@ozlabs.org>
Date: Tue, 13 Oct 2015 20:45:45 +1100 (AEDT)
From: Michael Ellerman <mpe@...erman.id.au>
To: Yinghai Lu <yinghai@...nel.org>,
Bjorn Helgaas <bhelgaas@...gle.com>,
David Miller <davem@...emloft.net>,
Benjamin Herrenschmidt <benh@...nel.crashing.org>,
Wei Yang <weiyang@...ux.vnet.ibm.com>, TJ <linux@....tj>,
Yijing Wang <wangyijing@...wei.com>,
Khalid Aziz <khalid.aziz@...cle.com>
Cc: linux-arch@...r.kernel.org, Michal Simek <monstr@...str.eu>,
Arnd Bergmann <arnd@...db.de>, linux-pci@...r.kernel.org,
linuxppc-dev@...ts.ozlabs.org, linux-kernel@...r.kernel.org,
Paul Mackerras <paulus@...ba.org>,
Yinghai Lu <yinghai@...nel.org>
Subject: Re: [v7,51/60] PCI: Unify skip_ioresource_align()
On Thu, 2015-08-10 at 21:39:10 UTC, Yinghai Lu wrote:
> There are powerpc generic version and x86 local version for
> skip_ioresource_align().
>
> Move the powerpc version to setup-bus.c, and kill x86 local version.
>
> Also kill dummy version in microblaze.
>
> Cc: Michal Simek <monstr@...str.eu>
> Cc: Paul Mackerras <paulus@...ba.org>
> Cc: Michael Ellerman <mpe@...erman.id.au>
> Cc: Arnd Bergmann <arnd@...db.de>
> Cc: linuxppc-dev@...ts.ozlabs.org
> Cc: linux-arch@...r.kernel.org
> Signed-off-by: Yinghai Lu <yinghai@...nel.org>
> Reviewed-by: Thomas Gleixner <tglx@...utronix.de>
>
> diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
> index 7587b2a..8853667 100644
> --- a/arch/powerpc/kernel/pci-common.c
> +++ b/arch/powerpc/kernel/pci-common.c
> @@ -1052,15 +1052,6 @@ void pci_fixup_cardbus(struct pci_bus *bus)
> pcibios_setup_bus_devices(bus);
> }
>
> -
> -static int skip_isa_ioresource_align(struct pci_dev *dev)
> -{
> - if (pci_has_flag(PCI_CAN_SKIP_ISA_ALIGN) &&
> - !(dev->bus->bridge_ctl & PCI_BRIDGE_CTL_ISA))
> - return 1;
> - return 0;
> -}
> -
> /*
> * We need to avoid collisions with `mirrored' VGA ports
> * and other strange ISA hardware, so we always want the
> @@ -1081,7 +1072,7 @@ resource_size_t pcibios_align_resource(void *data, const struct resource *res,
> resource_size_t start = res->start;
>
> if (res->flags & IORESOURCE_IO) {
> - if (skip_isa_ioresource_align(dev))
> + if (skip_isa_ioresource_align(dev->bus))
> return start;
> if (start & 0x300)
> start = (start + 0x3ff) & ~0x3ff;
LGTM.
Acked-by: Michael Ellerman <mpe@...erman.id.au> (powerpc)
cheers
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists