From nobody Tue Feb 10 05:45:43 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) client-ip=209.85.128.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1625233031; cv=none; d=zohomail.com; s=zohoarc; b=lo7ZKgy5S6DsBODTmV1F/Ht9wBYK6Yjrj71NqI6zl/t7gvyquGkhbpQBjOgUCM2p06a4a7xaAsXUleNaMR1rP1dGdfcumGHs8+bFIkt0zjfCpqo97YVtDlCpdsk3Zqk1xiqBfc4QtbQpPL1ruwHmhW49gT2RA7+q0QBFjOSlfqw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1625233031; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=mP6GfEEKKXaBd1tf8TIMMHcK8n5QD1fCIHiJmE/WS14=; b=Ene7IaybfjAoSM1S9s8nBSBO9QZDnxX4GkncJzkzXiDDO7KUFMo0xGfsn8m0aNVbltYtyGe33knSlTUnhFdr6PwEGIWEk3IaCDnqODN0EtBtq4weydEn/limv3obGEd3dXaKaOQYcTV7VfGeqqgEjlWWs43u7vxpKz6oP5efdew= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mx.zohomail.com with SMTPS id 1625233031446855.8003937643872; Fri, 2 Jul 2021 06:37:11 -0700 (PDT) Received: by mail-wm1-f45.google.com with SMTP id b14-20020a1c1b0e0000b02901fc3a62af78so2543019wmb.3 for ; Fri, 02 Jul 2021 06:37:10 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.Ascou-CH1 (pop.92-184-108-23.mobile.abo.orange.fr. [92.184.108.23]) by smtp.gmail.com with ESMTPSA id 204sm3353242wma.30.2021.07.02.06.37.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Jul 2021 06:37:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mP6GfEEKKXaBd1tf8TIMMHcK8n5QD1fCIHiJmE/WS14=; b=ViY3nhI6gmCOFWVmlnuH+/UzDULmVfCuImnZd7Q14XbdTPiAEPvvkg1nnobBh1qA6n hYaHwWC5Ez97331EPIHwSqL/ZhtiCUEM1X3YECy48Mga/auki5S97ZR4Tn6litaynEL2 8TH0TXzSmK0cRbbogO0rPANb6jan1wTiUf414/pKg7M6dt94Iod13CH2sR7UXHblkpaG uesewqFMgUCgxr8eXE+8wgx6UPLgaJWQ8ep6qBCmZqugCpfNM4XPmxDKjUl486t0dPTO iTBcpG1piaNIoEjcZ991q7JQDEXdfStB8mjTxe1CCq2TNOAYG2xJYpykMxk7knbuImJt jUNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=mP6GfEEKKXaBd1tf8TIMMHcK8n5QD1fCIHiJmE/WS14=; b=rMhtp+LtIhIdmBqicmw9p8CJeb/7TeZqyHjyX2NVlYnAgjbo3ioycafm+iFS/VA+hd N5RlTgh3IoDu8RrvRHENcNBDOs48NXnF9CSB2WmNMsJ/J++kpE8RrjCmFSX9PblTTg/z SdmJX3hLG0pQcSH0qjJ8gi68fVqdhx2Wn61/+zyA9aVPAlVfSp01+ouMiuSBQbaYgPQx AiMy0J4TLcKIG08qyCdCwC07S/y3T8SfymFbrn+Rl4/tny59bGSvkwzK2Yx61I2VNiAQ 991MZhf+rpS6H/C/QMlGf1+UlVA73m7xBIeMs8MB5a7ElibQWa11cv9XqiYdu0pvDUZo zjFg== X-Gm-Message-State: AOAM533EHciqlCWFDPvFhOpEVhOaDujqeqpIoWZdnLK7OXiBt/uZNg+j Cp8sYWNiVnh/F8wVMp2+yH8= X-Google-Smtp-Source: ABdhPJzbv1kB3Yq7JKnSuetxw1I8iMndxrSmXsnsj4Tim8X3eOIe9C5gzqq0FTHXrnc1Q0zOWUDWjQ== X-Received: by 2002:a05:600c:14c6:: with SMTP id i6mr4491759wmh.169.1625233029634; Fri, 02 Jul 2021 06:37:09 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Mark Cave-Ayland , Finn Thain , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 12/18] hw/mips/jazz: move PROM and checksum calculation from dp8393x device to board Date: Fri, 2 Jul 2021 15:35:51 +0200 Message-Id: <20210702133557.60317-13-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210702133557.60317-1-f4bug@amsat.org> References: <20210702133557.60317-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1625233032390100001 From: Mark Cave-Ayland This is in preparation for each board to have its own separate bit storage format and checksum for storing the MAC address. Signed-off-by: Mark Cave-Ayland Tested-by: Finn Thain Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20210625065401.30170-4-mark.cave-ayland@ilande.co.uk> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/mips/jazz.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c index 1e1cf8154e7..89ca8bb9107 100644 --- a/hw/mips/jazz.c +++ b/hw/mips/jazz.c @@ -119,6 +119,8 @@ static const MemoryRegionOps dma_dummy_ops =3D { #define MAGNUM_BIOS_SIZE = \ (BIOS_SIZE < MAGNUM_BIOS_SIZE_MAX ? BIOS_SIZE : MAGNUM_BIOS_SIZE_M= AX) =20 +#define SONIC_PROM_SIZE 0x1000 + static void mips_jazz_init(MachineState *machine, enum jazz_model_e jazz_model) { @@ -137,6 +139,7 @@ static void mips_jazz_init(MachineState *machine, MemoryRegion *rtc =3D g_new(MemoryRegion, 1); MemoryRegion *i8042 =3D g_new(MemoryRegion, 1); MemoryRegion *dma_dummy =3D g_new(MemoryRegion, 1); + MemoryRegion *dp8393x_prom =3D g_new(MemoryRegion, 1); NICInfo *nd; DeviceState *dev, *rc4030; SysBusDevice *sysbus; @@ -228,6 +231,10 @@ static void mips_jazz_init(MachineState *machine, NULL, "dummy_dma", 0x1000); memory_region_add_subregion(address_space, 0x8000d000, dma_dummy); =20 + memory_region_init_rom(dp8393x_prom, NULL, "dp8393x-jazz.prom", + SONIC_PROM_SIZE, &error_fatal); + memory_region_add_subregion(address_space, 0x8000b000, dp8393x_prom); + /* ISA bus: IO space at 0x90000000, mem space at 0x91000000 */ memory_region_init(isa_io, NULL, "isa-io", 0x00010000); memory_region_init(isa_mem, NULL, "isa-mem", 0x01000000); @@ -275,6 +282,9 @@ static void mips_jazz_init(MachineState *machine, nd->model =3D g_strdup("dp83932"); } if (strcmp(nd->model, "dp83932") =3D=3D 0) { + int checksum, i; + uint8_t *prom; + qemu_check_nic_model(nd, "dp83932"); =20 dev =3D qdev_new("dp8393x"); @@ -285,8 +295,19 @@ static void mips_jazz_init(MachineState *machine, sysbus =3D SYS_BUS_DEVICE(dev); sysbus_realize_and_unref(sysbus, &error_fatal); sysbus_mmio_map(sysbus, 0, 0x80001000); - sysbus_mmio_map(sysbus, 1, 0x8000b000); sysbus_connect_irq(sysbus, 0, qdev_get_gpio_in(rc4030, 4)); + + /* Add MAC address with valid checksum to PROM */ + prom =3D memory_region_get_ram_ptr(dp8393x_prom); + checksum =3D 0; + for (i =3D 0; i < 6; i++) { + prom[i] =3D nd->macaddr.a[i]; + checksum +=3D prom[i]; + if (checksum > 0xff) { + checksum =3D (checksum + 1) & 0xff; + } + } + prom[7] =3D 0xff - checksum; break; } else if (is_help_option(nd->model)) { error_report("Supported NICs: dp83932"); --=20 2.31.1