lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cxl: Refactor cxl_load_segment() and find_free_sste()

Browse Source 
This moves the segment table hash calculation from cxl_load_segment()
into find_free_sste() since that is the only place it is actually used.

Signed-off-by: Ian Munsie <imunsie@au1.ibm.com>
Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Ian Munsie 2014-10-28 14:25:28 +11:00 committed by Michael Ellerman
parent 5100a9d644
commit b03a7f578a
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/misc/cxl/fault.c
View File

@ -21,20 +21,30 @@
#include "cxl.h" #include "cxl.h"
static struct cxl_sste* find_free_sste(struct cxl_sste *primary_group, /* This finds a free SSTE for the given SLB */
unsigned int *lru) static struct cxl_sste* find_free_sste(struct cxl_context *ctx,
struct copro_slb *slb)
{ {
struct cxl_sste *primary, *sste;
unsigned int mask = (ctx->sst_size >> 7) - 1; /* SSTP0[SegTableSize] */
unsigned int entry; unsigned int entry;
struct cxl_sste *sste, *group = primary_group; unsigned int hash;
for (entry = 0; entry < 8; entry++) { if (slb->vsid & SLB_VSID_B_1T)
sste = group + entry; hash = (slb->esid >> SID_SHIFT_1T) & mask;
else /* 256M */
hash = (slb->esid >> SID_SHIFT) & mask;
primary = ctx->sstp + (hash << 3);
for (entry = 0, sste = primary; entry < 8; entry++, sste++) {
if (!(be64_to_cpu(sste->esid_data) & SLB_ESID_V)) if (!(be64_to_cpu(sste->esid_data) & SLB_ESID_V))
return sste; return sste;
} }
/* Nothing free, select an entry to cast out */ /* Nothing free, select an entry to cast out */
sste = primary_group + *lru; sste = primary + ctx->sst_lru;
*lru = (*lru + 1) & 0x7; ctx->sst_lru = (ctx->sst_lru + 1) & 0x7;
return sste; return sste;
} }
@ -42,19 +52,11 @@ static struct cxl_sste* find_free_sste(struct cxl_sste *primary_group,
static void cxl_load_segment(struct cxl_context *ctx, struct copro_slb *slb) static void cxl_load_segment(struct cxl_context *ctx, struct copro_slb *slb)
{ {
/* mask is the group index, we search primary and secondary here. */ /* mask is the group index, we search primary and secondary here. */
unsigned int mask = (ctx->sst_size >> 7)-1; /* SSTP0[SegTableSize] */
struct cxl_sste *sste; struct cxl_sste *sste;
unsigned int hash;
unsigned long flags; unsigned long flags;
if (slb->vsid & SLB_VSID_B_1T)
hash = (slb->esid >> SID_SHIFT_1T) & mask;
else /* 256M */
hash = (slb->esid >> SID_SHIFT) & mask;
spin_lock_irqsave(&ctx->sste_lock, flags); spin_lock_irqsave(&ctx->sste_lock, flags);
sste = find_free_sste(ctx->sstp + (hash << 3), &ctx->sst_lru); sste = find_free_sste(ctx, slb);
pr_devel("CXL Populating SST[%li]: %#llx %#llx\n", pr_devel("CXL Populating SST[%li]: %#llx %#llx\n",
sste - ctx->sstp, slb->vsid, slb->esid); sste - ctx->sstp, slb->vsid, slb->esid);