adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 11:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

gru: allow users to specify gru chiplet 1

Browse source 
Add table & user request infrastructure that is needed to allow users to
specify the blade and chiplet for allocation of GRU contexts.  Use of this
information is in a subsequent patch.

Signed-off-by: Jack Steiner <steiner@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jack Steiner 2009-12-15 16:48:04 -08:00 committed by Linus Torvalds
parent 9178052fda
commit 518e5cd4aa
4 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/misc/sgi-gru/grufault.c
View file

@ -763,6 +763,16 @@ int gru_set_context_option(unsigned long arg)
return -EINVAL; return -EINVAL;
switch (req.op) { switch (req.op) {
case sco_blade_chiplet:
/* Select blade/chiplet for GRU context */
if (req.val1 < -1 || req.val1 >= GRU_MAX_BLADES || !gru_base[req.val1] ||
req.val0 < -1 || req.val0 >= GRU_CHIPLETS_PER_HUB) {
ret = -EINVAL;
} else {
gts->ts_user_blade_id = req.val1;
gts->ts_user_chiplet_id = req.val0;
}
break;
case sco_gseg_owner: case sco_gseg_owner:
/* Register the current task as the GSEG owner */ /* Register the current task as the GSEG owner */
gts->ts_tgid_owner = current->tgid; gts->ts_tgid_owner = current->tgid;

5
drivers/misc/sgi-gru/grulib.h
View file

@ -98,11 +98,12 @@ struct gru_unload_context_req {
/* /*
* Structure used to set context options * Structure used to set context options
*/ */
enum {sco_gseg_owner, sco_cch_req_slice}; enum {sco_gseg_owner, sco_cch_req_slice, sco_blade_chiplet};
struct gru_set_context_option_req { struct gru_set_context_option_req {
unsigned long gseg; unsigned long gseg;
int op; int op;
unsigned long val1; int val0;
long val1;
}; };
/* /*

2
drivers/misc/sgi-gru/grumain.c
View file

@ -328,6 +328,8 @@ struct gru_thread_state *gru_alloc_gts(struct vm_area_struct *vma,
gts->ts_cbr_au_count = cbr_au_count; gts->ts_cbr_au_count = cbr_au_count;
gts->ts_dsr_au_count = dsr_au_count; gts->ts_dsr_au_count = dsr_au_count;
gts->ts_user_options = options; gts->ts_user_options = options;
gts->ts_user_blade_id = -1;
gts->ts_user_chiplet_id = -1;
gts->ts_tsid = tsid; gts->ts_tsid = tsid;
gts->ts_ctxnum = NULLCTX; gts->ts_ctxnum = NULLCTX;
gts->ts_tlb_int_select = -1; gts->ts_tlb_int_select = -1;

2
drivers/misc/sgi-gru/grutables.h
View file

@ -369,6 +369,8 @@ struct gru_thread_state {
long ts_user_options;/* misc user option flags */ long ts_user_options;/* misc user option flags */
pid_t ts_tgid_owner; /* task that is using the pid_t ts_tgid_owner; /* task that is using the
context - for migration */ context - for migration */
short ts_user_blade_id;/* user selected blade */
char ts_user_chiplet_id;/* user selected chiplet */
unsigned short ts_sizeavail; /* Pagesizes in use */ unsigned short ts_sizeavail; /* Pagesizes in use */
int ts_tsid; /* thread that owns the int ts_tsid; /* thread that owns the
structure */ structure */