diff mbox series

[2/2] usb: xhci: Load Raspberry Pi 4 VL805's firmware

Message ID 20200428174449.27953-3-nsaenzjulienne@suse.de
State New
Headers show
Series Raspberry Pi 4 VL805 firmware load | expand

Commit Message

Nicolas Saenz Julienne April 28, 2020, 5:44 p.m. UTC
When needed, RPi4's co-processor (called VideoCore) has to be instructed
to load VL805's firmware (the chip providing xHCI support). VideCore's
firmware expects the board's PCIe bus to be already configured in order
for it to load the xHCI chip firmware. So we have to make sure this
happens in between the PCIe configuration and xHCI startup.

Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne at suse.de>
---
 drivers/usb/host/xhci-pci.c | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

Marek Vasut April 28, 2020, 5:59 p.m. UTC | #1
On 4/28/20 7:44 PM, Nicolas Saenz Julienne wrote:
> When needed, RPi4's co-processor (called VideoCore) has to be instructed
> to load VL805's firmware (the chip providing xHCI support). VideCore's
> firmware expects the board's PCIe bus to be already configured in order
> for it to load the xHCI chip firmware. So we have to make sure this
> happens in between the PCIe configuration and xHCI startup.
> 
> Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne at suse.de>
> ---
>  drivers/usb/host/xhci-pci.c | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
> index c1f60da541..5c17ea6932 100644
> --- a/drivers/usb/host/xhci-pci.c
> +++ b/drivers/usb/host/xhci-pci.c
> @@ -11,6 +11,8 @@
>  #include <usb.h>
>  #include <usb/xhci.h>
>  
> +#include <asm/arch/msg.h>
> +
>  static void xhci_pci_init(struct udevice *dev, struct xhci_hccr **ret_hccr,
>  			  struct xhci_hcor **ret_hcor)
>  {
> @@ -18,6 +20,10 @@ static void xhci_pci_init(struct udevice *dev, struct xhci_hccr **ret_hccr,
>  	struct xhci_hcor *hcor;
>  	u32 cmd;
>  
> +#ifdef CONFIG_BCM2711
> +	bcm2711_load_vl805_firmware();
> +#endif
> +
>  	hccr = (struct xhci_hccr *)dm_pci_map_bar(dev,
>  			PCI_BASE_ADDRESS_0, PCI_REGION_MEM);
>  	hcor = (struct xhci_hcor *)((uintptr_t) hccr +

I think socfpga arria10 has some firmware loader implementation that is
generic, so can't we use that ?
Marek Szyprowski April 29, 2020, 6:18 a.m. UTC | #2
Hi Nicolas,

On 28.04.2020 19:44, Nicolas Saenz Julienne wrote:
> When needed, RPi4's co-processor (called VideoCore) has to be instructed
> to load VL805's firmware (the chip providing xHCI support). VideCore's
> firmware expects the board's PCIe bus to be already configured in order
> for it to load the xHCI chip firmware. So we have to make sure this
> happens in between the PCIe configuration and xHCI startup.
>
> Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne at suse.de>
> ---
>   drivers/usb/host/xhci-pci.c | 6 ++++++
>   1 file changed, 6 insertions(+)
>
> diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
> index c1f60da541..5c17ea6932 100644
> --- a/drivers/usb/host/xhci-pci.c
> +++ b/drivers/usb/host/xhci-pci.c
> @@ -11,6 +11,8 @@
>   #include <usb.h>
>   #include <usb/xhci.h>
>   
> +#include <asm/arch/msg.h>
> +

Does the above include works on the other archs?

>   static void xhci_pci_init(struct udevice *dev, struct xhci_hccr **ret_hccr,
>   			  struct xhci_hcor **ret_hcor)
>   {
> @@ -18,6 +20,10 @@ static void xhci_pci_init(struct udevice *dev, struct xhci_hccr **ret_hccr,
>   	struct xhci_hcor *hcor;
>   	u32 cmd;
>   
> +#ifdef CONFIG_BCM2711
> +	bcm2711_load_vl805_firmware();
> +#endif
> +
>   	hccr = (struct xhci_hccr *)dm_pci_map_bar(dev,
>   			PCI_BASE_ADDRESS_0, PCI_REGION_MEM);
>   	hcor = (struct xhci_hcor *)((uintptr_t) hccr +

Best regards
Bin Meng April 29, 2020, 6:51 a.m. UTC | #3
Hi Nicolas,

On Wed, Apr 29, 2020 at 1:45 AM Nicolas Saenz Julienne
<nsaenzjulienne at suse.de> wrote:
>
> When needed, RPi4's co-processor (called VideoCore) has to be instructed
> to load VL805's firmware (the chip providing xHCI support). VideCore's
> firmware expects the board's PCIe bus to be already configured in order
> for it to load the xHCI chip firmware. So we have to make sure this
> happens in between the PCIe configuration and xHCI startup.
>

I am a little bit confused. I thought we already solved the xHCI
driver issuw on RPi4. What's this firmware used for?

> Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne at suse.de>
> ---
>  drivers/usb/host/xhci-pci.c | 6 ++++++
>  1 file changed, 6 insertions(+)
>

Regards,
Bin
Nicolas Saenz Julienne April 29, 2020, 10:10 a.m. UTC | #4
On Tue, 2020-04-28 at 19:59 +0200, Marek Vasut wrote:
> On 4/28/20 7:44 PM, Nicolas Saenz Julienne wrote:
> > When needed, RPi4's co-processor (called VideoCore) has to be instructed
> > to load VL805's firmware (the chip providing xHCI support). VideCore's
> > firmware expects the board's PCIe bus to be already configured in order
> > for it to load the xHCI chip firmware. So we have to make sure this
> > happens in between the PCIe configuration and xHCI startup.
> > 
> > Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne at suse.de>
> > ---
> >  drivers/usb/host/xhci-pci.c | 6 ++++++
> >  1 file changed, 6 insertions(+)
> > 
> > diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
> > index c1f60da541..5c17ea6932 100644
> > --- a/drivers/usb/host/xhci-pci.c
> > +++ b/drivers/usb/host/xhci-pci.c
> > @@ -11,6 +11,8 @@
> >  #include <usb.h>
> >  #include <usb/xhci.h>
> >  
> > +#include <asm/arch/msg.h>
> > +
> >  static void xhci_pci_init(struct udevice *dev, struct xhci_hccr **ret_hccr,
> >  			  struct xhci_hcor **ret_hcor)
> >  {
> > @@ -18,6 +20,10 @@ static void xhci_pci_init(struct udevice *dev, struct
> > xhci_hccr **ret_hccr,
> >  	struct xhci_hcor *hcor;
> >  	u32 cmd;
> >  
> > +#ifdef CONFIG_BCM2711
> > +	bcm2711_load_vl805_firmware();
> > +#endif
> > +
> >  	hccr = (struct xhci_hccr *)dm_pci_map_bar(dev,
> >  			PCI_BASE_ADDRESS_0, PCI_REGION_MEM);
> >  	hcor = (struct xhci_hcor *)((uintptr_t) hccr +
> 
> I think socfpga arria10 has some firmware loader implementation that is
> generic, so can't we use that ?

I don't think so. I've been told the firmware upgrade protocol is private and
specific to the VL80X family of devices. The Raspberry Pi foundation decided to
implement it in their closed source VideoCore firmware. All we have access to
from arm is this mailbox interface where we just trigger the process.

Then there's an extra potential issue as it's the RPi4 co-processor firmware
image that contains VL805's firmware. We'd had to somehow extract it from
there every time they update it.

As a recap of what's happening here:
 - arm configures PCI
 - arm triggers VL805 firmware reload
 - VideoCore somehow transfers firmware (trough PCI) into VL805 if no EEPROM
   present
 - VL805 is up and running
 - arm can carry on with xHCI init

Note that all this is only relevant if you have newer revision of the board. So
most people will not need it right now. But as it becomes more widespread we'll
start seeing complaints.

Regards,
Nicolas

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: This is a digitally signed message part
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200429/a05a0776/attachment.sig>
Nicolas Saenz Julienne April 29, 2020, 10:53 a.m. UTC | #5
Hi Bin,

On Wed, 2020-04-29 at 14:51 +0800, Bin Meng wrote:
> Hi Nicolas,
> 
> On Wed, Apr 29, 2020 at 1:45 AM Nicolas Saenz Julienne
> <nsaenzjulienne at suse.de> wrote:
> > When needed, RPi4's co-processor (called VideoCore) has to be instructed
> > to load VL805's firmware (the chip providing xHCI support). VideCore's
> > firmware expects the board's PCIe bus to be already configured in order
> > for it to load the xHCI chip firmware. So we have to make sure this
> > happens in between the PCIe configuration and xHCI startup.
> > 
> 
> I am a little bit confused. I thought we already solved the xHCI
> driver issuw on RPi4. What's this firmware used for?

This is not related to the issues Sylwester fixed. It builds on it (I should
have been more explicit in that regard). It relates to a design change the RPi
foundation did on newer revisions of boards. VL805, the xHCI chip, needs its
firmware loaded. On older revisions of the board -- the one most people have
right now -- this is achieved using an EEPROM that is rooted directly into
VL805. Newer board revisions removed the EEPROM and now let VideoCore (the
board co-processor) take care of loading the firmware into the VL805 chip.

All we have left from arm's perspective is a mailbox interface to VideoCore,
where we can trigger the VL805 firmware load. Which can only happen as long as
we've have properly configured the PCI bus.

Regards,
Nicolas

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: This is a digitally signed message part
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200429/f6282a23/attachment.sig>
Nicolas Saenz Julienne April 29, 2020, 11:19 a.m. UTC | #6
On Wed, 2020-04-29 at 08:18 +0200, Marek Szyprowski wrote:
> Hi Nicolas,
> 
> On 28.04.2020 19:44, Nicolas Saenz Julienne wrote:
> > When needed, RPi4's co-processor (called VideoCore) has to be instructed
> > to load VL805's firmware (the chip providing xHCI support). VideCore's
> > firmware expects the board's PCIe bus to be already configured in order
> > for it to load the xHCI chip firmware. So we have to make sure this
> > happens in between the PCIe configuration and xHCI startup.
> > 
> > Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne at suse.de>
> > ---
> >   drivers/usb/host/xhci-pci.c | 6 ++++++
> >   1 file changed, 6 insertions(+)
> > 
> > diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
> > index c1f60da541..5c17ea6932 100644
> > --- a/drivers/usb/host/xhci-pci.c
> > +++ b/drivers/usb/host/xhci-pci.c
> > @@ -11,6 +11,8 @@
> >   #include <usb.h>
> >   #include <usb/xhci.h>
> >   
> > +#include <asm/arch/msg.h>
> > +
> 
> Does the above include works on the other archs?

It doesn't I should have enclosed it with '#ifdef CONFIG_BCM2711' as well.

Regards,
Nicolas

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: This is a digitally signed message part
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200429/0a596b50/attachment.sig>
Marek Vasut April 29, 2020, 12:05 p.m. UTC | #7
On 4/29/20 12:10 PM, Nicolas Saenz Julienne wrote:
> On Tue, 2020-04-28 at 19:59 +0200, Marek Vasut wrote:
>> On 4/28/20 7:44 PM, Nicolas Saenz Julienne wrote:
>>> When needed, RPi4's co-processor (called VideoCore) has to be instructed
>>> to load VL805's firmware (the chip providing xHCI support). VideCore's
>>> firmware expects the board's PCIe bus to be already configured in order
>>> for it to load the xHCI chip firmware. So we have to make sure this
>>> happens in between the PCIe configuration and xHCI startup.
>>>
>>> Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne at suse.de>
>>> ---
>>>  drivers/usb/host/xhci-pci.c | 6 ++++++
>>>  1 file changed, 6 insertions(+)
>>>
>>> diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
>>> index c1f60da541..5c17ea6932 100644
>>> --- a/drivers/usb/host/xhci-pci.c
>>> +++ b/drivers/usb/host/xhci-pci.c
>>> @@ -11,6 +11,8 @@
>>>  #include <usb.h>
>>>  #include <usb/xhci.h>
>>>  
>>> +#include <asm/arch/msg.h>
>>> +
>>>  static void xhci_pci_init(struct udevice *dev, struct xhci_hccr **ret_hccr,
>>>  			  struct xhci_hcor **ret_hcor)
>>>  {
>>> @@ -18,6 +20,10 @@ static void xhci_pci_init(struct udevice *dev, struct
>>> xhci_hccr **ret_hccr,
>>>  	struct xhci_hcor *hcor;
>>>  	u32 cmd;
>>>  
>>> +#ifdef CONFIG_BCM2711
>>> +	bcm2711_load_vl805_firmware();
>>> +#endif
>>> +
>>>  	hccr = (struct xhci_hccr *)dm_pci_map_bar(dev,
>>>  			PCI_BASE_ADDRESS_0, PCI_REGION_MEM);
>>>  	hcor = (struct xhci_hcor *)((uintptr_t) hccr +
>>
>> I think socfpga arria10 has some firmware loader implementation that is
>> generic, so can't we use that ?
> 
> I don't think so. I've been told the firmware upgrade protocol is private and
> specific to the VL80X family of devices. The Raspberry Pi foundation decided to
> implement it in their closed source VideoCore firmware.

What I meant was that U-Boot has a way to load files from various
storage roughly the same way Linux firmware loader API does.
Nicolas Saenz Julienne April 29, 2020, 12:36 p.m. UTC | #8
On Wed, 2020-04-29 at 14:05 +0200, Marek Vasut wrote:
> On 4/29/20 12:10 PM, Nicolas Saenz Julienne wrote:
> > On Tue, 2020-04-28 at 19:59 +0200, Marek Vasut wrote:
> > > On 4/28/20 7:44 PM, Nicolas Saenz Julienne wrote:
> > > > When needed, RPi4's co-processor (called VideoCore) has to be instructed
> > > > to load VL805's firmware (the chip providing xHCI support). VideCore's
> > > > firmware expects the board's PCIe bus to be already configured in order
> > > > for it to load the xHCI chip firmware. So we have to make sure this
> > > > happens in between the PCIe configuration and xHCI startup.
> > > > 
> > > > Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne at suse.de>
> > > > ---
> > > >  drivers/usb/host/xhci-pci.c | 6 ++++++
> > > >  1 file changed, 6 insertions(+)
> > > > 
> > > > diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
> > > > index c1f60da541..5c17ea6932 100644
> > > > --- a/drivers/usb/host/xhci-pci.c
> > > > +++ b/drivers/usb/host/xhci-pci.c
> > > > @@ -11,6 +11,8 @@
> > > >  #include <usb.h>
> > > >  #include <usb/xhci.h>
> > > >  
> > > > +#include <asm/arch/msg.h>
> > > > +
> > > >  static void xhci_pci_init(struct udevice *dev, struct xhci_hccr
> > > > **ret_hccr,
> > > >  			  struct xhci_hcor **ret_hcor)
> > > >  {
> > > > @@ -18,6 +20,10 @@ static void xhci_pci_init(struct udevice *dev, struct
> > > > xhci_hccr **ret_hccr,
> > > >  	struct xhci_hcor *hcor;
> > > >  	u32 cmd;
> > > >  
> > > > +#ifdef CONFIG_BCM2711
> > > > +	bcm2711_load_vl805_firmware();
> > > > +#endif
> > > > +
> > > >  	hccr = (struct xhci_hccr *)dm_pci_map_bar(dev,
> > > >  			PCI_BASE_ADDRESS_0, PCI_REGION_MEM);
> > > >  	hcor = (struct xhci_hcor *)((uintptr_t) hccr +
> > > 
> > > I think socfpga arria10 has some firmware loader implementation that is
> > > generic, so can't we use that ?
> > 
> > I don't think so. I've been told the firmware upgrade protocol is private
> > and
> > specific to the VL80X family of devices. The Raspberry Pi foundation decided
> > to
> > implement it in their closed source VideoCore firmware.
> 
> What I meant was that U-Boot has a way to load files from various
> storage roughly the same way Linux firmware loader API does.

As far as generic APIs are concerned I've had a look at
request_firmware_into_buf() which socfpga uses in its spl_board_init(). But
sadly it doesn't help here.

What bcm2711_load_vl805_firmware() does here is just informing the co-processor
that it's free to start the VL805 firmware load operation. I'm by no means
providing anything, think of it as a doorbell if you will. I'll try to find an
alternative to 'load' in the function name so the distinction with regular
firmware loading is more explicit.

Also bare in mind we have to time this operation in between PCIe configuration
and xHCI init. Which, IIUC, blocks us from using board_init() and the likes of
it (which would be way nicer IMO).

Regards,
Nicolas

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: This is a digitally signed message part
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200429/cdd7e892/attachment.sig>
Marek Vasut April 29, 2020, 12:37 p.m. UTC | #9
On 4/29/20 2:36 PM, Nicolas Saenz Julienne wrote:
> On Wed, 2020-04-29 at 14:05 +0200, Marek Vasut wrote:
>> On 4/29/20 12:10 PM, Nicolas Saenz Julienne wrote:
>>> On Tue, 2020-04-28 at 19:59 +0200, Marek Vasut wrote:
>>>> On 4/28/20 7:44 PM, Nicolas Saenz Julienne wrote:
>>>>> When needed, RPi4's co-processor (called VideoCore) has to be instructed
>>>>> to load VL805's firmware (the chip providing xHCI support). VideCore's
>>>>> firmware expects the board's PCIe bus to be already configured in order
>>>>> for it to load the xHCI chip firmware. So we have to make sure this
>>>>> happens in between the PCIe configuration and xHCI startup.
>>>>>
>>>>> Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne at suse.de>
>>>>> ---
>>>>>  drivers/usb/host/xhci-pci.c | 6 ++++++
>>>>>  1 file changed, 6 insertions(+)
>>>>>
>>>>> diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
>>>>> index c1f60da541..5c17ea6932 100644
>>>>> --- a/drivers/usb/host/xhci-pci.c
>>>>> +++ b/drivers/usb/host/xhci-pci.c
>>>>> @@ -11,6 +11,8 @@
>>>>>  #include <usb.h>
>>>>>  #include <usb/xhci.h>
>>>>>  
>>>>> +#include <asm/arch/msg.h>
>>>>> +
>>>>>  static void xhci_pci_init(struct udevice *dev, struct xhci_hccr
>>>>> **ret_hccr,
>>>>>  			  struct xhci_hcor **ret_hcor)
>>>>>  {
>>>>> @@ -18,6 +20,10 @@ static void xhci_pci_init(struct udevice *dev, struct
>>>>> xhci_hccr **ret_hccr,
>>>>>  	struct xhci_hcor *hcor;
>>>>>  	u32 cmd;
>>>>>  
>>>>> +#ifdef CONFIG_BCM2711
>>>>> +	bcm2711_load_vl805_firmware();
>>>>> +#endif
>>>>> +
>>>>>  	hccr = (struct xhci_hccr *)dm_pci_map_bar(dev,
>>>>>  			PCI_BASE_ADDRESS_0, PCI_REGION_MEM);
>>>>>  	hcor = (struct xhci_hcor *)((uintptr_t) hccr +
>>>>
>>>> I think socfpga arria10 has some firmware loader implementation that is
>>>> generic, so can't we use that ?
>>>
>>> I don't think so. I've been told the firmware upgrade protocol is private
>>> and
>>> specific to the VL80X family of devices. The Raspberry Pi foundation decided
>>> to
>>> implement it in their closed source VideoCore firmware.
>>
>> What I meant was that U-Boot has a way to load files from various
>> storage roughly the same way Linux firmware loader API does.
> 
> As far as generic APIs are concerned I've had a look at
> request_firmware_into_buf() which socfpga uses in its spl_board_init(). But
> sadly it doesn't help here.
> 
> What bcm2711_load_vl805_firmware() does here is just informing the co-processor
> that it's free to start the VL805 firmware load operation. I'm by no means
> providing anything, think of it as a doorbell if you will. I'll try to find an
> alternative to 'load' in the function name so the distinction with regular
> firmware loading is more explicit.

Oh, that's how it is, I see.

> Also bare in mind we have to time this operation in between PCIe configuration
> and xHCI init. Which, IIUC, blocks us from using board_init() and the likes of
> it (which would be way nicer IMO).

Maybe you need some callback there ?
Nicolas Saenz Julienne April 29, 2020, 1:04 p.m. UTC | #10
On Wed, 2020-04-29 at 14:37 +0200, Marek Vasut wrote:
> On 4/29/20 2:36 PM, Nicolas Saenz Julienne wrote:
> > On Wed, 2020-04-29 at 14:05 +0200, Marek Vasut wrote:
> > > On 4/29/20 12:10 PM, Nicolas Saenz Julienne wrote:
> > > > On Tue, 2020-04-28 at 19:59 +0200, Marek Vasut wrote:
> > > > > On 4/28/20 7:44 PM, Nicolas Saenz Julienne wrote:
> > > > > > When needed, RPi4's co-processor (called VideoCore) has to be
> > > > > > instructed
> > > > > > to load VL805's firmware (the chip providing xHCI support).
> > > > > > VideCore's
> > > > > > firmware expects the board's PCIe bus to be already configured in
> > > > > > order
> > > > > > for it to load the xHCI chip firmware. So we have to make sure this
> > > > > > happens in between the PCIe configuration and xHCI startup.
> > > > > > 
> > > > > > Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne at suse.de>
> > > > > > ---
> > > > > >  drivers/usb/host/xhci-pci.c | 6 ++++++
> > > > > >  1 file changed, 6 insertions(+)
> > > > > > 
> > > > > > diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-
> > > > > > pci.c
> > > > > > index c1f60da541..5c17ea6932 100644
> > > > > > --- a/drivers/usb/host/xhci-pci.c
> > > > > > +++ b/drivers/usb/host/xhci-pci.c
> > > > > > @@ -11,6 +11,8 @@
> > > > > >  #include <usb.h>
> > > > > >  #include <usb/xhci.h>
> > > > > >  
> > > > > > +#include <asm/arch/msg.h>
> > > > > > +
> > > > > >  static void xhci_pci_init(struct udevice *dev, struct xhci_hccr
> > > > > > **ret_hccr,
> > > > > >  			  struct xhci_hcor **ret_hcor)
> > > > > >  {
> > > > > > @@ -18,6 +20,10 @@ static void xhci_pci_init(struct udevice *dev,
> > > > > > struct
> > > > > > xhci_hccr **ret_hccr,
> > > > > >  	struct xhci_hcor *hcor;
> > > > > >  	u32 cmd;
> > > > > >  
> > > > > > +#ifdef CONFIG_BCM2711
> > > > > > +	bcm2711_load_vl805_firmware();
> > > > > > +#endif
> > > > > > +
> > > > > >  	hccr = (struct xhci_hccr *)dm_pci_map_bar(dev,
> > > > > >  			PCI_BASE_ADDRESS_0, PCI_REGION_MEM);
> > > > > >  	hcor = (struct xhci_hcor *)((uintptr_t) hccr +
> > > > > 
> > > > > I think socfpga arria10 has some firmware loader implementation that
> > > > > is
> > > > > generic, so can't we use that ?
> > > > 
> > > > I don't think so. I've been told the firmware upgrade protocol is
> > > > private
> > > > and
> > > > specific to the VL80X family of devices. The Raspberry Pi foundation
> > > > decided
> > > > to
> > > > implement it in their closed source VideoCore firmware.
> > > 
> > > What I meant was that U-Boot has a way to load files from various
> > > storage roughly the same way Linux firmware loader API does.
> > 
> > As far as generic APIs are concerned I've had a look at
> > request_firmware_into_buf() which socfpga uses in its spl_board_init(). But
> > sadly it doesn't help here.
> > 
> > What bcm2711_load_vl805_firmware() does here is just informing the co-
> > processor
> > that it's free to start the VL805 firmware load operation. I'm by no means
> > providing anything, think of it as a doorbell if you will. I'll try to find
> > an
> > alternative to 'load' in the function name so the distinction with regular
> > firmware loading is more explicit.
> 
> Oh, that's how it is, I see.
> 
> > Also bare in mind we have to time this operation in between PCIe
> > configuration
> > and xHCI init. Which, IIUC, blocks us from using board_init() and the likes
> > of
> > it (which would be way nicer IMO).
> 
> Maybe you need some callback there ?

Indeed, in Linux I'm using PCI fixups. I guess I could create a similar
concept, albeit simpler, that calls board specific code for fixups after
scanning and detecting PCI devices. Or even simpler if we do it after PCI bus
probes.

I'll look into it.

Regards,
Nicolas

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: This is a digitally signed message part
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200429/0c87afbe/attachment.sig>
diff mbox series

Patch

diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
index c1f60da541..5c17ea6932 100644
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -11,6 +11,8 @@ 
 #include <usb.h>
 #include <usb/xhci.h>
 
+#include <asm/arch/msg.h>
+
 static void xhci_pci_init(struct udevice *dev, struct xhci_hccr **ret_hccr,
 			  struct xhci_hcor **ret_hcor)
 {
@@ -18,6 +20,10 @@  static void xhci_pci_init(struct udevice *dev, struct xhci_hccr **ret_hccr,
 	struct xhci_hcor *hcor;
 	u32 cmd;
 
+#ifdef CONFIG_BCM2711
+	bcm2711_load_vl805_firmware();
+#endif
+
 	hccr = (struct xhci_hccr *)dm_pci_map_bar(dev,
 			PCI_BASE_ADDRESS_0, PCI_REGION_MEM);
 	hcor = (struct xhci_hcor *)((uintptr_t) hccr +