linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] powerpc: Remove bogus sanity check in pci -> OF node code
@ 2007-01-11  5:38 Benjamin Herrenschmidt
  2007-01-11  5:52 ` Zang Roy-r61911
  0 siblings, 1 reply; 2+ messages in thread
From: Benjamin Herrenschmidt @ 2007-01-11  5:38 UTC (permalink / raw)
  To: Paul Mackerras; +Cc: linuxppc-dev list

The new implementation of pci_device_to_OF_node() on ppc32 has a bogus
sanity check in it that can cause oopses at boot when no device node is
present, and might hit correct cases with older/weird apple device-trees
where they have the type "vci" for the chaos bridge.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---

Zang, please confirm that this fixes your problem. If it does, paulus,
this should go in 2.6.20


Index: linux-work/arch/powerpc/kernel/pci_32.c
===================================================================
--- linux-work.orig/arch/powerpc/kernel/pci_32.c	2007-01-11 16:30:09.000000000 +1100
+++ linux-work/arch/powerpc/kernel/pci_32.c	2007-01-11 16:30:31.000000000 +1100
@@ -775,11 +775,6 @@ static struct device_node *scan_OF_for_p
 	np = scan_OF_for_pci_dev(parent, bus->self->devfn);
 	of_node_put(parent);
 
-	/* sanity check */
-	if (strcmp(np->type, "pci") != 0)
-		printk(KERN_WARNING "pci: wrong type \"%s\" for bridge %s\n",
-		       np->type, np->full_name);
-
 	return np;
 }
 

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] powerpc: Remove bogus sanity check in pci -> OF node code
  2007-01-11  5:38 [PATCH] powerpc: Remove bogus sanity check in pci -> OF node code Benjamin Herrenschmidt
@ 2007-01-11  5:52 ` Zang Roy-r61911
  0 siblings, 0 replies; 2+ messages in thread
From: Zang Roy-r61911 @ 2007-01-11  5:52 UTC (permalink / raw)
  To: Benjamin Herrenschmidt; +Cc: linuxppc-dev list, Paul Mackerras

On Thu, 2007-01-11 at 13:38, Benjamin Herrenschmidt wrote:
> The new implementation of pci_device_to_OF_node() on ppc32 has a bogus
> sanity check in it that can cause oopses at boot when no device node
> is
> present, and might hit correct cases with older/weird apple
> device-trees
> where they have the type "vci" for the chaos bridge.
> 
> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> ---
> 
> Zang, please confirm that this fixes your problem. If it does, paulus,
> this should go in 2.6.20
It works for my problem. You remove them, so it is not necessary to test
whether it is NULL.
This issue blocks my two boards: MPC8548CDS and MPC8641HPCN. it should
go in 2.6.20.

> 
> 
> Index: linux-work/arch/powerpc/kernel/pci_32.c
> ===================================================================
> --- linux-work.orig/arch/powerpc/kernel/pci_32.c        2007-01-11
> 16:30:09.000000000 +1100
> +++ linux-work/arch/powerpc/kernel/pci_32.c     2007-01-11
> 16:30:31.000000000 +1100
> @@ -775,11 +775,6 @@ static struct device_node *scan_OF_for_p
>         np = scan_OF_for_pci_dev(parent, bus->self->devfn);
>         of_node_put(parent);
>  
> -       /* sanity check */
> -       if (strcmp(np->type, "pci") != 0)
> -               printk(KERN_WARNING "pci: wrong type \"%s\" for bridge
> %s\n",
> -                      np->type, np->full_name);
> -
>         return np;
>  }
>  
> 
> 

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2007-01-11  5:51 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-01-11  5:38 [PATCH] powerpc: Remove bogus sanity check in pci -> OF node code Benjamin Herrenschmidt
2007-01-11  5:52 ` Zang Roy-r61911

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).