Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 507deb25 authored by Laurentiu Tudor's avatar Laurentiu Tudor Committed by Greg Kroah-Hartman
Browse files

staging: fsl-mc: fix compilation with non-generic msi domain ops 



The bus driver relies on generic msi domain ops.
Fix compilation for architectures that don't provide it (e.g. x86_64).

Signed-off-by: default avatarLaurentiu Tudor <laurentiu.tudor@nxp.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 30d26646

drivers/staging/fsl-mc/bus/fsl-mc-msi.c

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/msi.h>

#include "fsl-mc-private.h"



#ifdef GENERIC_MSI_DOMAIN_OPS

/*

 * Generate a unique ID identifying the interrupt (only used within the MSI

 * irqdomain.  Combine the icid with the interrupt index.
@@ -38,6 +39,9 @@ static void fsl_mc_msi_set_desc(msi_alloc_info_t *arg, 
	arg->hwirq = fsl_mc_domain_calc_hwirq(to_fsl_mc_device(desc->dev),

					      desc);

}

#else

#define fsl_mc_msi_set_desc NULL

#endif



static void fsl_mc_msi_update_dom_ops(struct msi_domain_info *info)

{

drivers/staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c

+2 −0
Original line number Diff line number Diff line
@@ -45,7 +45,9 @@ static int its_fsl_mc_msi_prepare(struct irq_domain *msi_domain, 
	 * NOTE: This device id corresponds to the IOMMU stream ID

	 * associated with the DPRC object (ICID).

	 */

#ifdef GENERIC_MSI_DOMAIN_OPS

	info->scratchpad[0].ul = mc_bus_dev->icid;

#endif

	msi_info = msi_get_domain_info(msi_domain->parent);

	return msi_info->ops->msi_prepare(msi_domain->parent, dev, nvec, info);

}