From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3064D1A0191 for ; Thu, 21 Aug 2014 09:26:53 +1000 (EST) Date: Thu, 21 Aug 2014 09:26:52 +1000 From: Anton Blanchard To: bhelgaas@google.com Subject: [PATCH] PCI: Increase BAR size quirk for IBM ipr SAS Crocodile adapters Message-ID: <20140821092652.604d7484@kryten> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Cc: linux-pci@vger.kernel.org, miltonm@us.ibm.com, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, dllehr@us.ibm.com List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Douglas Lehr The Crocodile chip occasionally comes up with 4k and 8k BAR sizes. Due to an errata, setting the SR-IOV page size causes the physical function BARs to expand to the system page size. Since ppc64 uses 64k pages, when Linux tries to assign the smaller resource sizes to the now 64k BARs the address will be truncated and the BARs will overlap. This quirk will force Linux to allocate the resource as a full page, which will avoid the overlap. Cc: Signed-off-by: Douglas Lehr Signed-off-by: Anton Blanchard Acked-by: Milton Miller --- drivers/pci/quirks.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 80c2d01..45b946d 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -24,6 +24,7 @@ #include #include #include +#include #include /* isa_dma_bridge_buggy */ #include "pci.h" @@ -287,6 +288,24 @@ static void quirk_citrine(struct pci_dev *dev) } DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CITRINE, quirk_citrine); +/* On IBM Crocodile ipr SAS adapters, expand bar size to system page size. */ +static void quirk_extend_bar_to_page(struct pci_dev *dev) +{ + int i; + + for (i = 0; i < PCI_STD_RESOURCE_END; i++) { + struct resource *r = &dev->resource[i]; + + if (r->flags & IORESOURCE_MEM && resource_size(r) < PAGE_SIZE) { + dev_info(&dev->dev, "Setting Bar size to Page size"); + r->end = PAGE_SIZE-1; + r->start = 0; + r->flags |= IORESOURCE_UNSET; + } + } +} +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_IBM, 0x034a, quirk_extend_bar_to_page); + /* * S3 868 and 968 chips report region size equal to 32M, but they decode 64M. * If it's needed, re-allocate the region. -- 1.7.9.5