Commit 243444fb authored by Stuart Yoder's avatar Stuart Yoder Committed by Greg Kroah-Hartman
Browse files

staging: fsl-mc: create private include for fsl-mc bus components 



The mc-bus.h header file is intended to be public for system related
drivers that may need to make fsl-mc bus specific calls-- gic its,
smmu, vfio.  But, currently it contains definitions private/internal
to the fsl-mc bus itself.  Split those definitions out into a new
fsl-mc bus private header.

Signed-off-by: default avatarStuart Yoder <stuart.yoder@nxp.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 36406955

drivers/staging/fsl-mc/bus/dprc-driver.c

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/interrupt.h>

#include <linux/msi.h>

#include "dprc-cmd.h"

#include "fsl-mc-private.h"



struct dprc_child_objs {

	int child_count;

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

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include "../include/dpcon-cmd.h"

#include "dpmcp-cmd.h"

#include "dpmcp.h"

#include "fsl-mc-private.h"

#include <linux/msi.h>



#define FSL_MC_IS_ALLOCATABLE(_obj_type) \

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

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

#include "../include/dpmng.h"

#include "../include/mc-sys.h"

#include "fsl-mc-private.h"

#include "dprc-cmd.h"



static struct kmem_cache *mc_dev_cache;

drivers/staging/fsl-mc/bus/fsl-mc-private.h

0 → 100644
+44 −0
Original line number Diff line number Diff line 
/*

 * Freescale Management Complex (MC) bus private declarations

 *

 * Copyright (C) 2016 Freescale Semiconductor, Inc.

 *

 * This file is licensed under the terms of the GNU General Public

 * License version 2. This program is licensed "as is" without any

 * warranty of any kind, whether express or implied.

 */

#ifndef _FSL_MC_PRIVATE_H_

#define _FSL_MC_PRIVATE_H_



int __must_check fsl_mc_device_add(struct dprc_obj_desc *obj_desc,

				   struct fsl_mc_io *mc_io,

				   struct device *parent_dev,

				   struct fsl_mc_device **new_mc_dev);



void fsl_mc_device_remove(struct fsl_mc_device *mc_dev);



int __init dprc_driver_init(void);



void dprc_driver_exit(void);



int __init fsl_mc_allocator_driver_init(void);



void fsl_mc_allocator_driver_exit(void);



int __must_check fsl_mc_resource_allocate(struct fsl_mc_bus *mc_bus,

					  enum fsl_mc_pool_type pool_type,

					  struct fsl_mc_resource

							  **new_resource);



void fsl_mc_resource_free(struct fsl_mc_resource *resource);



int fsl_mc_msi_domain_alloc_irqs(struct device *dev,

				 unsigned int irq_count);



void fsl_mc_msi_domain_free_irqs(struct device *dev);



int __init its_fsl_mc_msi_init(void);



void its_fsl_mc_msi_cleanup(void);



#endif /* _FSL_MC_PRIVATE_H_ */

drivers/staging/fsl-mc/include/mc-bus.h

+0 −23
Original line number Diff line number Diff line
@@ -102,13 +102,6 @@ struct fsl_mc_bus { 
#define to_fsl_mc_bus(_mc_dev) \

	container_of(_mc_dev, struct fsl_mc_bus, mc_dev)



int __must_check fsl_mc_device_add(struct dprc_obj_desc *obj_desc,

				   struct fsl_mc_io *mc_io,

				   struct device *parent_dev,

				   struct fsl_mc_device **new_mc_dev);



void fsl_mc_device_remove(struct fsl_mc_device *mc_dev);



int dprc_scan_container(struct fsl_mc_device *mc_bus_dev);



int dprc_scan_objects(struct fsl_mc_device *mc_bus_dev,
@@ -122,13 +115,6 @@ int __init fsl_mc_allocator_driver_init(void); 


void fsl_mc_allocator_driver_exit(void);



int __must_check fsl_mc_resource_allocate(struct fsl_mc_bus *mc_bus,

					  enum fsl_mc_pool_type pool_type,

					  struct fsl_mc_resource

							  **new_resource);



void fsl_mc_resource_free(struct fsl_mc_resource *resource);



struct irq_domain *fsl_mc_msi_create_irq_domain(struct fwnode_handle *fwnode,

						struct msi_domain_info *info,

						struct irq_domain *parent);
@@ -136,15 +122,6 @@ struct irq_domain *fsl_mc_msi_create_irq_domain(struct fwnode_handle *fwnode, 
int fsl_mc_find_msi_domain(struct device *mc_platform_dev,

			   struct irq_domain **mc_msi_domain);



int fsl_mc_msi_domain_alloc_irqs(struct device *dev,

				 unsigned int irq_count);



void fsl_mc_msi_domain_free_irqs(struct device *dev);



int __init its_fsl_mc_msi_init(void);



void its_fsl_mc_msi_cleanup(void);



int fsl_mc_populate_irq_pool(struct fsl_mc_bus *mc_bus,

			     unsigned int irq_count);