Skip to content

Commit

Permalink
ocxl: Rename struct link to ocxl_link
Browse files Browse the repository at this point in the history 
The term 'link' is ambiguous (especially when the struct is used for a
list), so rename it for clarity.

Signed-off-by: Alastair D'Silva <alastair@d-silva.org>
Reviewed-by: Greg Kurz <groug@kaod.org>
Acked-by: Frederic Barrat <fbarrat@linux.ibm.com>
Acked-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
  • Loading branch information
Alastair D'Silva authored and Michael Ellerman committed May 2, 2019
1 parent 012ae24 commit 9c4ae06
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 21 deletions.
5 changes: 2 additions & 3 deletions drivers/misc/ocxl/file.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,10 +151,9 @@ static long afu_ioctl_enable_p9_wait(struct ocxl_context *ctx,
mutex_unlock(&ctx->status_mutex);

if (status == ATTACHED) {
int rc;
struct link *link = ctx->afu->fn->link;
int rc = ocxl_link_update_pe(ctx->afu->fn->link,
ctx->pasid, ctx->tidr);

rc = ocxl_link_update_pe(link, ctx->pasid, ctx->tidr);
if (rc)
return rc;
}
Expand Down
36 changes: 18 additions & 18 deletions drivers/misc/ocxl/link.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ struct spa {
* limited number of opencapi slots on a system and lookup is only
* done when the device is probed
*/
struct link {
struct ocxl_link {
struct list_head list;
struct kref ref;
int domain;
Expand Down Expand Up @@ -179,7 +179,7 @@ static void xsl_fault_handler_bh(struct work_struct *fault_work)

static irqreturn_t xsl_fault_handler(int irq, void *data)
{
struct link *link = (struct link *) data;
struct ocxl_link *link = (struct ocxl_link *) data;
struct spa *spa = link->spa;
u64 dsisr, dar, pe_handle;
struct pe_data *pe_data;
Expand Down Expand Up @@ -254,7 +254,7 @@ static int map_irq_registers(struct pci_dev *dev, struct spa *spa)
&spa->reg_tfc, &spa->reg_pe_handle);
}

static int setup_xsl_irq(struct pci_dev *dev, struct link *link)
static int setup_xsl_irq(struct pci_dev *dev, struct ocxl_link *link)
{
struct spa *spa = link->spa;
int rc;
Expand Down Expand Up @@ -309,7 +309,7 @@ static int setup_xsl_irq(struct pci_dev *dev, struct link *link)
return rc;
}

static void release_xsl_irq(struct link *link)
static void release_xsl_irq(struct ocxl_link *link)
{
struct spa *spa = link->spa;

Expand All @@ -321,7 +321,7 @@ static void release_xsl_irq(struct link *link)
unmap_irq_registers(spa);
}

static int alloc_spa(struct pci_dev *dev, struct link *link)
static int alloc_spa(struct pci_dev *dev, struct ocxl_link *link)
{
struct spa *spa;

Expand All @@ -348,7 +348,7 @@ static int alloc_spa(struct pci_dev *dev, struct link *link)
return 0;
}

static void free_spa(struct link *link)
static void free_spa(struct ocxl_link *link)
{
struct spa *spa = link->spa;

Expand All @@ -362,12 +362,12 @@ static void free_spa(struct link *link)
}
}

static int alloc_link(struct pci_dev *dev, int PE_mask, struct link **out_link)
static int alloc_link(struct pci_dev *dev, int PE_mask, struct ocxl_link **out_link)
{
struct link *link;
struct ocxl_link *link;
int rc;

link = kzalloc(sizeof(struct link), GFP_KERNEL);
link = kzalloc(sizeof(struct ocxl_link), GFP_KERNEL);
if (!link)
return -ENOMEM;

Expand Down Expand Up @@ -403,7 +403,7 @@ static int alloc_link(struct pci_dev *dev, int PE_mask, struct link **out_link)
return rc;
}

static void free_link(struct link *link)
static void free_link(struct ocxl_link *link)
{
release_xsl_irq(link);
free_spa(link);
Expand All @@ -413,7 +413,7 @@ static void free_link(struct link *link)
int ocxl_link_setup(struct pci_dev *dev, int PE_mask, void **link_handle)
{
int rc = 0;
struct link *link;
struct ocxl_link *link;

mutex_lock(&links_list_lock);
list_for_each_entry(link, &links_list, list) {
Expand All @@ -440,7 +440,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_setup);

static void release_xsl(struct kref *ref)
{
struct link *link = container_of(ref, struct link, ref);
struct ocxl_link *link = container_of(ref, struct ocxl_link, ref);

list_del(&link->list);
/* call platform code before releasing data */
Expand All @@ -450,7 +450,7 @@ static void release_xsl(struct kref *ref)

void ocxl_link_release(struct pci_dev *dev, void *link_handle)
{
struct link *link = (struct link *) link_handle;
struct ocxl_link *link = (struct ocxl_link *) link_handle;

mutex_lock(&links_list_lock);
kref_put(&link->ref, release_xsl);
Expand Down Expand Up @@ -486,7 +486,7 @@ int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr,
void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr),
void *xsl_err_data)
{
struct link *link = (struct link *) link_handle;
struct ocxl_link *link = (struct ocxl_link *) link_handle;
struct spa *spa = link->spa;
struct ocxl_process_element *pe;
int pe_handle, rc = 0;
Expand Down Expand Up @@ -556,7 +556,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_add_pe);

int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid)
{
struct link *link = (struct link *) link_handle;
struct ocxl_link *link = (struct ocxl_link *) link_handle;
struct spa *spa = link->spa;
struct ocxl_process_element *pe;
int pe_handle, rc;
Expand Down Expand Up @@ -592,7 +592,7 @@ int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid)

int ocxl_link_remove_pe(void *link_handle, int pasid)
{
struct link *link = (struct link *) link_handle;
struct ocxl_link *link = (struct ocxl_link *) link_handle;
struct spa *spa = link->spa;
struct ocxl_process_element *pe;
struct pe_data *pe_data;
Expand Down Expand Up @@ -664,7 +664,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_remove_pe);

int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, u64 *trigger_addr)
{
struct link *link = (struct link *) link_handle;
struct ocxl_link *link = (struct ocxl_link *) link_handle;
int rc, irq;
u64 addr;

Expand All @@ -685,7 +685,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_irq_alloc);

void ocxl_link_free_irq(void *link_handle, int hw_irq)
{
struct link *link = (struct link *) link_handle;
struct ocxl_link *link = (struct ocxl_link *) link_handle;

pnv_ocxl_free_xive_irq(hw_irq);
atomic_inc(&link->irq_available);
Expand Down

0 comments on commit 9c4ae06

Please sign in to comment.