From: Yazen Ghannam <Yazen.Ghannam@amd.com> To: linux-edac@vger.kernel.org Cc: Yazen Ghannam <Yazen.Ghannam@amd.com>, linux-kernel@vger.kernel.org, bp@suse.de, tony.luck@intel.com, x86@kernel.org Subject: [PATCH 3/3] x86/MCE/AMD: Get address from already initialized block Date: Thu, 1 Feb 2018 12:48:13 -0600 [thread overview] Message-ID: <20180201184813.82253-3-Yazen.Ghannam@amd.com> (raw) In-Reply-To: <20180201184813.82253-1-Yazen.Ghannam@amd.com> From: Yazen Ghannam <yazen.ghannam@amd.com> The block address is saved after the block is initialized when threshold_init_device() is called. Use the saved block address, if available, rather than trying to rediscover it. We can avoid some *on_cpu() calls in the init path that will cause a call trace when resuming from suspend. Cc: <stable@vger.kernel.org> # 4.14.x Signed-off-by: Yazen Ghannam <yazen.ghannam@amd.com> --- arch/x86/kernel/cpu/mcheck/mce_amd.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd.c b/arch/x86/kernel/cpu/mcheck/mce_amd.c index bf53b4549a17..8c4f8f30c779 100644 --- a/arch/x86/kernel/cpu/mcheck/mce_amd.c +++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c @@ -436,6 +436,21 @@ static u32 get_block_address(unsigned int cpu, u32 current_addr, u32 low, u32 hi { u32 addr = 0, offset = 0; + if ((bank >= mca_cfg.banks) || (block >= NR_BLOCKS)) + return addr; + + /* Get address from already initialized block. */ + if (per_cpu(threshold_banks, cpu)) { + struct threshold_bank *bankp = per_cpu(threshold_banks, cpu)[bank]; + + if (bankp && bankp->blocks) { + struct threshold_block *blockp = &bankp->blocks[block]; + + if (blockp) + return blockp->address; + } + } + if (mce_flags.smca) { if (smca_get_bank_type(bank) == SMCA_RESERVED) return addr; -- 2.14.1
WARNING: multiple messages have this Message-ID (diff)
From: Yazen Ghannam <yazen.ghannam@amd.com> To: linux-edac@vger.kernel.org Cc: Yazen Ghannam <Yazen.Ghannam@amd.com>, linux-kernel@vger.kernel.org, bp@suse.de, tony.luck@intel.com, x86@kernel.org Subject: [3/3] x86/MCE/AMD: Get address from already initialized block Date: Thu, 1 Feb 2018 12:48:13 -0600 [thread overview] Message-ID: <20180201184813.82253-3-Yazen.Ghannam@amd.com> (raw) From: Yazen Ghannam <yazen.ghannam@amd.com> The block address is saved after the block is initialized when threshold_init_device() is called. Use the saved block address, if available, rather than trying to rediscover it. We can avoid some *on_cpu() calls in the init path that will cause a call trace when resuming from suspend. Cc: <stable@vger.kernel.org> # 4.14.x Signed-off-by: Yazen Ghannam <yazen.ghannam@amd.com> --- arch/x86/kernel/cpu/mcheck/mce_amd.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd.c b/arch/x86/kernel/cpu/mcheck/mce_amd.c index bf53b4549a17..8c4f8f30c779 100644 --- a/arch/x86/kernel/cpu/mcheck/mce_amd.c +++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c @@ -436,6 +436,21 @@ static u32 get_block_address(unsigned int cpu, u32 current_addr, u32 low, u32 hi { u32 addr = 0, offset = 0; + if ((bank >= mca_cfg.banks) || (block >= NR_BLOCKS)) + return addr; + + /* Get address from already initialized block. */ + if (per_cpu(threshold_banks, cpu)) { + struct threshold_bank *bankp = per_cpu(threshold_banks, cpu)[bank]; + + if (bankp && bankp->blocks) { + struct threshold_block *blockp = &bankp->blocks[block]; + + if (blockp) + return blockp->address; + } + } + if (mce_flags.smca) { if (smca_get_bank_type(bank) == SMCA_RESERVED) return addr;
next prev parent reply other threads:[~2018-02-01 18:49 UTC|newest] Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-02-01 18:48 [PATCH 1/3] x86/MCE/AMD: Redo function to get SMCA bank type Yazen Ghannam 2018-02-01 18:48 ` [1/3] " Yazen Ghannam 2018-02-01 18:48 ` [PATCH 2/3] x86/MCE/AMD, EDAC/mce_amd: Enumerate Reserved " Yazen Ghannam 2018-02-01 18:48 ` [2/3] " Yazen Ghannam 2018-02-08 15:15 ` [PATCH 2/3] " Borislav Petkov 2018-02-08 15:15 ` [2/3] " Borislav Petkov 2018-02-14 16:28 ` [PATCH 2/3] " Ghannam, Yazen 2018-02-14 16:28 ` [2/3] " Yazen Ghannam 2018-02-01 18:48 ` Yazen Ghannam [this message] 2018-02-01 18:48 ` [3/3] x86/MCE/AMD: Get address from already initialized block Yazen Ghannam 2018-02-08 15:26 ` [PATCH 3/3] " Borislav Petkov 2018-02-08 15:26 ` [3/3] " Borislav Petkov 2018-04-14 0:42 ` [PATCH 3/3] " Johannes Hirte 2018-04-14 0:42 ` [3/3] " Johannes Hirte 2018-04-16 11:56 ` [PATCH 3/3] " Johannes Hirte 2018-04-16 11:56 ` [3/3] " Johannes Hirte 2018-04-17 13:31 ` [PATCH 3/3] " Ghannam, Yazen 2018-04-17 13:31 ` [3/3] " Yazen Ghannam 2018-05-15 9:39 ` [PATCH 3/3] " Johannes Hirte 2018-05-15 9:39 ` [3/3] " Johannes Hirte 2018-05-16 22:46 ` [PATCH 3/3] " Borislav Petkov 2018-05-16 22:46 ` [3/3] " Boris Petkov 2018-05-17 6:49 ` [PATCH 3/3] " Johannes Hirte 2018-05-17 6:49 ` [3/3] " Johannes Hirte 2018-05-17 10:41 ` [PATCH 3/3] " Borislav Petkov 2018-05-17 10:41 ` [3/3] " Boris Petkov 2018-05-17 13:04 ` [PATCH 3/3] " Ghannam, Yazen 2018-05-17 13:04 ` [3/3] " Yazen Ghannam 2018-05-17 13:44 ` [PATCH 3/3] " Borislav Petkov 2018-05-17 13:44 ` [3/3] " Boris Petkov 2018-05-17 14:05 ` [PATCH 3/3] " Ghannam, Yazen 2018-05-17 14:05 ` [3/3] " Yazen Ghannam 2018-05-17 18:30 ` [PATCH 1/2] x86/MCE/AMD: Cache SMCA MISC block addresses Borislav Petkov 2018-05-17 18:30 ` [1/2] " Boris Petkov 2018-05-17 18:31 ` [PATCH 2/2] x86/MCE/AMD: Read MCx_MISC block addresses on any CPU Borislav Petkov 2018-05-17 18:31 ` [2/2] " Boris Petkov 2018-05-17 19:29 ` [PATCH 3/3] x86/MCE/AMD: Get address from already initialized block Johannes Hirte 2018-05-17 19:29 ` [3/3] " Johannes Hirte 2018-05-17 19:33 ` [PATCH 3/3] " Borislav Petkov 2018-05-17 19:33 ` [3/3] " Boris Petkov 2018-05-19 13:21 ` [tip:ras/urgent] x86/MCE/AMD: Cache SMCA MISC block addresses tip-bot for Borislav Petkov 2018-02-08 15:04 ` [PATCH 1/3] x86/MCE/AMD: Redo function to get SMCA bank type Borislav Petkov 2018-02-08 15:04 ` [1/3] " Borislav Petkov 2018-02-14 16:38 ` [PATCH 1/3] " Ghannam, Yazen 2018-02-14 16:38 ` [1/3] " Yazen Ghannam 2018-02-14 19:35 ` [PATCH 1/3] " Borislav Petkov 2018-02-14 19:35 ` [1/3] " Boris Petkov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20180201184813.82253-3-Yazen.Ghannam@amd.com \ --to=yazen.ghannam@amd.com \ --cc=bp@suse.de \ --cc=linux-edac@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=tony.luck@intel.com \ --cc=x86@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.