linux-mips
[Top] [All Lists]

Re: [PATCH 2/2] MIPS: implement pcibios_get_phb_of_node

To: Gabor Juhos <juhosg@openwrt.org>
Subject: Re: [PATCH 2/2] MIPS: implement pcibios_get_phb_of_node
From: Bjorn Helgaas <bhelgaas@google.com>
Date: Thu, 11 Apr 2013 11:35:14 -0600
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>, Ralf Baechle <ralf@linux-mips.org>, "linux-pci@vger.kernel.org" <linux-pci@vger.kernel.org>, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, "linux-mips@linux-mips.org" <linux-mips@linux-mips.org>
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:mime-version:in-reply-to:references:from:date:message-id :subject:to:cc:content-type:content-transfer-encoding; bh=git+IJd5xrFCgYAOM5u0RtfBIrwTLnKkM3aPC1wsFDY=; b=aAPn6VSASKyGii9hOhNCJFIh++eGCGnlsXat8Q1Rv9wEDGm7mXZvjW1n+VdSeFhsg/ jpc8JOGYygRekw3lLbnjo3Xv1gdC7apEqpLu8Xgy6AlFT7hRv+n5iThgDYN74+wm7uxm N357fDc3VOZGVtjAS9gqeulNkAgRk8pcy6r08qx6e0WjXNITY82BZfepPK9lmnntcwl7 /+klgtyEYvFHCoWT/BhT1SuqazcPr88eujyw4Ak1yGJ6EmrT0iMOPJKWeivVwOfou0r5 Paj07w05ejIMnCf49W47JIwcCXyYEtOlqUbMj7pyMWvVhty6+db7Mq04hJ/EeB9vRtAb Udqg==
In-reply-to: <5166F39C.1050907@openwrt.org>
List-archive: <http://www.linux-mips.org/archives/linux-mips/>
List-help: <mailto:ecartis@linux-mips.org?Subject=help>
List-id: linux-mips <linux-mips.eddie.linux-mips.org>
List-owner: <mailto:ralf@linux-mips.org>
List-post: <mailto:linux-mips@linux-mips.org>
List-software: Ecartis version 1.0.0
List-subscribe: <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips>
List-unsubscribe: <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips>
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <1365098483-26821-1-git-send-email-juhosg@openwrt.org> <1365098483-26821-2-git-send-email-juhosg@openwrt.org> <CAErSpo4ih-Kgp4LxX1MDodac-eoPo=Mu1d6ex8oNnaEEc_GQnw@mail.gmail.com> <5166F39C.1050907@openwrt.org>
Sender: linux-mips-bounce@linux-mips.org
On Thu, Apr 11, 2013 at 11:32 AM, Gabor Juhos <juhosg@openwrt.org> wrote:
> 2013.04.10. 18:31 keltezéssel, Bjorn Helgaas írta:
>> On Thu, Apr 4, 2013 at 12:01 PM, Gabor Juhos <juhosg@openwrt.org> wrote:
>>> The of_node field of the device assigned to a
>>> PCI bus is used during scanning of the PCI bus.
>>> However on MIPS, the of_node field is assigned
>>> only after the bus has been scanned.
>>>
>>> Implement the architecture specific version of
>>> 'pcibios_get_phb_of_node'. Which ensures that the
>>> PCI driver core will initialize the of_node field
>>> before starting the scan.
>>>
>>> Also remove the local assignment of bus->dev.of_node,
>>> it is not needed after the patch.
>>>
>>> Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
>>
>> I removed the __weak annotation from include/linux/pci.h and applied
>> this patch to my pci/gabor-get-of-node.
>
> Thank you!
>
>> Give it a try and make sure
>> it solves your problem.  If so, and Ralph approves, I can push both
>> for v3.10.  It should appear at
>> http://git.kernel.org/cgit/linux/kernel/git/helgaas/pci.git/log/?h=pci/gabor-get-of-node
>> soon.
>
> I have tried your patch on top of 3.9-rc6. The resulting kernel uses the
> architecture specific implementation, and it runs fine.
>
>   $ mipsel-openwrt-linux-readelf -s arch/mips/pci/built-in.o \
>     drivers/pci/built-in.o vmlinux.o | grep pcibios_get_phb_of_node
>       93: 0000046c    12 FUNC    GLOBAL DEFAULT    2 pcibios_get_phb_of_node
>     1433: 00012a2c   104 FUNC    WEAK   DEFAULT    2 pcibios_get_phb_of_node
>    31863: 001d4dbc    12 FUNC    GLOBAL DEFAULT    2 pcibios_get_phb_of_node
>   $
>
> For completeness, I have compiled it for X64 and for powerpc as well. I did 
> not
> try to run these kernels, but the output of readelf seems to be ok:
>
>   $ readelf -s arch/x86/kernel/built-in.o drivers/pci/built-in.o vmlinux.o | \
>     grep pcibios_get_phb_of_node
>     2761: 000273a0    86 FUNC    GLOBAL DEFAULT    1 pcibios_get_phb_of_node
>     1705: 00018770    77 FUNC    WEAK   DEFAULT    1 pcibios_get_phb_of_node
>    60364: 000278a0    86 FUNC    GLOBAL DEFAULT    1 pcibios_get_phb_of_node
>   $
>
>   $ powerpc-openwrt-linux-readelf -s arch/powerpc/kernel/built-in.o \
>     drivers/pci/built-in.o  vmlinux.o | grep pcibios_get_phb_of_node
>     1002: 0000ca28    12 FUNC    GLOBAL DEFAULT    1 pcibios_get_phb_of_node
>     1485: 0001453c    88 FUNC    WEAK   DEFAULT    1 pcibios_get_phb_of_node
>    28959: 0000d598    12 FUNC    GLOBAL DEFAULT    1 pcibios_get_phb_of_node
>   $
>
>> Or if you prefer, you can take them through the MIPS tree.
>
> Either is fine.

Thanks for checking these out!  I put them in my "next" branch and
pushed it, so they should appear in v3.10.

Bjorn

<Prev in Thread] Current Thread [Next in Thread>