[flashrom-gerrit] Change in flashrom[staging]: Move register decodes into enable_flash_ich_handle_gcs()

[Nico Huber (Code Review)]

Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/18882 )

Change subject: Move register decodes into enable_flash_ich_handle_gcs()
......................................................................

Move register decodes into enable_flash_ich_handle_gcs()

GCS was decoded partly inside, partly outside this function. The
decoding of `top_swap` was off, since passing a `uint8_t` as `bool`
doesn't magically check bit0 only.

While we are at it, rename this void function to enable_flash_ich_
report_gcs() as it's not doing anything. Beside debug output it
doesn't have any side effects.

Change-Id: I40addec98cb6840763adad30f9d0e27dadce6d1e
Signed-off-by: Nico Huber 
Reviewed-on: https://review.coreboot.org/18882
Tested-by: build bot (Jenkins)
Reviewed-by: Philippe Mathieu-Daudé 
Reviewed-by: Arthur Heymans 
Reviewed-by: Youness Alaoui 
---
M chipset_enable.c
1 file changed, 18 insertions(+), 4 deletions(-)

Approvals:
  Philippe Mathieu-Daudé: Looks good to me, but someone else must approve
  Arthur Heymans: Looks good to me, approved
  Youness Alaoui: Looks good to me, but someone else must approve
  build bot (Jenkins): Verified

diff --git a/chipset_enable.c b/chipset_enable.c
index b181b93..1191a4c 100644
--- a/chipset_enable.c
+++ b/chipset_enable.c
@@ -584,8 +584,23 @@
    return enable_flash_ich_fwh(dev, CHIPSET_POULSBO, 0xd8);
 }

-static void enable_flash_ich_handle_gcs(struct pci_dev *dev, enum ich_chipset ich_generation, uint32_t gcs, bool top_swap)
+static void enable_flash_ich_report_gcs(struct pci_dev *const dev, const enum ich_chipset ich_generation,
+					const uint8_t *const rcrb)
 {
+	uint32_t gcs;
+	bool top_swap;
+
+	switch (ich_generation) {
+	case CHIPSET_BAYTRAIL:
+		gcs = mmio_readl(rcrb + 0);
+		top_swap = (gcs & 2) >> 1;
+		break;
+	default:
+		gcs = mmio_readl(rcrb + 0x3410);
+		top_swap = mmio_readb(rcrb + 0x3414) & 1;
+		break;
+	}
+
    msg_pdbg("GCS = 0x%x: ", gcs);
    msg_pdbg("BIOS Interface Lock-Down: %sabled, ", (gcs & 0x1) ? "en" : "dis");

@@ -673,7 +688,7 @@
    if (rcrb == ERROR_PTR)
    	return ERROR_FATAL;

-	enable_flash_ich_handle_gcs(dev, ich_generation, mmio_readl(rcrb + 0x3410), mmio_readb(rcrb + 0x3414));
+	enable_flash_ich_report_gcs(dev, ich_generation, rcrb);

/* Handle FWH-related parameters and initialization */
    int ret_fwh = enable_flash_ich_fwh(dev, ich_generation, bios_cntl);
@@ -803,8 +818,7 @@

/* Handle GCS (in RCRB) */
    void *rcrb = physmap("BYT RCRB", rcba, 4);
-	uint32_t gcs = mmio_readl(rcrb + 0);
-	enable_flash_ich_handle_gcs(dev, ich_generation, gcs, gcs & 0x2);
+	enable_flash_ich_report_gcs(dev, ich_generation, rcrb);
    physunmap(rcrb, 4);

/* Handle fwh_idsel parameter */