iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sgi-gru: fix bugs related to module unload of the GRU driver

Browse Source 
Fix bugs related to module unload of the GRU driver.

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-04-02 16:59:11 -07:00 committed by Linus Torvalds
parent e1c3219d06
commit 27ca8a7b2b
3 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/misc/sgi-gru/grufile.c
View File

@ -440,7 +440,7 @@ exit1:
static void __exit gru_exit(void)
{
int i, bid;
int i, bid, gid;
int order = get_order(sizeof(struct gru_state) *
GRU_CHIPLETS_PER_BLADE);
@ -450,6 +450,9 @@ static void __exit gru_exit(void)
for (i = 0; i < GRU_CHIPLETS_PER_BLADE; i++)
free_irq(IRQ_GRU + i, NULL);
foreach_gid(gid)
gru_kservices_exit(GID_TO_GRU(gid));
for (bid = 0; bid < GRU_MAX_BLADES; bid++)
free_pages((unsigned long)gru_base[bid], order);

19
drivers/misc/sgi-gru/grukservices.c
View File

@ -690,3 +690,22 @@ int gru_kservices_init(struct gru_state *gru)
quicktest(gru);
return 0;
}
void gru_kservices_exit(struct gru_state *gru)
{
struct gru_context_configuration_handle *cch;
struct gru_blade_state *bs;
bs = gru->gs_blade;
if (gru != &bs->bs_grus[1])
return;
cch = get_cch(gru->gs_gru_base_vaddr, KERNEL_CTXNUM);
lock_cch_handle(cch);
if (cch_interrupt_sync(cch))
BUG();
if (cch_deallocate(cch))
BUG();
unlock_cch_handle(cch);
}

1
drivers/misc/sgi-gru/grutables.h
View File

@ -600,6 +600,7 @@ extern void gru_unload_context(struct gru_thread_state *gts, int savestate);
extern void gts_drop(struct gru_thread_state *gts);
extern void gru_tgh_flush_init(struct gru_state *gru);
extern int gru_kservices_init(struct gru_state *gru);
extern void gru_kservices_exit(struct gru_state *gru);
extern irqreturn_t gru_intr(int irq, void *dev_id);
extern int gru_handle_user_call_os(unsigned long address);
extern int gru_user_flush_tlb(unsigned long arg);