lkml.org 
[lkml]   [2019]   [Aug]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC PATCH v3 09/10] EDAC/amd64: Use cached data when checking for ECC
    Date
    From: Yazen Ghannam <yazen.ghannam@amd.com>

    ...now that the data is available earlier.

    Signed-off-by: Yazen Ghannam <yazen.ghannam@amd.com>
    ---
    drivers/edac/amd64_edac.c | 20 ++++++++------------
    1 file changed, 8 insertions(+), 12 deletions(-)

    diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
    index 84832771dec0..c1cb0234f085 100644
    --- a/drivers/edac/amd64_edac.c
    +++ b/drivers/edac/amd64_edac.c
    @@ -3183,31 +3183,27 @@ static const char *ecc_msg =
    "'ecc_enable_override'.\n"
    " (Note that use of the override may cause unknown side effects.)\n";

    -static bool ecc_enabled(struct pci_dev *F3, u16 nid)
    +static bool ecc_enabled(struct amd64_pvt *pvt)
    {
    + u16 nid = pvt->mc_node_id;
    bool nb_mce_en = false;
    u8 ecc_en = 0, i;
    u32 value;

    if (boot_cpu_data.x86 >= 0x17) {
    u8 umc_en_mask = 0, ecc_en_mask = 0;
    + struct amd64_umc *umc;

    for_each_umc(i) {
    - u32 base = get_umc_base(i);
    + umc = &pvt->umc[i];

    /* Only check enabled UMCs. */
    - if (amd_smn_read(nid, base + UMCCH_SDP_CTRL, &value))
    - continue;
    -
    - if (!(value & UMC_SDP_INIT))
    + if (!(umc->sdp_ctrl & UMC_SDP_INIT))
    continue;

    umc_en_mask |= BIT(i);

    - if (amd_smn_read(nid, base + UMCCH_UMC_CAP_HI, &value))
    - continue;
    -
    - if (value & UMC_ECC_ENABLED)
    + if (umc->umc_cap_hi & UMC_ECC_ENABLED)
    ecc_en_mask |= BIT(i);
    }

    @@ -3220,7 +3216,7 @@ static bool ecc_enabled(struct pci_dev *F3, u16 nid)
    /* Assume UMC MCA banks are enabled. */
    nb_mce_en = true;
    } else {
    - amd64_read_pci_cfg(F3, NBCFG, &value);
    + amd64_read_pci_cfg(pvt->F3, NBCFG, &value);

    ecc_en = !!(value & NBCFG_ECC_ENABLE);

    @@ -3539,7 +3535,7 @@ static int probe_one_instance(unsigned int nid)
    if (ret < 0)
    goto err_enable;

    - if (!ecc_enabled(F3, nid)) {
    + if (!ecc_enabled(pvt)) {
    ret = 0;

    if (!ecc_enable_override)
    --
    2.17.1
    \
     
     \ /
      Last update: 2019-08-22 02:02    [W:4.435 / U:0.216 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site