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

Commit 9c692d5a authored by Bogdan Purcareata's avatar Bogdan Purcareata Committed by Greg Kroah-Hartman
Browse files

staging: fsl-mc: Move DPBP out of staging 



Move the source files out of staging into their final locations:
- dpbp.c goes to drivers/bus/fsl-mc/, next to the core infrastructure
- dpbp-cmd.h gets merged into drivers/bus/fsl-mc/fsl-mc-private.h, next
  to the other internally used APIs
- dpbp.h gets merged into include/linux/fsl/mc.h, exposing the public
  API

Update references in the dpaa2-eth staging driver.

DPBP stands for Data Path Buffer Pool - you can read more about the
object in Documentation/networking/dpaa2/overview.rst

Signed-off-by: default avatarBogdan Purcareata <bogdan.purcareata@nxp.com>
Reviewed-by: default avatarLaurentiu Tudor <laurentiu.tudor@nxp.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d64c2a76

drivers/bus/fsl-mc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ obj-$(CONFIG_FSL_MC_BUS) += mc-bus-driver.o 
mc-bus-driver-objs := fsl-mc-bus.o \

		      mc-sys.o \

		      mc-io.o \

		      dpbp.o \

		      dprc.o \

		      dprc-driver.o \

		      fsl-mc-allocator.o \

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

+2 −2
Original line number Diff line number Diff line
@@ -5,9 +5,9 @@ 
 */

#include <linux/kernel.h>

#include <linux/fsl/mc.h>

#include "../include/dpbp.h"

#include <linux/fsl/mc.h>



#include "dpbp-cmd.h"

#include "fsl-mc-private.h"



/**

 * dpbp_open() - Open a control session for the specified object.

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

+39 −0
Original line number Diff line number Diff line
@@ -379,6 +379,45 @@ int dprc_get_container_id(struct fsl_mc_io *mc_io, 
			  u32 cmd_flags,

			  int *container_id);



/*

 * Data Path Buffer Pool (DPBP) API

 */



/* DPBP Version */

#define DPBP_VER_MAJOR				3

#define DPBP_VER_MINOR				2



/* Command versioning */

#define DPBP_CMD_BASE_VERSION			1

#define DPBP_CMD_ID_OFFSET			4



#define DPBP_CMD(id)	(((id) << DPBP_CMD_ID_OFFSET) | DPBP_CMD_BASE_VERSION)



/* Command IDs */

#define DPBP_CMDID_CLOSE		DPBP_CMD(0x800)

#define DPBP_CMDID_OPEN			DPBP_CMD(0x804)



#define DPBP_CMDID_ENABLE		DPBP_CMD(0x002)

#define DPBP_CMDID_DISABLE		DPBP_CMD(0x003)

#define DPBP_CMDID_GET_ATTR		DPBP_CMD(0x004)

#define DPBP_CMDID_RESET		DPBP_CMD(0x005)



struct dpbp_cmd_open {

	__le32 dpbp_id;

};



#define DPBP_ENABLE			0x1



struct dpbp_rsp_get_attributes {

	/* response word 0 */

	__le16 pad;

	__le16 bpid;

	__le32 id;

	/* response word 1 */

	__le16 version_major;

	__le16 version_minor;

};



/**

 * Maximum number of total IRQs that can be pre-allocated for an MC bus'

 * IRQ pool

drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h

+1 −1
Original line number Diff line number Diff line
@@ -35,10 +35,10 @@ 


#include <linux/netdevice.h>

#include <linux/if_vlan.h>

#include <linux/fsl/mc.h>



#include "../../fsl-mc/include/dpaa2-io.h"

#include "../../fsl-mc/include/dpaa2-fd.h"

#include "../../fsl-mc/include/dpbp.h"

#include "../../fsl-mc/include/dpcon.h"

#include "dpni.h"

#include "dpni-cmd.h"

drivers/staging/fsl-mc/bus/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -4,8 +4,7 @@ 
#

# Copyright (C) 2014 Freescale Semiconductor, Inc.

#

obj-$(CONFIG_FSL_MC_BUS) += dpbp.o \

			    dpcon.o

obj-$(CONFIG_FSL_MC_BUS) += dpcon.o



# MC DPIO driver

obj-$(CONFIG_FSL_MC_DPIO) += dpio/