[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 05/10] dp8393x: remove onboard PROM containing MAC address and
From: |
Mark Cave-Ayland |
Subject: |
[PATCH v2 05/10] dp8393x: remove onboard PROM containing MAC address and checksum |
Date: |
Fri, 25 Jun 2021 07:53:56 +0100 |
According to the datasheet the dp8393x chipset does not contain any NVRAM
capable
of storing a MAC address or checksum. Now that both the MIPS jazz and m68k q800
boards generate the PROM region and checksum themselves, remove the generated
PROM from the dp8393x device itself.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
hw/net/dp8393x.c | 24 ------------------------
1 file changed, 24 deletions(-)
diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c
index ea5b22f680..252c0a2664 100644
--- a/hw/net/dp8393x.c
+++ b/hw/net/dp8393x.c
@@ -30,8 +30,6 @@
#include "qom/object.h"
#include "trace.h"
-#define SONIC_PROM_SIZE 0x1000
-
static const char *reg_names[] = {
"CR", "DCR", "RCR", "TCR", "IMR", "ISR", "UTDA", "CTDA",
"TPS", "TFC", "TSA0", "TSA1", "TFS", "URDA", "CRDA", "CRBA0",
@@ -157,7 +155,6 @@ struct dp8393xState {
NICConf conf;
NICState *nic;
MemoryRegion mmio;
- MemoryRegion prom;
/* Registers */
uint8_t cam[16][6];
@@ -966,16 +963,12 @@ static void dp8393x_instance_init(Object *obj)
dp8393xState *s = DP8393X(obj);
sysbus_init_mmio(sbd, &s->mmio);
- sysbus_init_mmio(sbd, &s->prom);
sysbus_init_irq(sbd, &s->irq);
}
static void dp8393x_realize(DeviceState *dev, Error **errp)
{
dp8393xState *s = DP8393X(dev);
- int i, checksum;
- uint8_t *prom;
- Error *local_err = NULL;
address_space_init(&s->as, s->dma_mr, "dp8393x");
memory_region_init_io(&s->mmio, OBJECT(dev), &dp8393x_ops, s,
@@ -986,23 +979,6 @@ static void dp8393x_realize(DeviceState *dev, Error **errp)
qemu_format_nic_info_str(qemu_get_queue(s->nic), s->conf.macaddr.a);
s->watchdog = timer_new_ns(QEMU_CLOCK_VIRTUAL, dp8393x_watchdog, s);
-
- memory_region_init_rom(&s->prom, OBJECT(dev), "dp8393x-prom",
- SONIC_PROM_SIZE, &local_err);
- if (local_err) {
- error_propagate(errp, local_err);
- return;
- }
- prom = memory_region_get_ram_ptr(&s->prom);
- checksum = 0;
- for (i = 0; i < 6; i++) {
- prom[i] = s->conf.macaddr.a[i];
- checksum += prom[i];
- if (checksum > 0xff) {
- checksum = (checksum + 1) & 0xff;
- }
- }
- prom[7] = 0xff - checksum;
}
static const VMStateDescription vmstate_dp8393x = {
--
2.20.1
- [PATCH v2 00/10] dp8393x: fixes for MacOS toolbox ROM, Mark Cave-Ayland, 2021/06/25
- [PATCH v2 03/10] hw/mips/jazz: move PROM and checksum calculation from dp8393x device to board, Mark Cave-Ayland, 2021/06/25
- [PATCH v2 02/10] dp8393x: convert to trace-events, Mark Cave-Ayland, 2021/06/25
- [PATCH v2 04/10] hw/m68k/q800: move PROM and checksum calculation from dp8393x device to board, Mark Cave-Ayland, 2021/06/25
- [PATCH v2 06/10] qemu/bitops.h: add bitrev8 implementation, Mark Cave-Ayland, 2021/06/25
- [PATCH v2 01/10] dp8393x: checkpatch fixes, Mark Cave-Ayland, 2021/06/25
- [PATCH v2 05/10] dp8393x: remove onboard PROM containing MAC address and checksum,
Mark Cave-Ayland <=
- [PATCH v2 09/10] dp8393x: fix CAM descriptor entry index, Mark Cave-Ayland, 2021/06/25
- [PATCH v2 07/10] hw/m68k/q800: fix PROM checksum and MAC address storage, Mark Cave-Ayland, 2021/06/25
- [PATCH v2 08/10] dp8393x: don't force 32-bit register access, Mark Cave-Ayland, 2021/06/25
- [PATCH v2 10/10] hw/mips/jazz: specify correct endian for dp8393x device, Mark Cave-Ayland, 2021/06/25
- Re: [PATCH v2 00/10] dp8393x: fixes for MacOS toolbox ROM, Finn Thain, 2021/06/26