Commit dde6f18a authored by Frederic Barrat's avatar Frederic Barrat Committed by Michael Ellerman
Browse files

ocxl: Don't return trigger page when allocating an interrupt 



Existing users of ocxl_link_irq_alloc() have been converted to obtain
the trigger page of an interrupt through xive directly, we therefore
have no need to return the trigger page when allocating an interrupt.

It also allows ocxl to use the xive native interface to allocate
interrupts, instead of its custom service.

Signed-off-by: default avatarFrederic Barrat <fbarrat@linux.ibm.com>
Reviewed-by: default avatarCédric Le Goater <clg@kaod.org>
Reviewed-by: default avatarGreg Kurz <groug@kaod.org>
Acked-by: default avatarAndrew Donnellan <ajd@linux.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200403153838.29224-4-fbarrat@linux.ibm.com
parent ad857d47

drivers/misc/ocxl/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ config OCXL_BASE 


config OCXL

	tristate "OpenCAPI coherent accelerator support"

	depends on PPC_POWERNV && PCI && EEH

	depends on PPC_POWERNV && PCI && EEH && PPC_XIVE_NATIVE

	select OCXL_BASE

	select HOTPLUG_PCI_POWERNV

	default m

drivers/misc/ocxl/afu_irq.c

+1 −3
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ struct afu_irq { 
	int hw_irq;

	unsigned int virq;

	char *name;

	u64 trigger_page;

	irqreturn_t (*handler)(void *private);

	void (*free_private)(void *private);

	void *private;
@@ -125,8 +124,7 @@ int ocxl_afu_irq_alloc(struct ocxl_context *ctx, int *irq_id) 
		goto err_unlock;

	}



	rc = ocxl_link_irq_alloc(ctx->afu->fn->link, &irq->hw_irq,

				&irq->trigger_page);

	rc = ocxl_link_irq_alloc(ctx->afu->fn->link, &irq->hw_irq);

	if (rc)

		goto err_idr;

drivers/misc/ocxl/link.c

+7 −8
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include <linux/mmu_context.h>

#include <asm/copro.h>

#include <asm/pnv-ocxl.h>

#include <asm/xive.h>

#include <misc/ocxl.h>

#include "ocxl_internal.h"

#include "trace.h"
@@ -682,23 +683,21 @@ unlock: 
}

EXPORT_SYMBOL_GPL(ocxl_link_remove_pe);



int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, u64 *trigger_addr)

int ocxl_link_irq_alloc(void *link_handle, int *hw_irq)

{

	struct ocxl_link *link = (struct ocxl_link *) link_handle;

	int rc, irq;

	u64 addr;

	int irq;



	if (atomic_dec_if_positive(&link->irq_available) < 0)

		return -ENOSPC;



	rc = pnv_ocxl_alloc_xive_irq(&irq, &addr);

	if (rc) {

	irq = xive_native_alloc_irq();

	if (!irq) {

		atomic_inc(&link->irq_available);

		return rc;

		return -ENXIO;

	}



	*hw_irq = irq;

	*trigger_addr = addr;

	return 0;

}

EXPORT_SYMBOL_GPL(ocxl_link_irq_alloc);
@@ -707,7 +706,7 @@ void ocxl_link_free_irq(void *link_handle, int hw_irq) 
{

	struct ocxl_link *link = (struct ocxl_link *) link_handle;



	pnv_ocxl_free_xive_irq(hw_irq);

	xive_native_free_irq(hw_irq);

	atomic_inc(&link->irq_available);

}

EXPORT_SYMBOL_GPL(ocxl_link_free_irq);

drivers/scsi/cxlflash/ocxl_hw.c

+1 −2
Original line number Diff line number Diff line
@@ -614,7 +614,6 @@ static int alloc_afu_irqs(struct ocxlflash_context *ctx, int num) 
	struct ocxl_hw_afu *afu = ctx->hw_afu;

	struct device *dev = afu->dev;

	struct ocxlflash_irqs *irqs;

	u64 addr;

	int rc = 0;

	int hwirq;

	int i;
@@ -639,7 +638,7 @@ static int alloc_afu_irqs(struct ocxlflash_context *ctx, int num) 
	}



	for (i = 0; i < num; i++) {

		rc = ocxl_link_irq_alloc(afu->link_token, &hwirq, &addr);

		rc = ocxl_link_irq_alloc(afu->link_token, &hwirq);

		if (unlikely(rc)) {

			dev_err(dev, "%s: ocxl_link_irq_alloc failed rc=%d\n",

				__func__, rc);

include/misc/ocxl.h

+2 −8
Original line number Diff line number Diff line
@@ -460,14 +460,8 @@ int ocxl_link_remove_pe(void *link_handle, int pasid); 
 * Allocate an AFU interrupt associated to the link.

 *

 * 'hw_irq' is the hardware interrupt number

 * 'obj_handle' is the 64-bit object handle to be passed to the AFU to

 * trigger the interrupt.

 * On P9, 'obj_handle' is an address, which, if written, triggers the

 * interrupt. It is an MMIO address which needs to be remapped (one

 * page).

 */

int ocxl_link_irq_alloc(void *link_handle, int *hw_irq,

			u64 *obj_handle);

 */

int ocxl_link_irq_alloc(void *link_handle, int *hw_irq);



/*

 * Free a previously allocated AFU interrupt

CRA Git | Maintained and supported by SUSTech CRA and CCSE