[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 14/18] dp8393x: remove onboard PROM containing MAC address and che
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 14/18] dp8393x: remove onboard PROM containing MAC address and checksum |
Date: |
Fri, 2 Jul 2021 15:35:53 +0200 |
From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
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>
Tested-by: Finn Thain <fthain@linux-m68k.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20210625065401.30170-6-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/net/dp8393x.c | 24 ------------------------
1 file changed, 24 deletions(-)
diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c
index ea5b22f6802..252c0a26641 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.31.1
- [PULL 05/18] hw/pci-host/bonito: Trace PCI config accesses smaller than 32-bit, (continued)
- [PULL 05/18] hw/pci-host/bonito: Trace PCI config accesses smaller than 32-bit, Philippe Mathieu-Daudé, 2021/07/02
- [PULL 06/18] hw/pci-host/bonito: Allow PCI config accesses smaller than 32-bit, Philippe Mathieu-Daudé, 2021/07/02
- [PULL 07/18] tests/acceptance: Test Linux on the Fuloong 2E machine, Philippe Mathieu-Daudé, 2021/07/02
- [PULL 08/18] g364fb: use RAM memory region for framebuffer, Philippe Mathieu-Daudé, 2021/07/02
- [PULL 09/18] g364fb: add VMStateDescription for G364SysBusState, Philippe Mathieu-Daudé, 2021/07/02
- [PULL 10/18] dp8393x: checkpatch fixes, Philippe Mathieu-Daudé, 2021/07/02
- [PULL 11/18] dp8393x: convert to trace-events, Philippe Mathieu-Daudé, 2021/07/02
- [PULL 12/18] hw/mips/jazz: move PROM and checksum calculation from dp8393x device to board, Philippe Mathieu-Daudé, 2021/07/02
- [PULL 13/18] hw/m68k/q800: move PROM and checksum calculation from dp8393x device to board, Philippe Mathieu-Daudé, 2021/07/02
- [PULL 14/18] dp8393x: remove onboard PROM containing MAC address and checksum,
Philippe Mathieu-Daudé <=
- [PULL 15/18] qemu/bitops.h: add bitrev8 implementation, Philippe Mathieu-Daudé, 2021/07/02
- [PULL 16/18] hw/m68k/q800: fix PROM checksum and MAC address storage, Philippe Mathieu-Daudé, 2021/07/02
- [PULL 17/18] hw/mips/jazz: specify correct endian for dp8393x device, Philippe Mathieu-Daudé, 2021/07/02
- [PULL 18/18] hw/mips/jazz: Map the UART devices unconditionally, Philippe Mathieu-Daudé, 2021/07/02
- Re: [PULL 00/18] MIPS patches for 2021-07-02, Peter Maydell, 2021/07/04