Re: [PATCH] Fix boot-time hang on G31/G33 PC

[Robert Hancock <hancockr@shaw.ca>]

Matthew Wilcox wrote:
> This patch, loosely based on a patch from Robert Hancock, which was in
> turn based on a patch from Jesse Barnes, fixes a boot-time hang on my
> shiny new PC.  The 'conflict' mentioned in the patch in my case happens
> to be between mmconfig and the graphics card, but it could easily be
> between any pair of devices if they are left enabled by the BIOS and
> mappen in the wrong place.
> 
> Signed-off-by: Matthew Wilcox <matthew@wil.cx>
> 

We've already got a patch for this in Greg's PCI tree, hopefully it 
should go in for 2.6.24.

Are you getting MMCONFIG enabled on your system with 2.6.23? If not this 
problem shouldn't matter. In the cases I've seen that have caused 
problems in the past (Intel boards mainly), where the MMCONFIG area 
overlaps with where the graphics card BAR ends up during BAR sizing, the 
BIOS happened to not reserve the MMCONFIG table in the E820 memory map, 
so current mainline will turn off MMCONFIG. However, it's quite possible 
that some systems will pass the old E820 validation check and turn on 
MMCONFIG where the overlap happens..

There's a patch in Andi's tree (also hopefully for 2.6.24) to loosen the 
MMCONFIG validation to check against ACPI reservations instead of the 
E820 map (which isn't required to have a reservation for MMCONFIG). This 
makes the disable-decode change more critical.

> diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
> index 34b8dae..51ef450 100644
> --- a/drivers/pci/probe.c
> +++ b/drivers/pci/probe.c
> @@ -180,11 +180,26 @@ static inline int is_64bit_memory(u32 mask)
>  	return 0;
>  }
>  
> +/*
> + * Sizing PCI BARs requires us to disable decoding, otherwise we may run
> + * into conflicts with other devices while trying to size the BAR.  Normally
> + * this isn't a problem, but it happens on some machines normally, and can
> + * happen on others during PCI device hotplug.  Don't disable BARs for host
> + * bridges, though.  Some of them do silly things like disable accesses to
> + * RAM from the CPU
> + */
>  static void pci_read_bases(struct pci_dev *dev, unsigned int howmany, int rom)
>  {
>  	unsigned int pos, reg, next;
>  	u32 l, sz;
>  	struct resource *res;
> +	u16 orig_cmd;
> +
> +	if ((dev->class >> 8) != PCI_CLASS_BRIDGE_HOST) {
> +		pci_read_config_word(dev, PCI_COMMAND, &orig_cmd);
> +		pci_write_config_word(dev, PCI_COMMAND,
> +			orig_cmd & ~(PCI_COMMAND_MEMORY | PCI_COMMAND_IO));
> +	}
>  
>  	for(pos=0; pos<howmany; pos = next) {
>  		u64 l64;
> @@ -283,6 +298,9 @@ static void pci_read_bases(struct pci_dev *dev, unsigned int howmany, int rom)
>  			}
>  		}
>  	}
> +
> +	if ((dev->class >> 8) != PCI_CLASS_BRIDGE_HOST)
> +		pci_write_config_word(dev, PCI_COMMAND, orig_cmd);
>  }
>  
>  void __devinit pci_read_bridge_bases(struct pci_bus *child)
>