diff options
| author | Deepthi Dharwar <deepthi@linux.vnet.ibm.com> | 2014-07-24 12:01:21 +0530 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-07-25 14:10:51 +1000 |
| commit | 04c6bf0e7ef0ddd81a0f1032bbc9bebd71798eea (patch) | |
| tree | 59181ad9a8d4412f11cf94deec12c6f915e0d881 /hw/fsp | |
| parent | da8efe8b9490ae2545d1e3fd2c509dafd707b373 (diff) | |
| download | skiboot-04c6bf0e7ef0ddd81a0f1032bbc9bebd71798eea.zip skiboot-04c6bf0e7ef0ddd81a0f1032bbc9bebd71798eea.tar.gz skiboot-04c6bf0e7ef0ddd81a0f1032bbc9bebd71798eea.tar.bz2 | |
elog: Cosmetic elog-opal-read fixes.
This patch fixes a bunch of typos and removes NULL assignment
to global variables.
Signed-off-by: Deepthi Dharwar <deepthi@linux.vnet.ibm.com>
Acked-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'hw/fsp')
| -rw-r--r-- | hw/fsp/fsp-elog-read.c | 10 | ||||
| -rw-r--r-- | hw/fsp/fsp-elog-write.c | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/hw/fsp/fsp-elog-read.c b/hw/fsp/fsp-elog-read.c index f4a689f..022594e 100644 --- a/hw/fsp/fsp-elog-read.c +++ b/hw/fsp/fsp-elog-read.c @@ -91,7 +91,7 @@ static struct lock elog_read_lock = LOCK_UNLOCKED; /* log buffer to copy FSP log for READ */ #define ELOG_READ_BUFFER_SIZE 0x00040000 -static void *elog_read_buffer = NULL; +static void *elog_read_buffer; static uint32_t elog_head_id; /* FSP entry ID */ static size_t elog_head_size; /* actual FSP log size */ static uint32_t elog_read_retries; /* bad response status count */ @@ -252,7 +252,7 @@ static void fsp_elog_queue_fetch(void) } /* opal interface for powernv to read log size and log ID from sapphire */ -static int64_t fsp_opal_elog_info(uint64_t *opla_elog_id, +static int64_t fsp_opal_elog_info(uint64_t *opal_elog_id, uint64_t *opal_elog_size, uint64_t *elog_type) { struct fsp_log_entry *log_data; @@ -266,7 +266,7 @@ static int64_t fsp_opal_elog_info(uint64_t *opla_elog_id, return OPAL_WRONG_STATE; } log_data = list_top(&elog_read_pending, struct fsp_log_entry, link); - *opla_elog_id = log_data->log_id; + *opal_elog_id = log_data->log_id; *opal_elog_size = log_data->log_size; unlock(&elog_read_lock); return OPAL_SUCCESS; @@ -274,7 +274,7 @@ static int64_t fsp_opal_elog_info(uint64_t *opla_elog_id, /* opal interface for powernv to read log from sapphire */ static int64_t fsp_opal_elog_read(uint64_t *buffer, uint64_t opal_elog_size, - uint64_t opla_elog_id) + uint64_t opal_elog_id) { struct fsp_log_entry *log_data; @@ -291,7 +291,7 @@ static int64_t fsp_opal_elog_read(uint64_t *buffer, uint64_t opal_elog_size, log_data = list_top(&elog_read_pending, struct fsp_log_entry, link); /* Check log ID and log size are same and then read log from buffer */ - if ((opla_elog_id != log_data->log_id) && + if ((opal_elog_id != log_data->log_id) && (opal_elog_size != log_data->log_size)) { unlock(&elog_read_lock); return OPAL_PARAMETER; diff --git a/hw/fsp/fsp-elog-write.c b/hw/fsp/fsp-elog-write.c index 6370c9c..d7999d7 100644 --- a/hw/fsp/fsp-elog-write.c +++ b/hw/fsp/fsp-elog-write.c @@ -50,10 +50,10 @@ static uint32_t powernv_elog_id = 0xB1000000; /* log buffer to copy FSP log for READ */ #define ELOG_WRITE_BUFFER_SIZE 0x00050000 -static void *elog_write_buffer = NULL; +static void *elog_write_buffer; #define ELOG_PANIC_WRITE_BUFFER_SIZE 0x0010000 -static void *elog_panic_write_buffer = NULL; +static void *elog_panic_write_buffer; struct opal_errorlog *panic_write_buffer; static int panic_write_buffer_valid; @@ -640,7 +640,7 @@ void fsp_elog_write_init(void) fsp_tce_map(PSI_DMA_ERRLOG_WRITE_BUF, elog_write_buffer, PSI_DMA_ERRLOG_WRITE_BUF_SZ); - /* pre-allocate memory for 128 records */ + /* pre-allocate memory for 64 records */ if (init_elog_write_free_list(ELOG_WRITE_MAX_RECORD)) { prerror("ELOG: Cannot allocate WRITE buffers to log errors!\n"); return; |