lkml.org 
[lkml]   [2019]   [Sep]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 1/2] edac: Add an API for edac device to report for multiple errors
    Date
    Add an API for EDAC device to report multiple errors with same type.

    Signed-off-by: Hanna Hawa <hhhawa@amazon.com>
    ---
    drivers/edac/edac_device.c | 62 ++++++++++++++++++++++++++------------
    drivers/edac/edac_device.h | 40 ++++++++++++++++++++++++
    2 files changed, 82 insertions(+), 20 deletions(-)

    diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
    index 65cf2b9355c4..866934f2bcb0 100644
    --- a/drivers/edac/edac_device.c
    +++ b/drivers/edac/edac_device.c
    @@ -555,12 +555,16 @@ static inline int edac_device_get_panic_on_ue(struct edac_device_ctl_info
    return edac_dev->panic_on_ue;
    }

    -void edac_device_handle_ce(struct edac_device_ctl_info *edac_dev,
    - int inst_nr, int block_nr, const char *msg)
    +void __edac_device_handle_ce(struct edac_device_ctl_info *edac_dev,
    + unsigned int count, int inst_nr, int block_nr,
    + const char *msg)
    {
    struct edac_device_instance *instance;
    struct edac_device_block *block = NULL;

    + if (!count)
    + return;
    +
    if ((inst_nr >= edac_dev->nr_instances) || (inst_nr < 0)) {
    edac_device_printk(edac_dev, KERN_ERR,
    "INTERNAL ERROR: 'instance' out of range "
    @@ -582,27 +586,31 @@ void edac_device_handle_ce(struct edac_device_ctl_info *edac_dev,

    if (instance->nr_blocks > 0) {
    block = instance->blocks + block_nr;
    - block->counters.ce_count++;
    + block->counters.ce_count += count;
    }

    /* Propagate the count up the 'totals' tree */
    - instance->counters.ce_count++;
    - edac_dev->counters.ce_count++;
    + instance->counters.ce_count += count;
    + edac_dev->counters.ce_count += count;

    if (edac_device_get_log_ce(edac_dev))
    edac_device_printk(edac_dev, KERN_WARNING,
    - "CE: %s instance: %s block: %s '%s'\n",
    - edac_dev->ctl_name, instance->name,
    - block ? block->name : "N/A", msg);
    + "CE: %s instance: %s block: %s count: %d '%s'\n",
    + edac_dev->ctl_name, instance->name,
    + block ? block->name : "N/A", count, msg);
    }
    -EXPORT_SYMBOL_GPL(edac_device_handle_ce);
    +EXPORT_SYMBOL_GPL(__edac_device_handle_ce);

    -void edac_device_handle_ue(struct edac_device_ctl_info *edac_dev,
    - int inst_nr, int block_nr, const char *msg)
    +void __edac_device_handle_ue(struct edac_device_ctl_info *edac_dev,
    + unsigned int count, int inst_nr, int block_nr,
    + const char *msg)
    {
    struct edac_device_instance *instance;
    struct edac_device_block *block = NULL;

    + if (!count)
    + return;
    +
    if ((inst_nr >= edac_dev->nr_instances) || (inst_nr < 0)) {
    edac_device_printk(edac_dev, KERN_ERR,
    "INTERNAL ERROR: 'instance' out of range "
    @@ -624,22 +632,36 @@ void edac_device_handle_ue(struct edac_device_ctl_info *edac_dev,

    if (instance->nr_blocks > 0) {
    block = instance->blocks + block_nr;
    - block->counters.ue_count++;
    + block->counters.ue_count += count;
    }

    /* Propagate the count up the 'totals' tree */
    - instance->counters.ue_count++;
    - edac_dev->counters.ue_count++;
    + instance->counters.ue_count += count;
    + edac_dev->counters.ue_count += count;

    if (edac_device_get_log_ue(edac_dev))
    edac_device_printk(edac_dev, KERN_EMERG,
    - "UE: %s instance: %s block: %s '%s'\n",
    - edac_dev->ctl_name, instance->name,
    - block ? block->name : "N/A", msg);
    + "UE: %s instance: %s block: %s count: %d '%s'\n",
    + edac_dev->ctl_name, instance->name,
    + block ? block->name : "N/A", count, msg);

    if (edac_device_get_panic_on_ue(edac_dev))
    - panic("EDAC %s: UE instance: %s block %s '%s'\n",
    - edac_dev->ctl_name, instance->name,
    - block ? block->name : "N/A", msg);
    + panic("EDAC %s: UE instance: %s block %s count: %d '%s'\n",
    + edac_dev->ctl_name, instance->name,
    + block ? block->name : "N/A", count, msg);
    +}
    +EXPORT_SYMBOL_GPL(__edac_device_handle_ue);
    +
    +void edac_device_handle_ce(struct edac_device_ctl_info *edac_dev,
    + int inst_nr, int block_nr, const char *msg)
    +{
    + __edac_device_handle_ce(edac_dev, 1, inst_nr, block_nr, msg);
    +}
    +EXPORT_SYMBOL_GPL(edac_device_handle_ce);
    +
    +void edac_device_handle_ue(struct edac_device_ctl_info *edac_dev,
    + int inst_nr, int block_nr, const char *msg)
    +{
    + __edac_device_handle_ue(edac_dev, 1, inst_nr, block_nr, msg);
    }
    EXPORT_SYMBOL_GPL(edac_device_handle_ue);
    diff --git a/drivers/edac/edac_device.h b/drivers/edac/edac_device.h
    index 1aaba74ae411..30dc5f5979c8 100644
    --- a/drivers/edac/edac_device.h
    +++ b/drivers/edac/edac_device.h
    @@ -317,4 +317,44 @@ extern void edac_device_handle_ce(struct edac_device_ctl_info *edac_dev,
    extern int edac_device_alloc_index(void);
    extern const char *edac_layer_name[];

    +/**
    + * __edac_device_handle_ue():
    + * perform a common output and handling of an 'edac_dev' UE event
    + *
    + * @edac_dev: pointer to struct &edac_device_ctl_info
    + * @error_count: number of errors of the same type
    + * @inst_nr: number of the instance where the UE error happened
    + * @block_nr: number of the block where the UE error happened
    + * @msg: message to be printed
    + */
    +void __edac_device_handle_ue(struct edac_device_ctl_info *edac_dev,
    + unsigned int count, int inst_nr,
    + int block_nr, const char *msg);
    +/**
    + * __edac_device_handle_ce():
    + * perform a common output and handling of an 'edac_dev' CE event
    + *
    + * @edac_dev: pointer to struct &edac_device_ctl_info
    + * @error_count: number of errors of the same type
    + * @inst_nr: number of the instance where the CE error happened
    + * @block_nr: number of the block where the CE error happened
    + * @msg: message to be printed
    + */
    +void __edac_device_handle_ce(struct edac_device_ctl_info *edac_dev,
    + unsigned int count, int inst_nr,
    + int block_nr, const char *msg);
    +
    +static inline void edac_device_handle_ce_count(struct edac_device_ctl_info *edac_dev,
    + unsigned int count, int inst_nr,
    + int block_nr, const char *msg)
    +{
    + __edac_device_handle_ce(edac_dev, count, inst_nr, block_nr, msg);
    +}
    +
    +static inline void edac_device_handle_ue_count(struct edac_device_ctl_info *edac_dev,
    + unsigned int count, int inst_nr,
    + int block_nr, const char *msg)
    +{
    + __edac_device_handle_ue(edac_dev, count, inst_nr, block_nr, msg);
    +}
    #endif
    --
    2.17.1
    \
     
     \ /
      Last update: 2019-09-19 19:18    [W:6.134 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site