Boris Ostrovsky
2013-Mar-14 21:10 UTC
[PATCH v2 1/2] x86/mce: Replace shared_bank array with is_shared_bank() helper
Use helper function instead of an array to report whether register bank is shared. Currently only bank 4 (northbridge) is shared. Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com> --- arch/x86/kernel/cpu/mcheck/mce_amd.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd.c b/arch/x86/kernel/cpu/mcheck/mce_amd.c index 1ac581f..654a155 100644 --- a/arch/x86/kernel/cpu/mcheck/mce_amd.c +++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c @@ -58,11 +58,6 @@ static const char * const th_names[] = { }; static DEFINE_PER_CPU(struct threshold_bank * [NR_BANKS], threshold_banks); - -static unsigned char shared_bank[NR_BANKS] = { - 0, 0, 0, 0, 1 -}; - static DEFINE_PER_CPU(unsigned char, bank_map); /* see which banks are on */ static void amd_threshold_interrupt(void); @@ -79,6 +74,12 @@ struct thresh_restart { u16 old_limit; }; +static inline bool is_shared_bank(int bank) +{ + /* Bank 4 is for northbridge reporting is thus is shared */ + return (bank == 4); +} + static const char * const bank4_names(struct threshold_block *b) { switch (b->address) { @@ -575,7 +576,7 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank) const char *name = th_names[bank]; int err = 0; - if (shared_bank[bank]) { + if (is_shared_bank(bank)) { nb = node_to_amd_nb(amd_get_nb_id(cpu)); /* threshold descriptor already initialized on this node? */ @@ -609,7 +610,7 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank) per_cpu(threshold_banks, cpu)[bank] = b; - if (shared_bank[bank]) { + if (is_shared_bank(bank)) { atomic_set(&b->cpus, 1); /* nb is already initialized, see above */ @@ -691,7 +692,7 @@ static void threshold_remove_bank(unsigned int cpu, int bank) if (!b->blocks) goto free_out; - if (shared_bank[bank]) { + if (is_shared_bank(bank)) { if (!atomic_dec_and_test(&b->cpus)) { __threshold_remove_blocks(b); per_cpu(threshold_banks, cpu)[bank] = NULL; -- 1.8.1.2
Greg KH
2013-Mar-14 22:20 UTC
Re: [PATCH v2 1/2] x86/mce: Replace shared_bank array with is_shared_bank() helper
On Thu, Mar 14, 2013 at 05:10:40PM -0400, Boris Ostrovsky wrote:> Use helper function instead of an array to report whether register > bank is shared. Currently only bank 4 (northbridge) is shared. > > Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com> > --- > arch/x86/kernel/cpu/mcheck/mce_amd.c | 17 +++++++++-------- > 1 file changed, 9 insertions(+), 8 deletions(-)<formletter> This is not the correct way to submit patches for inclusion in the stable kernel tree. Please read Documentation/stable_kernel_rules.txt for how to do this properly. </formletter>
Borislav Petkov
2013-Mar-14 22:47 UTC
Re: [PATCH v2 1/2] x86/mce: Replace shared_bank array with is_shared_bank() helper
On Thu, Mar 14, 2013 at 03:20:05PM -0700, Greg KH wrote:> On Thu, Mar 14, 2013 at 05:10:40PM -0400, Boris Ostrovsky wrote: > > Use helper function instead of an array to report whether register > > bank is shared. Currently only bank 4 (northbridge) is shared. > > > > Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com> > > --- > > arch/x86/kernel/cpu/mcheck/mce_amd.c | 17 +++++++++-------- > > 1 file changed, 9 insertions(+), 8 deletions(-) > > <formletter> > > This is not the correct way to submit patches for inclusion in the > stable kernel tree. Please read Documentation/stable_kernel_rules.txt > for how to do this properly.Yeah, stable@ was obviously wrongly CCed. This patch is clearly not stable material. Thanks. -- Regards/Gruss, Boris. Sent from a fat crate under my desk. Formatting is fine. --