From 65ae558bf522e8305a831b0ec8c3b5b5226af709 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Mon, 20 Apr 2009 19:31:20 +0900 Subject: [PATCH] --- yaml --- r: 146665 b: refs/heads/master c: d556fcc101c4b0d57ac9742ab806a6bfed78eac1 h: refs/heads/master i: 146663: ac4104cd456eb8c9e91fe3f46eb2222bd309c44e v: v3 --- [refs] | 2 +- trunk/arch/sh/drivers/pci/fixups-dreamcast.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 76149912475e..a550baf2227a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bb3396477bf46c7cae6bd04b969580277957966e +refs/heads/master: d556fcc101c4b0d57ac9742ab806a6bfed78eac1 diff --git a/trunk/arch/sh/drivers/pci/fixups-dreamcast.c b/trunk/arch/sh/drivers/pci/fixups-dreamcast.c index 2bf85cf091e1..48c6381fffaa 100644 --- a/trunk/arch/sh/drivers/pci/fixups-dreamcast.c +++ b/trunk/arch/sh/drivers/pci/fixups-dreamcast.c @@ -41,6 +41,13 @@ static void __init gapspci_fixup_resources(struct pci_dev *dev) */ dev->resource[1].start = p->io_resource->start + 0x100; dev->resource[1].end = dev->resource[1].start + 0x200 - 1; + + /* + * This is not a normal BAR, prevent any attempts to move + * the BAR, as this will result in a bus lock. + */ + dev->resource[1].flags |= IORESOURCE_PCI_FIXED; + /* * Redirect dma memory allocations to special memory window. */