diff mbox

[2/2] sun4u: use sunhme as default on-board NIC

Message ID 1504879106-2225-3-git-send-email-mark.cave-ayland@ilande.co.uk (mailing list archive)
State New, archived
Headers show

Commit Message

Mark Cave-Ayland Sept. 8, 2017, 1:58 p.m. UTC 
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
 hw/sparc64/sun4u.c |   25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

Comments

Artyom Tarasenko Sept. 13, 2017, 12:54 p.m. UTC | #1 
On Fri, Sep 8, 2017 at 3:58 PM, Mark Cave-Ayland
<mark.cave-ayland@ilande.co.uk> wrote:
> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>

Reviewed-by: Artyom Tarasenko <atar4qemu@gmail.com>

> ---
>  hw/sparc64/sun4u.c |   25 +++++++++++++++++++++----
>  1 file changed, 21 insertions(+), 4 deletions(-)
>
> diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
> index 5e59269..c3280aa 100644
> --- a/hw/sparc64/sun4u.c
> +++ b/hw/sparc64/sun4u.c
> @@ -427,7 +427,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem,
>      unsigned int i;
>      uint64_t initrd_addr, initrd_size, kernel_addr, kernel_size, kernel_entry;
>      PCIBus *pci_bus, *pci_busA, *pci_busB;
> -    PCIDevice *ebus;
> +    PCIDevice *ebus, *pci_dev;
>      ISABus *isa_bus;
>      SysBusDevice *s;
>      qemu_irq *ivec_irqs, *pbm_irqs;
> @@ -435,6 +435,8 @@ static void sun4uv_init(MemoryRegion *address_space_mem,
>      DriveInfo *fd[MAX_FD];
>      DeviceState *dev;
>      FWCfgState *fw_cfg;
> +    NICInfo *nd;
> +    int onboard_nic_idx;
>
>      /* init CPUs */
>      cpu = sparc64_cpu_devinit(machine->cpu_model, hwdef->default_cpu_model,
> @@ -464,8 +466,23 @@ static void sun4uv_init(MemoryRegion *address_space_mem,
>      serial_hds_isa_init(isa_bus, i, MAX_SERIAL_PORTS);
>      parallel_hds_isa_init(isa_bus, MAX_PARALLEL_PORTS);
>
> -    for(i = 0; i < nb_nics; i++)
> -        pci_nic_init_nofail(&nd_table[i], pci_bus, "ne2k_pci", NULL);
> +    onboard_nic_idx = -1;
> +    for (i = 0; i < nb_nics; i++) {
> +        nd = &nd_table[i];
> +
> +        if (onboard_nic_idx == -1 &&
> +                (!nd->model || strcmp(nd->model, "sunhme") == 0)) {
> +            pci_dev = pci_create(pci_bus, -1, "sunhme");
> +            dev = &pci_dev->qdev;
> +            qdev_set_nic_properties(dev, nd);
> +            qdev_init_nofail(dev);
> +
> +            onboard_nic_idx = i;
> +        } else {
> +            pci_nic_init_nofail(nd, pci_bus, "ne2k_pci", NULL);
> +        }
> +    }
> +    onboard_nic_idx = MAX(onboard_nic_idx, 0);
>
>      ide_drive_get(hd, ARRAY_SIZE(hd));
>
> @@ -510,7 +527,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem,
>                             /* XXX: need an option to load a NVRAM image */
>                             0,
>                             graphic_width, graphic_height, graphic_depth,
> -                           (uint8_t *)&nd_table[0].macaddr);
> +                           (uint8_t *)&nd_table[onboard_nic_idx].macaddr);
>
>      dev = qdev_create(NULL, TYPE_FW_CFG_IO);
>      qdev_prop_set_bit(dev, "dma_enabled", false);
> --
> 1.7.10.4
>
Mark Cave-Ayland Sept. 21, 2017, 6:47 a.m. UTC | #2 
On 13/09/17 13:54, Artyom Tarasenko wrote:

> On Fri, Sep 8, 2017 at 3:58 PM, Mark Cave-Ayland
> <mark.cave-ayland@ilande.co.uk> wrote:
>> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> 
> Reviewed-by: Artyom Tarasenko <atar4qemu@gmail.com>

Applied to my qemu-sparc branch.


ATB,

Mark.
diff mbox

Patch

diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
index 5e59269..c3280aa 100644
--- a/hw/sparc64/sun4u.c
+++ b/hw/sparc64/sun4u.c
@@ -427,7 +427,7 @@  static void sun4uv_init(MemoryRegion *address_space_mem,
     unsigned int i;
     uint64_t initrd_addr, initrd_size, kernel_addr, kernel_size, kernel_entry;
     PCIBus *pci_bus, *pci_busA, *pci_busB;
-    PCIDevice *ebus;
+    PCIDevice *ebus, *pci_dev;
     ISABus *isa_bus;
     SysBusDevice *s;
     qemu_irq *ivec_irqs, *pbm_irqs;
@@ -435,6 +435,8 @@  static void sun4uv_init(MemoryRegion *address_space_mem,
     DriveInfo *fd[MAX_FD];
     DeviceState *dev;
     FWCfgState *fw_cfg;
+    NICInfo *nd;
+    int onboard_nic_idx;
 
     /* init CPUs */
     cpu = sparc64_cpu_devinit(machine->cpu_model, hwdef->default_cpu_model,
@@ -464,8 +466,23 @@  static void sun4uv_init(MemoryRegion *address_space_mem,
     serial_hds_isa_init(isa_bus, i, MAX_SERIAL_PORTS);
     parallel_hds_isa_init(isa_bus, MAX_PARALLEL_PORTS);
 
-    for(i = 0; i < nb_nics; i++)
-        pci_nic_init_nofail(&nd_table[i], pci_bus, "ne2k_pci", NULL);
+    onboard_nic_idx = -1;
+    for (i = 0; i < nb_nics; i++) {
+        nd = &nd_table[i];
+
+        if (onboard_nic_idx == -1 &&
+                (!nd->model || strcmp(nd->model, "sunhme") == 0)) {
+            pci_dev = pci_create(pci_bus, -1, "sunhme");
+            dev = &pci_dev->qdev;
+            qdev_set_nic_properties(dev, nd);
+            qdev_init_nofail(dev);
+
+            onboard_nic_idx = i;
+        } else {
+            pci_nic_init_nofail(nd, pci_bus, "ne2k_pci", NULL);
+        }
+    }
+    onboard_nic_idx = MAX(onboard_nic_idx, 0);
 
     ide_drive_get(hd, ARRAY_SIZE(hd));
 
@@ -510,7 +527,7 @@  static void sun4uv_init(MemoryRegion *address_space_mem,
                            /* XXX: need an option to load a NVRAM image */
                            0,
                            graphic_width, graphic_height, graphic_depth,
-                           (uint8_t *)&nd_table[0].macaddr);
+                           (uint8_t *)&nd_table[onboard_nic_idx].macaddr);
 
     dev = qdev_create(NULL, TYPE_FW_CFG_IO);
     qdev_prop_set_bit(dev, "dma_enabled", false);