drkaiser: Refactor singleton states into reentrant pattern

Move global singleton states into a struct and store within
the par_master data field for the life-time of the driver.

This is one of the steps on the way to move par_master data
memory management behind the initialisation API, for more
context see other patches under the same topic "register_master_api".

Implements: https://ticket.coreboot.org/issues/391

BUG=b:185191942
TEST=builds

Change-Id: I3dd35eceadb9dbca8e526705b7be977564ed7318
Signed-off-by: Alexander Goncharov <chat@joursoir.net>
Signed-off-by: Anastasia Klimchuk <aklm@chromium.org>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/65194
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>

1 files changed, 29 insertions, 7 deletions

diff --git a/drkaiser.c b/drkaiser.c
index 2790555e..b497d80c 100644
--- a/drkaiser.c
+++ b/drkaiser.c
@@ -30,24 +30,36 @@
 /* Mask to restrict flash accesses to the 128kB memory window. */
 #define DRKAISER_MEMMAP_MASK		((1 << 17) - 1)
 
+struct drkaiser_data {
+	uint8_t *drkaiser_bar;
+};
+
 static const struct dev_entry drkaiser_pcidev[] = {
 	{0x1803, 0x5057, OK, "Dr. Kaiser", "PC-Waechter (Actel FPGA)"},
 
 	{0},
 };
 
-static uint8_t *drkaiser_bar;
-
 static void drkaiser_chip_writeb(const struct flashctx *flash, uint8_t val,
 				 chipaddr addr)
 {
-	pci_mmio_writeb(val, drkaiser_bar + (addr & DRKAISER_MEMMAP_MASK));
+	struct drkaiser_data *data = flash->mst->par.data;
+
+	pci_mmio_writeb(val, data->drkaiser_bar + (addr & DRKAISER_MEMMAP_MASK));
 }
 
 static uint8_t drkaiser_chip_readb(const struct flashctx *flash,
 				   const chipaddr addr)
 {
-	return pci_mmio_readb(drkaiser_bar + (addr & DRKAISER_MEMMAP_MASK));
+	struct drkaiser_data *data = flash->mst->par.data;
+
+	return pci_mmio_readb(data->drkaiser_bar + (addr & DRKAISER_MEMMAP_MASK));
+}
+
+static int drkaiser_shutdown(void *par_data)
+{
+	free(par_data);
+	return 0;
 }
 
 static const struct par_master par_master_drkaiser = {
@@ -59,12 +71,14 @@ static const struct par_master par_master_drkaiser = {
 	.chip_writew	= fallback_chip_writew,
 	.chip_writel	= fallback_chip_writel,
 	.chip_writen	= fallback_chip_writen,
+	.shutdown	= drkaiser_shutdown,
 };
 
 static int drkaiser_init(void)
 {
 	struct pci_dev *dev = NULL;
 	uint32_t addr;
+	uint8_t *bar;
 
 	dev = pcidev_init(drkaiser_pcidev, PCI_BASE_ADDRESS_2);
 	if (!dev)
@@ -78,12 +92,20 @@ static int drkaiser_init(void)
 	rpci_write_word(dev, PCI_MAGIC_DRKAISER_ADDR, PCI_MAGIC_DRKAISER_VALUE);
 
 	/* Map 128kB flash memory window. */
-	drkaiser_bar = rphysmap("Dr. Kaiser PC-Waechter flash memory", addr, DRKAISER_MEMMAP_SIZE);
-	if (drkaiser_bar == ERROR_PTR)
+	bar = rphysmap("Dr. Kaiser PC-Waechter flash memory", addr, DRKAISER_MEMMAP_SIZE);
+	if (bar == ERROR_PTR)
 		return 1;
 
+	struct drkaiser_data *data = calloc(1, sizeof(*data));
+	if (!data) {
+		msg_perr("Unable to allocate space for PAR master data\n");
+		return 1;
+	}
+	data->drkaiser_bar = bar;
+
 	max_rom_decode.parallel = 128 * 1024;
-	return register_par_master(&par_master_drkaiser, BUS_PARALLEL, NULL);
+
+	return register_par_master(&par_master_drkaiser, BUS_PARALLEL, data);
 }
 
 const struct programmer_entry programmer_drkaiser = {