sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

src/: Remove g_ prefixes and _g suffixes from variables

Browse Source 
These were often used to distinguish CAR_GLOBAL variables that weren't
directly usable. Since we're getting rid of this special case, also get
rid of the marker.

This change was created using coccinelle and the following script:
	@match@
	type T;
	identifier old =~ "^(g_.*|.*_g)$";
	@@
	old

	@script:python global_marker@
	old << match.old;
	new;
	@@
	new = old
	if old[0:2] == "g_":
	  new = new[2:]

	if new[-2:] == "_g":
	  new = new[:-2]

	coccinelle.new = new

	@@
	identifier match.old, global_marker.new;
	@@
	- old
	+ new

	@@
	type T;
	identifier match.old, global_marker.new;
	@@
	- T old;
	+ T new;

	@@
	type T;
	identifier match.old, global_marker.new;
	@@
	- T old
	+ T new
	 = ...;

There were some manual fixups: Some code still uses the global/local
variable naming scheme, so keep g_* there, and some variable names
weren't completely rewritten.

Change-Id: I4936ff9780a0d3ed9b8b539772bc48887f8d5eed
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37358
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>
This commit is contained in:
Patrick Georgi
2019-11-29 11:47:47 +01:00
parent ae64f22e8d
commit c9b13594eb
17 changed files with 301 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/drivers/i2c/tpm/cr50.c
View File

@@ -54,7 +54,7 @@ struct tpm_inf_dev {
uint8_t buf[CR50_MAX_BUFSIZE + sizeof(uint8_t)];
};
static struct tpm_inf_dev g_tpm_dev;
static struct tpm_inf_dev tpm_dev;
__weak int tis_plat_irq_status(void)
{
@@ -101,14 +101,14 @@ static int cr50_i2c_wait_tpm_ready(struct tpm_chip *chip)
static int cr50_i2c_read(struct tpm_chip *chip, uint8_t addr,
uint8_t *buffer, size_t len)
{
if (g_tpm_dev.addr == 0)
if (tpm_dev.addr == 0)
return -1;
/* Clear interrupt before starting transaction */
tis_plat_irq_status();
/* Send the register address byte to the TPM */
if (i2c_write_raw(g_tpm_dev.bus, g_tpm_dev.addr, &addr, 1)) {
if (i2c_write_raw(tpm_dev.bus, tpm_dev.addr, &addr, 1)) {
printk(BIOS_ERR, "%s: Address write failed\n", __func__);
return -1;
}
@@ -118,7 +118,7 @@ static int cr50_i2c_read(struct tpm_chip *chip, uint8_t addr,
return -1;
/* Read response data from the TPM */
if (i2c_read_raw(g_tpm_dev.bus, g_tpm_dev.addr, buffer, len)) {
if (i2c_read_raw(tpm_dev.bus, tpm_dev.addr, buffer, len)) {
printk(BIOS_ERR, "%s: Read response failed\n", __func__);
return -1;
}
@@ -143,20 +143,20 @@ static int cr50_i2c_read(struct tpm_chip *chip, uint8_t addr,
static int cr50_i2c_write(struct tpm_chip *chip,
uint8_t addr, uint8_t *buffer, size_t len)
{
if (g_tpm_dev.addr == 0)
if (tpm_dev.addr == 0)
return -1;
if (len > CR50_MAX_BUFSIZE)
return -1;
/* Prepend the 'register address' to the buffer */
g_tpm_dev.buf[0] = addr;
memcpy(g_tpm_dev.buf + 1, buffer, len);
tpm_dev.buf[0] = addr;
memcpy(tpm_dev.buf + 1, buffer, len);
/* Clear interrupt before starting transaction */
tis_plat_irq_status();
/* Send write request buffer with address */
if (i2c_write_raw(g_tpm_dev.bus, g_tpm_dev.addr, g_tpm_dev.buf, len + 1)) {
if (i2c_write_raw(tpm_dev.bus, tpm_dev.addr, tpm_dev.buf, len + 1)) {
printk(BIOS_ERR, "%s: Error writing to TPM\n", __func__);
return -1;
}
@@ -494,8 +494,8 @@ int tpm_vendor_init(struct tpm_chip *chip, unsigned int bus, uint32_t dev_addr)
return -1;
}
g_tpm_dev.bus = bus;
g_tpm_dev.addr = dev_addr;
tpm_dev.bus = bus;
tpm_dev.addr = dev_addr;
cr50_vendor_init(chip);

36
src/drivers/i2c/tpm/tis.c
View File

@@ -26,7 +26,7 @@
#include "tpm.h"
/* global structure for tpm chip data */
static struct tpm_chip g_chip;
static struct tpm_chip chip;
#define TPM_CMD_COUNT_BYTE 2
#define TPM_CMD_ORDINAL_BYTE 6
@@ -35,15 +35,15 @@ int tis_open(void)
{
int rc;
if (g_chip.is_open) {
if (chip.is_open) {
printk(BIOS_DEBUG, "tis_open() called twice.\n");
return -1;
}
rc = tpm_vendor_init(&g_chip, CONFIG_DRIVER_TPM_I2C_BUS,
rc = tpm_vendor_init(&chip, CONFIG_DRIVER_TPM_I2C_BUS,
CONFIG_DRIVER_TPM_I2C_ADDR);
if (rc < 0)
g_chip.is_open = 0;
chip.is_open = 0;
if (rc)
return -1;
@@ -53,9 +53,9 @@ int tis_open(void)
int tis_close(void)
{
if (g_chip.is_open) {
tpm_vendor_cleanup(&g_chip);
g_chip.is_open = 0;
if (chip.is_open) {
tpm_vendor_cleanup(&chip);
chip.is_open = 0;
}
return 0;
@@ -76,7 +76,7 @@ static ssize_t tpm_transmit(const uint8_t *sbuf, size_t sbufsiz, void *rbuf,
memcpy(&count, sbuf + TPM_CMD_COUNT_BYTE, sizeof(count));
count = be32_to_cpu(count);
if (!g_chip.vendor.send || !g_chip.vendor.status || !g_chip.vendor.cancel)
if (!chip.vendor.send || !chip.vendor.status || !chip.vendor.cancel)
return -1;
if (count == 0) {
@@ -89,8 +89,8 @@ static ssize_t tpm_transmit(const uint8_t *sbuf, size_t sbufsiz, void *rbuf,
return -1;
}
ASSERT(g_chip.vendor.send);
rc = g_chip.vendor.send(&g_chip, (uint8_t *) sbuf, count);
ASSERT(chip.vendor.send);
rc = chip.vendor.send(&chip, (uint8_t *) sbuf, count);
if (rc < 0) {
printk(BIOS_DEBUG, "tpm_transmit: tpm_send error\n");
goto out;
@@ -98,14 +98,14 @@ static ssize_t tpm_transmit(const uint8_t *sbuf, size_t sbufsiz, void *rbuf,
int timeout = 2 * 60 * 1000; /* two minutes timeout */
while (timeout) {
ASSERT(g_chip.vendor.status);
uint8_t status = g_chip.vendor.status(&g_chip);
if ((status & g_chip.vendor.req_complete_mask) ==
g_chip.vendor.req_complete_val) {
ASSERT(chip.vendor.status);
uint8_t status = chip.vendor.status(&chip);
if ((status & chip.vendor.req_complete_mask) ==
chip.vendor.req_complete_val) {
goto out_recv;
}
if (status == g_chip.vendor.req_canceled) {
if (status == chip.vendor.req_canceled) {
printk(BIOS_DEBUG,
"tpm_transmit: Operation Canceled\n");
rc = -1;
@@ -115,15 +115,15 @@ static ssize_t tpm_transmit(const uint8_t *sbuf, size_t sbufsiz, void *rbuf,
timeout--;
}
ASSERT(g_chip.vendor.cancel);
g_chip.vendor.cancel(&g_chip);
ASSERT(chip.vendor.cancel);
chip.vendor.cancel(&chip);
printk(BIOS_DEBUG, "tpm_transmit: Operation Timed out\n");
rc = -1; //ETIME;
goto out;
out_recv:
rc = g_chip.vendor.recv(&g_chip, (uint8_t *) rbuf, rbufsiz);
rc = chip.vendor.recv(&chip, (uint8_t *) rbuf, rbufsiz);
if (rc < 0)
printk(BIOS_DEBUG, "tpm_transmit: tpm_recv: error %d\n", rc);
out:

74
src/drivers/i2c/tpm/tpm.c
View File

@@ -80,7 +80,7 @@ struct tpm_inf_dev {
enum i2c_chip_type chip_type;
};
static struct tpm_inf_dev g_tpm_dev;
static struct tpm_inf_dev tpm_dev;
/*
* iic_tpm_read() - read from TPM register
@@ -101,20 +101,20 @@ static int iic_tpm_read(uint8_t addr, uint8_t *buffer, size_t len)
int rc;
int count;
if (g_tpm_dev.addr == 0)
if (tpm_dev.addr == 0)
return -1;
switch (g_tpm_dev.chip_type) {
switch (tpm_dev.chip_type) {
case SLB9635:
case UNKNOWN:
/* slb9635 protocol should work in both cases */
for (count = 0; count < MAX_COUNT; count++) {
rc = i2c_write_raw(g_tpm_dev.bus, g_tpm_dev.addr,
rc = i2c_write_raw(tpm_dev.bus, tpm_dev.addr,
&addr, 1);
if (rc == 0)
break; /* success, break to skip sleep */
udelay(g_tpm_dev.sleep_short);
udelay(tpm_dev.sleep_short);
}
if (rc)
@@ -125,8 +125,8 @@ static int iic_tpm_read(uint8_t addr, uint8_t *buffer, size_t len)
* retrieving the data
*/
for (count = 0; count < MAX_COUNT; count++) {
udelay(g_tpm_dev.sleep_short);
rc = i2c_read_raw(g_tpm_dev.bus, g_tpm_dev.addr,
udelay(tpm_dev.sleep_short);
rc = i2c_read_raw(tpm_dev.bus, tpm_dev.addr,
buffer, len);
if (rc == 0)
break; /* success, break to skip sleep */
@@ -142,23 +142,23 @@ static int iic_tpm_read(uint8_t addr, uint8_t *buffer, size_t len)
* retries should usually not be needed, but are kept just to
* be safe on the safe side.
*/
struct i2c_msg aseg = { .flags = 0, .slave = g_tpm_dev.addr,
struct i2c_msg aseg = { .flags = 0, .slave = tpm_dev.addr,
.buf = &addr, .len = 1 };
struct i2c_msg dseg = { .flags = I2C_M_RD,
.slave = g_tpm_dev.addr,
.slave = tpm_dev.addr,
.buf = buffer, .len = len };
for (count = 0; count < MAX_COUNT; count++) {
rc = i2c_transfer(g_tpm_dev.bus, &aseg, 1) ||
i2c_transfer(g_tpm_dev.bus, &dseg, 1);
rc = i2c_transfer(tpm_dev.bus, &aseg, 1) ||
i2c_transfer(tpm_dev.bus, &dseg, 1);
if (rc == 0)
break; /* break here to skip sleep */
udelay(g_tpm_dev.sleep_short);
udelay(tpm_dev.sleep_short);
}
}
}
/* take care of 'guard time' */
udelay(g_tpm_dev.sleep_short);
udelay(tpm_dev.sleep_short);
if (rc)
return -1;
@@ -179,14 +179,14 @@ static int iic_tpm_write_generic(uint8_t addr, uint8_t *buffer, size_t len,
}
/* prepare send buffer */
g_tpm_dev.buf[0] = addr;
memcpy(&(g_tpm_dev.buf[1]), buffer, len);
tpm_dev.buf[0] = addr;
memcpy(&(tpm_dev.buf[1]), buffer, len);
if (g_tpm_dev.addr == 0)
if (tpm_dev.addr == 0)
return -1;
for (count = 0; count < max_count; count++) {
rc = i2c_write_raw(g_tpm_dev.bus, g_tpm_dev.addr,
g_tpm_dev.buf, len + 1);
rc = i2c_write_raw(tpm_dev.bus, tpm_dev.addr,
tpm_dev.buf, len + 1);
if (rc == 0)
break; /* success, break to skip sleep */
@@ -194,7 +194,7 @@ static int iic_tpm_write_generic(uint8_t addr, uint8_t *buffer, size_t len,
}
/* take care of 'guard time' */
udelay(g_tpm_dev.sleep_short);
udelay(tpm_dev.sleep_short);
if (rc)
return -1;
@@ -219,8 +219,8 @@ static int iic_tpm_write_generic(uint8_t addr, uint8_t *buffer, size_t len,
*/
static int iic_tpm_write(uint8_t addr, uint8_t *buffer, size_t len)
{
return iic_tpm_write_generic(addr, buffer, len, g_tpm_dev.sleep_short,
MAX_COUNT);
return iic_tpm_write_generic(addr, buffer, len, tpm_dev.sleep_short,
MAX_COUNT);
}
/*
@@ -229,8 +229,8 @@ static int iic_tpm_write(uint8_t addr, uint8_t *buffer, size_t len)
* */
static int iic_tpm_write_long(uint8_t addr, uint8_t *buffer, size_t len)
{
return iic_tpm_write_generic(addr, buffer, len, g_tpm_dev.sleep_long,
MAX_COUNT_LONG);
return iic_tpm_write_generic(addr, buffer, len, tpm_dev.sleep_long,
MAX_COUNT_LONG);
}
static int check_locality(struct tpm_chip *chip, int loc)
@@ -479,11 +479,11 @@ int tpm_vendor_probe(unsigned int bus, uint32_t addr)
int ret;
long sw_run_duration = SLEEP_DURATION_PROBE_MS;
g_tpm_dev.chip_type = UNKNOWN;
g_tpm_dev.bus = bus;
g_tpm_dev.addr = addr;
g_tpm_dev.sleep_short = SLEEP_DURATION;
g_tpm_dev.sleep_long = SLEEP_DURATION_LONG;
tpm_dev.chip_type = UNKNOWN;
tpm_dev.bus = bus;
tpm_dev.addr = addr;
tpm_dev.sleep_short = SLEEP_DURATION;
tpm_dev.sleep_long = SLEEP_DURATION_LONG;
/*
* Probe TPM. Check if the TPM_ACCESS register's ValidSts bit is set(1)
@@ -522,11 +522,11 @@ int tpm_vendor_init(struct tpm_chip *chip, unsigned int bus, uint32_t dev_addr)
return -1;
}
g_tpm_dev.chip_type = UNKNOWN;
g_tpm_dev.bus = bus;
g_tpm_dev.addr = dev_addr;
g_tpm_dev.sleep_short = SLEEP_DURATION;
g_tpm_dev.sleep_long = SLEEP_DURATION_LONG;
tpm_dev.chip_type = UNKNOWN;
tpm_dev.bus = bus;
tpm_dev.addr = dev_addr;
tpm_dev.sleep_short = SLEEP_DURATION;
tpm_dev.sleep_long = SLEEP_DURATION_LONG;
memset(&chip->vendor, 0, sizeof(struct tpm_vendor_specific));
chip->is_open = 1;
@@ -547,9 +547,9 @@ int tpm_vendor_init(struct tpm_chip *chip, unsigned int bus, uint32_t dev_addr)
goto out_err;
if (vendor == TPM_TIS_I2C_DID_VID_9645) {
g_tpm_dev.chip_type = SLB9645;
tpm_dev.chip_type = SLB9645;
} else if (be32_to_cpu(vendor) == TPM_TIS_I2C_DID_VID_9635) {
g_tpm_dev.chip_type = SLB9635;
tpm_dev.chip_type = SLB9635;
} else {
printk(BIOS_DEBUG, "Vendor ID 0x%08x not recognized.\n",
vendor);
@@ -557,8 +557,8 @@ int tpm_vendor_init(struct tpm_chip *chip, unsigned int bus, uint32_t dev_addr)
}
printk(BIOS_DEBUG, "I2C TPM %u:%02x (chip type %s device-id 0x%X)\n",
g_tpm_dev.bus, g_tpm_dev.addr,
chip_name[g_tpm_dev.chip_type], vendor >> 16);
tpm_dev.bus, tpm_dev.addr,
chip_name[tpm_dev.chip_type], vendor >> 16);
/*
* A timeout query to TPM can be placed here.