[PULL,29/63] hw/pci: Do not add ROM BAR for SR-IOV VF

Commit Message

Michael S. Tsirkin July 22, 2024, 12:17 a.m. UTC

From: Akihiko Odaki <[e-mail]>

A SR-IOV VF cannot have a ROM BAR.

Co-developed-by: Yui Washizu <[e-mail]>
Signed-off-by: Akihiko Odaki <[e-mail]>
Message-Id: <[e-mail]>
Reviewed-by: Michael S. Tsirkin <[e-mail]>
Signed-off-by: Michael S. Tsirkin <[e-mail]>
---
 hw/pci/pci.c | 8 ++++++++
 1 file changed, 8 insertions(+)

Comments

Akihiko Odaki July 22, 2024, 2:21 p.m. UTC | #1

On 2024/07/22 9:17, Michael S. Tsirkin wrote:
> From: Akihiko Odaki <[e-mail]>
> 
> A SR-IOV VF cannot have a ROM BAR.
> 
> Co-developed-by: Yui Washizu <[e-mail]>
> Signed-off-by: Akihiko Odaki <[e-mail]>
> Message-Id: <[e-mail]>
> Reviewed-by: Michael S. Tsirkin <[e-mail]>
> Signed-off-by: Michael S. Tsirkin <[e-mail]>
> ---
>   hw/pci/pci.c | 8 ++++++++
>   1 file changed, 8 insertions(+)
> 
> diff --git a/hw/pci/pci.c b/hw/pci/pci.c
> index 4c7be52951..bd956637bc 100644
> --- a/hw/pci/pci.c
> +++ b/hw/pci/pci.c
> @@ -2359,6 +2359,14 @@ static void pci_add_option_rom(PCIDevice *pdev, bool is_default_rom,
>           return;
>       }
>   
> +    if (pci_is_vf(pdev)) {
> +        if (pdev->rom_bar == ON_OFF_AUTO_ON) {

This requires:
https://lore.kernel.org/r/[e-mail]
("[PATCH v2 0/4] hw/pci: Convert rom_bar into OnOffAuto")

However it does not seem included in this pull request.

Regards,
Akihiko Odaki

Michael S. Tsirkin July 23, 2024, 12:15 a.m. UTC | #2

On Mon, Jul 22, 2024 at 11:21:13PM +0900, Akihiko Odaki wrote:
> On 2024/07/22 9:17, Michael S. Tsirkin wrote:
> > From: Akihiko Odaki <[e-mail]>
> > 
> > A SR-IOV VF cannot have a ROM BAR.
> > 
> > Co-developed-by: Yui Washizu <[e-mail]>
> > Signed-off-by: Akihiko Odaki <[e-mail]>
> > Message-Id: <[e-mail]>
> > Reviewed-by: Michael S. Tsirkin <[e-mail]>
> > Signed-off-by: Michael S. Tsirkin <[e-mail]>
> > ---
> >   hw/pci/pci.c | 8 ++++++++
> >   1 file changed, 8 insertions(+)
> > 
> > diff --git a/hw/pci/pci.c b/hw/pci/pci.c
> > index 4c7be52951..bd956637bc 100644
> > --- a/hw/pci/pci.c
> > +++ b/hw/pci/pci.c
> > @@ -2359,6 +2359,14 @@ static void pci_add_option_rom(PCIDevice *pdev, bool is_default_rom,
> >           return;
> >       }
> > +    if (pci_is_vf(pdev)) {
> > +        if (pdev->rom_bar == ON_OFF_AUTO_ON) {
> 
> This requires:
> https://lore.kernel.org/r/[e-mail]
> ("[PATCH v2 0/4] hw/pci: Convert rom_bar into OnOffAuto")
> 
> However it does not seem included in this pull request.
> 
> Regards,
> Akihiko Odaki


good point, dropped for now.

Patch

diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 4c7be52951..bd956637bc 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -2359,6 +2359,14 @@  static void pci_add_option_rom(PCIDevice *pdev, bool is_default_rom,
         return;
     }
 
+    if (pci_is_vf(pdev)) {
+        if (pdev->rom_bar == ON_OFF_AUTO_ON) {
+            error_setg(errp, "ROM BAR cannot be enabled for SR-IOV VF");
+        }
+
+        return;
+    }
+
     if (load_file || pdev->romsize == UINT32_MAX) {
         path = qemu_find_file(QEMU_FILE_TYPE_BIOS, pdev->romfile);
         if (path == NULL) {