staging: fsl-mc: move rest of mc-bus.h to private header
All the mc-bus.h contents is only used privately in the bus driver so move everything to the private header and get rid of the mc-bus.h header file. Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Laurentiu Tudor
Greg Kroah-Hartman
Родитель
61aa52c774
Коммит
5e0d2d0143
|
|
@ -13,7 +13,6 @@
|
|||
#include <linux/slab.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/msi.h>
|
||||
#include "../include/mc-bus.h"
|
||||
#include "../include/mc-sys.h"
|
||||
|
||||
#include "dprc-cmd.h"
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@
|
|||
|
||||
#include <linux/module.h>
|
||||
#include <linux/msi.h>
|
||||
#include "../include/mc-bus.h"
|
||||
#include "../include/mc-sys.h"
|
||||
|
||||
#include "fsl-mc-private.h"
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@
|
|||
#include <linux/bitops.h>
|
||||
#include <linux/msi.h>
|
||||
#include <linux/dma-mapping.h>
|
||||
#include "../include/mc-bus.h"
|
||||
#include "../include/dpmng.h"
|
||||
#include "../include/mc-sys.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@
|
|||
#include <linux/irq.h>
|
||||
#include <linux/irqdomain.h>
|
||||
#include <linux/msi.h>
|
||||
#include "../include/mc-bus.h"
|
||||
#include "../include/mc-cmd.h"
|
||||
#include "fsl-mc-private.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -11,6 +11,53 @@
|
|||
#define _FSL_MC_PRIVATE_H_
|
||||
|
||||
#include "../include/mc.h"
|
||||
#include <linux/mutex.h>
|
||||
|
||||
/**
|
||||
* Maximum number of total IRQs that can be pre-allocated for an MC bus'
|
||||
* IRQ pool
|
||||
*/
|
||||
#define FSL_MC_IRQ_POOL_MAX_TOTAL_IRQS 256
|
||||
|
||||
/**
|
||||
* struct fsl_mc_resource_pool - Pool of MC resources of a given
|
||||
* type
|
||||
* @type: type of resources in the pool
|
||||
* @max_count: maximum number of resources in the pool
|
||||
* @free_count: number of free resources in the pool
|
||||
* @mutex: mutex to serialize access to the pool's free list
|
||||
* @free_list: anchor node of list of free resources in the pool
|
||||
* @mc_bus: pointer to the MC bus that owns this resource pool
|
||||
*/
|
||||
struct fsl_mc_resource_pool {
|
||||
enum fsl_mc_pool_type type;
|
||||
int max_count;
|
||||
int free_count;
|
||||
struct mutex mutex; /* serializes access to free_list */
|
||||
struct list_head free_list;
|
||||
struct fsl_mc_bus *mc_bus;
|
||||
};
|
||||
|
||||
/**
|
||||
* struct fsl_mc_bus - logical bus that corresponds to a physical DPRC
|
||||
* @mc_dev: fsl-mc device for the bus device itself.
|
||||
* @resource_pools: array of resource pools (one pool per resource type)
|
||||
* for this MC bus. These resources represent allocatable entities
|
||||
* from the physical DPRC.
|
||||
* @irq_resources: Pointer to array of IRQ objects for the IRQ pool
|
||||
* @scan_mutex: Serializes bus scanning
|
||||
* @dprc_attr: DPRC attributes
|
||||
*/
|
||||
struct fsl_mc_bus {
|
||||
struct fsl_mc_device mc_dev;
|
||||
struct fsl_mc_resource_pool resource_pools[FSL_MC_NUM_POOL_TYPES];
|
||||
struct fsl_mc_device_irq *irq_resources;
|
||||
struct mutex scan_mutex; /* serializes bus scanning */
|
||||
struct dprc_attributes dprc_attr;
|
||||
};
|
||||
|
||||
#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 fsl_mc_obj_desc *obj_desc,
|
||||
struct fsl_mc_io *mc_io,
|
||||
|
|
@ -27,6 +74,10 @@ int __init fsl_mc_allocator_driver_init(void);
|
|||
|
||||
void fsl_mc_allocator_driver_exit(void);
|
||||
|
||||
void fsl_mc_init_all_resource_pools(struct fsl_mc_device *mc_bus_dev);
|
||||
|
||||
void fsl_mc_cleanup_all_resource_pools(struct fsl_mc_device *mc_bus_dev);
|
||||
|
||||
int __must_check fsl_mc_resource_allocate(struct fsl_mc_bus *mc_bus,
|
||||
enum fsl_mc_pool_type pool_type,
|
||||
struct fsl_mc_resource
|
||||
|
|
@ -43,6 +94,14 @@ int __init its_fsl_mc_msi_init(void);
|
|||
|
||||
void its_fsl_mc_msi_cleanup(void);
|
||||
|
||||
int fsl_mc_find_msi_domain(struct device *mc_platform_dev,
|
||||
struct irq_domain **mc_msi_domain);
|
||||
|
||||
int fsl_mc_populate_irq_pool(struct fsl_mc_bus *mc_bus,
|
||||
unsigned int irq_count);
|
||||
|
||||
void fsl_mc_cleanup_irq_pool(struct fsl_mc_bus *mc_bus);
|
||||
|
||||
int __must_check fsl_create_mc_io(struct device *dev,
|
||||
phys_addr_t mc_portal_phys_addr,
|
||||
u32 mc_portal_size,
|
||||
|
|
@ -51,4 +110,6 @@ int __must_check fsl_create_mc_io(struct device *dev,
|
|||
|
||||
void fsl_destroy_mc_io(struct fsl_mc_io *mc_io);
|
||||
|
||||
bool fsl_mc_is_root_dprc(struct device *dev);
|
||||
|
||||
#endif /* _FSL_MC_PRIVATE_H_ */
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@
|
|||
#include <linux/msi.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/of_irq.h>
|
||||
#include "../include/mc-bus.h"
|
||||
#include "fsl-mc-private.h"
|
||||
|
||||
static struct irq_chip its_msi_irq_chip = {
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@
|
|||
*/
|
||||
|
||||
#include <linux/io.h>
|
||||
#include "../include/mc-bus.h"
|
||||
#include "../include/mc-sys.h"
|
||||
|
||||
#include "fsl-mc-private.h"
|
||||
|
|
|
|||
|
|
@ -1,77 +0,0 @@
|
|||
/*
|
||||
* Freescale Management Complex (MC) bus declarations
|
||||
*
|
||||
* Copyright (C) 2014-2016 Freescale Semiconductor, Inc.
|
||||
* Author: German Rivera <German.Rivera@freescale.com>
|
||||
*
|
||||
* 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_MCBUS_H_
|
||||
#define _FSL_MC_MCBUS_H_
|
||||
|
||||
#include "../include/mc.h"
|
||||
#include <linux/mutex.h>
|
||||
|
||||
/**
|
||||
* Maximum number of total IRQs that can be pre-allocated for an MC bus'
|
||||
* IRQ pool
|
||||
*/
|
||||
#define FSL_MC_IRQ_POOL_MAX_TOTAL_IRQS 256
|
||||
|
||||
/**
|
||||
* struct fsl_mc_resource_pool - Pool of MC resources of a given
|
||||
* type
|
||||
* @type: type of resources in the pool
|
||||
* @max_count: maximum number of resources in the pool
|
||||
* @free_count: number of free resources in the pool
|
||||
* @mutex: mutex to serialize access to the pool's free list
|
||||
* @free_list: anchor node of list of free resources in the pool
|
||||
* @mc_bus: pointer to the MC bus that owns this resource pool
|
||||
*/
|
||||
struct fsl_mc_resource_pool {
|
||||
enum fsl_mc_pool_type type;
|
||||
int max_count;
|
||||
int free_count;
|
||||
struct mutex mutex; /* serializes access to free_list */
|
||||
struct list_head free_list;
|
||||
struct fsl_mc_bus *mc_bus;
|
||||
};
|
||||
|
||||
/**
|
||||
* struct fsl_mc_bus - logical bus that corresponds to a physical DPRC
|
||||
* @mc_dev: fsl-mc device for the bus device itself.
|
||||
* @resource_pools: array of resource pools (one pool per resource type)
|
||||
* for this MC bus. These resources represent allocatable entities
|
||||
* from the physical DPRC.
|
||||
* @irq_resources: Pointer to array of IRQ objects for the IRQ pool
|
||||
* @scan_mutex: Serializes bus scanning
|
||||
* @dprc_attr: DPRC attributes
|
||||
*/
|
||||
struct fsl_mc_bus {
|
||||
struct fsl_mc_device mc_dev;
|
||||
struct fsl_mc_resource_pool resource_pools[FSL_MC_NUM_POOL_TYPES];
|
||||
struct fsl_mc_device_irq *irq_resources;
|
||||
struct mutex scan_mutex; /* serializes bus scanning */
|
||||
struct dprc_attributes dprc_attr;
|
||||
};
|
||||
|
||||
#define to_fsl_mc_bus(_mc_dev) \
|
||||
container_of(_mc_dev, struct fsl_mc_bus, mc_dev)
|
||||
|
||||
int fsl_mc_find_msi_domain(struct device *mc_platform_dev,
|
||||
struct irq_domain **mc_msi_domain);
|
||||
|
||||
int fsl_mc_populate_irq_pool(struct fsl_mc_bus *mc_bus,
|
||||
unsigned int irq_count);
|
||||
|
||||
void fsl_mc_cleanup_irq_pool(struct fsl_mc_bus *mc_bus);
|
||||
|
||||
void fsl_mc_init_all_resource_pools(struct fsl_mc_device *mc_bus_dev);
|
||||
|
||||
void fsl_mc_cleanup_all_resource_pools(struct fsl_mc_device *mc_bus_dev);
|
||||
|
||||
bool fsl_mc_is_root_dprc(struct device *dev);
|
||||
|
||||
#endif /* _FSL_MC_MCBUS_H_ */
|
||||
Загрузка…
Ссылка в новой задаче