From nobody Tue Feb 10 17:35:03 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) client-ip=209.85.128.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1625233037; cv=none; d=zohomail.com; s=zohoarc; b=cSY6vAe28Tn2TRq+JJEiJ9Sj/qy6iA+XkfM1qTr9ZJfcHMPIW4BXUpNtzqYaEZZeqtHw6YWQbxxZluDAU43R1wcTStLQhKqGk6EpQ2urGThqrNUGIgMOZLiu5a0nGscljFBlPsjfCFDAqHsOjsQcfDGX9YA9BDyuDy+ViRY6Oas= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1625233037; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hM5jFlzSYXmgSnw6kDffxFRxISxlO+HVFgqFqsltpDQ=; b=l6JbFmbpyIhv0r/lZRex7Ubv7DToOwWGc6OZtIhC7ZpDxXQGiBFo0fzbqYrzbjdAI+ZqMifMVZz/n2giEBA7W04FIwm8fveZHmu5B7YbEY49LBNRSaiOTySVzZUsF0wh3YYG61lvkfjDC1oGLeK1tzI1oeAh9PK6BNfP42Q6dOQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mx.zohomail.com with SMTPS id 1625233037980968.702869480237; Fri, 2 Jul 2021 06:37:17 -0700 (PDT) Received: by mail-wm1-f46.google.com with SMTP id b14-20020a1c1b0e0000b02901fc3a62af78so2543257wmb.3 for ; Fri, 02 Jul 2021 06:37:17 -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 z8sm3757939wrw.18.2021.07.02.06.37.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Jul 2021 06:37:15 -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=hM5jFlzSYXmgSnw6kDffxFRxISxlO+HVFgqFqsltpDQ=; b=cSSDa3oV+PY0+J8L2l2wGPTpdpORwDur2Xp9tzxHg4DoMgOnZNQAazXFibMwxEhGu2 Y8BQNDgnDsOwsczO0b2gUlsNU/FuGODTg1hCmVX4VUsZRyQjTnpxlCjZKhd1sov20G3h WM7qPMa/6pMA3dM/vrfT4biQBOZIzj/G0/fDjyVxR3IeM+FRnUjeYvmYN9Y//U3ULnAv 3shLyFeO2hmFwkSREQS/BbLCLwNrOVA4yQABNbaKDBtA7zkU/tOExx6oF5GTTeN0Gwgu k/cnr/hBIjFj820LZwjfG6ydruLyQc8aRlm9M6ESd6Xe5r9nAv+4MoHoR4g8rDdgPxpE bHbg== 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=hM5jFlzSYXmgSnw6kDffxFRxISxlO+HVFgqFqsltpDQ=; b=Tp863s72h2kOPbwT3723M6xATyLlsnrrWB+vEXyOmidrDdEif1tMewkH4rZsXNiLd5 FvtMjx9/2Yp6dWQJHNtA1ACgI9rIFkawuIuHD8803XD8sQEXy+sixS6dZ7dcw9zeum1w 7AH2J15QdOZ9FJ10lZ7K+yc8JLCw8seQ0ukViLdzkeyjdVjp7sYKvoliej3/8Sd+Pe8Z rZyp7byXfBJ86PrDlAnKljjCQcxzbrUhrICoBxhIk2xxtV00M6s3ejgAm0OyWn60ACOD QBgXWN7ZU+Nmy7KWULIntnUX1KkRr6SDV/EBiF3u8j6E9EBLRT+pfqe/H7QdjGpIDSTX N30A== X-Gm-Message-State: AOAM533zCb50ERWjRZlYiNuFXUw0c8dxV1vRrQ88wA00prHv5WZ6PYhb 37UdAcm7EZub6GBVSJntLcs= X-Google-Smtp-Source: ABdhPJxEh0epQX1hiViElOcLV+9aiVzEKSyFo71kY8PhdieWv6izyPh1J+wFZmfxndg5hVy4nyJo8g== X-Received: by 2002:a05:600c:4f8a:: with SMTP id n10mr16285008wmq.11.1625233036229; Fri, 02 Jul 2021 06:37:16 -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 13/18] hw/m68k/q800: move PROM and checksum calculation from dp8393x device to board Date: Fri, 2 Jul 2021 15:35:52 +0200 Message-Id: <20210702133557.60317-14-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: 1625233038927100001 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-5-mark.cave-ayland@ilande.co.uk> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/m68k/q800.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c index 11376daa858..491f283a17a 100644 --- a/hw/m68k/q800.c +++ b/hw/m68k/q800.c @@ -70,6 +70,8 @@ #define NUBUS_SUPER_SLOT_BASE 0x60000000 #define NUBUS_SLOT_BASE 0xf0000000 =20 +#define SONIC_PROM_SIZE 0x1000 + /* * the video base, whereas it a Nubus address, * is needed by the kernel to have early display and @@ -211,8 +213,10 @@ static void q800_init(MachineState *machine) int32_t initrd_size; MemoryRegion *rom; MemoryRegion *io; + MemoryRegion *dp8393x_prom =3D g_new(MemoryRegion, 1); + uint8_t *prom; const int io_slice_nb =3D (IO_SIZE / IO_SLICE) - 1; - int i; + int i, checksum; ram_addr_t ram_size =3D machine->ram_size; const char *kernel_filename =3D machine->kernel_filename; const char *initrd_filename =3D machine->initrd_filename; @@ -319,9 +323,25 @@ static void q800_init(MachineState *machine) sysbus =3D SYS_BUS_DEVICE(dev); sysbus_realize_and_unref(sysbus, &error_fatal); sysbus_mmio_map(sysbus, 0, SONIC_BASE); - sysbus_mmio_map(sysbus, 1, SONIC_PROM_BASE); sysbus_connect_irq(sysbus, 0, qdev_get_gpio_in(glue, 2)); =20 + memory_region_init_rom(dp8393x_prom, NULL, "dp8393x-q800.prom", + SONIC_PROM_SIZE, &error_fatal); + memory_region_add_subregion(get_system_memory(), SONIC_PROM_BASE, + dp8393x_prom); + + /* 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_table[0].macaddr.a[i]; + checksum +=3D prom[i]; + if (checksum > 0xff) { + checksum =3D (checksum + 1) & 0xff; + } + } + prom[7] =3D 0xff - checksum; + /* SCC */ =20 dev =3D qdev_new(TYPE_ESCC); --=20 2.31.1