From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 30 Aug 2021 20:31:36 +0000 (-0700)
Subject: Merge tag 'x86_cache_for_v5.15' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: microblaze-v5.16~203
X-Git-Url: http://git.monstr.eu/?p=linux-2.6-microblaze.git;a=commitdiff_plain;h=42f6e869a028abcf61422bc0d5de59d823db17b1

Merge tag 'x86_cache_for_v5.15' of git://git./linux/kernel/git/tip/tip

Pull x86 resource control updates from Borislav Petkov:
 "A first round of changes towards splitting the arch-specific bits from
  the filesystem bits of resctrl, the ultimate goal being to support
  ARM's equivalent technology MPAM, with the same fs interface (James
  Morse)"

* tag 'x86_cache_for_v5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (25 commits)
  x86/resctrl: Make resctrl_arch_get_config() return its value
  x86/resctrl: Merge the CDP resources
  x86/resctrl: Expand resctrl_arch_update_domains()'s msr_param range
  x86/resctrl: Remove rdt_cdp_peer_get()
  x86/resctrl: Merge the ctrl_val arrays
  x86/resctrl: Calculate the index from the configuration type
  x86/resctrl: Apply offset correction when config is staged
  x86/resctrl: Make ctrlval arrays the same size
  x86/resctrl: Pass configuration type to resctrl_arch_get_config()
  x86/resctrl: Add a helper to read a closid's configuration
  x86/resctrl: Rename update_domains() to resctrl_arch_update_domains()
  x86/resctrl: Allow different CODE/DATA configurations to be staged
  x86/resctrl: Group staged configuration into a separate struct
  x86/resctrl: Move the schemata names into struct resctrl_schema
  x86/resctrl: Add a helper to read/set the CDP configuration
  x86/resctrl: Swizzle rdt_resource and resctrl_schema in pseudo_lock_region
  x86/resctrl: Pass the schema to resctrl filesystem functions
  x86/resctrl: Add resctrl_arch_get_num_closid()
  x86/resctrl: Store the effective num_closid in the schema
  x86/resctrl: Walk the resctrl schema list instead of an arch list
  ...
---

42f6e869a028abcf61422bc0d5de59d823db17b1
diff --cc arch/x86/kernel/cpu/resctrl/monitor.c
index 8caf871b796f,b0741bee79fc..c9f0f3d63f75
--- a/arch/x86/kernel/cpu/resctrl/monitor.c
+++ b/arch/x86/kernel/cpu/resctrl/monitor.c
@@@ -285,8 -285,9 +285,9 @@@ static u64 mbm_overflow_count(u64 prev_
  	return chunks >>= shift;
  }
  
 -static int __mon_event_count(u32 rmid, struct rmid_read *rr)
 +static u64 __mon_event_count(u32 rmid, struct rmid_read *rr)
  {
+ 	struct rdt_hw_resource *hw_res = resctrl_to_arch_res(rr->r);
  	struct mbm_state *m;
  	u64 chunks, tval;