Commit 1b06739c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "staging: fsl-mc: remove dpmng API files" 



This reverts commit b065307f.

The whole series is broken, so back it all out.

Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
Cc: Laurentiu Tudor <laurentiu.tudor@nxp.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 94ff934d

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

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

 * Copyright 2013-2016 Freescale Semiconductor Inc.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions are met:

 * * Redistributions of source code must retain the above copyright

 * notice, this list of conditions and the following disclaimer.

 * * Redistributions in binary form must reproduce the above copyright

 * notice, this list of conditions and the following disclaimer in the

 * documentation and/or other materials provided with the distribution.

 * * Neither the name of the above-listed copyright holders nor the

 * names of any contributors may be used to endorse or promote products

 * derived from this software without specific prior written permission.

 *

 * ALTERNATIVELY, this software may be distributed under the terms of the

 * GNU General Public License ("GPL") as published by the Free Software

 * Foundation, either version 2 of that License or (at your option) any

 * later version.

 *

 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE

 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

 * POSSIBILITY OF SUCH DAMAGE.

 */

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

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

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



#include "dpmng-cmd.h"



/**

 * mc_get_version() - Retrieves the Management Complex firmware

 *			version information

 * @mc_io:		Pointer to opaque I/O object

 * @cmd_flags:		Command flags; one or more of 'MC_CMD_FLAG_'

 * @mc_ver_info:	Returned version information structure

 *

 * Return:	'0' on Success; Error code otherwise.

 */

int mc_get_version(struct fsl_mc_io *mc_io,

		   u32 cmd_flags,

		   struct mc_version *mc_ver_info)

{

	struct mc_command cmd = { 0 };

	struct dpmng_rsp_get_version *rsp_params;

	int err;



	/* prepare command */

	cmd.header = mc_encode_cmd_header(DPMNG_CMDID_GET_VERSION,

					  cmd_flags,

					  0);



	/* send command to mc*/

	err = mc_send_command(mc_io, &cmd);

	if (err)

		return err;



	/* retrieve response parameters */

	rsp_params = (struct dpmng_rsp_get_version *)cmd.params;

	mc_ver_info->revision = le32_to_cpu(rsp_params->revision);

	mc_ver_info->major = le32_to_cpu(rsp_params->version_major);

	mc_ver_info->minor = le32_to_cpu(rsp_params->version_minor);



	return 0;

}

EXPORT_SYMBOL(mc_get_version);

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

+1 −52
Original line number Diff line number Diff line
@@ -20,12 +20,11 @@ 
#include <linux/bitops.h>

#include <linux/msi.h>

#include <linux/dma-mapping.h>

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

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

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



#include "fsl-mc-private.h"

#include "dprc-cmd.h"

#include "dpmng-cmd.h"



/**

 * Default DMA mask for devices on a fsl-mc bus
@@ -60,20 +59,6 @@ struct fsl_mc_addr_translation_range { 
	phys_addr_t start_phys_addr;

};



/**

 * struct mc_version

 * @major: Major version number: incremented on API compatibility changes

 * @minor: Minor version number: incremented on API additions (that are

 *		backward compatible); reset when major version is incremented

 * @revision: Internal revision number: incremented on implementation changes

 *		and/or bug fixes that have no impact on API

 */

struct mc_version {

	u32 major;

	u32 minor;

	u32 revision;

};



/**

 * fsl_mc_bus_match - device to driver matching callback

 * @dev: the fsl-mc device to match against
@@ -252,42 +237,6 @@ void fsl_mc_driver_unregister(struct fsl_mc_driver *mc_driver) 
}

EXPORT_SYMBOL_GPL(fsl_mc_driver_unregister);



/**

 * mc_get_version() - Retrieves the Management Complex firmware

 *			version information

 * @mc_io:		Pointer to opaque I/O object

 * @cmd_flags:		Command flags; one or more of 'MC_CMD_FLAG_'

 * @mc_ver_info:	Returned version information structure

 *

 * Return:	'0' on Success; Error code otherwise.

 */

static int mc_get_version(struct fsl_mc_io *mc_io,

			  u32 cmd_flags,

			  struct mc_version *mc_ver_info)

{

	struct mc_command cmd = { 0 };

	struct dpmng_rsp_get_version *rsp_params;

	int err;



	/* prepare command */

	cmd.header = mc_encode_cmd_header(DPMNG_CMDID_GET_VERSION,

					  cmd_flags,

					  0);



	/* send command to mc*/

	err = mc_send_command(mc_io, &cmd);

	if (err)

		return err;



	/* retrieve response parameters */

	rsp_params = (struct dpmng_rsp_get_version *)cmd.params;

	mc_ver_info->revision = le32_to_cpu(rsp_params->revision);

	mc_ver_info->major = le32_to_cpu(rsp_params->version_major);

	mc_ver_info->minor = le32_to_cpu(rsp_params->version_minor);



	return 0;

}



/**

 * fsl_mc_get_root_dprc - function to traverse to the root dprc

 */

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

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

 * Copyright 2013-2016 Freescale Semiconductor Inc.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions are met:

 * * Redistributions of source code must retain the above copyright

 * notice, this list of conditions and the following disclaimer.

 * * Redistributions in binary form must reproduce the above copyright

 * notice, this list of conditions and the following disclaimer in the

 * documentation and/or other materials provided with the distribution.

 * * Neither the name of the above-listed copyright holders nor the

 * names of any contributors may be used to endorse or promote products

 * derived from this software without specific prior written permission.

 *

 *

 * ALTERNATIVELY, this software may be distributed under the terms of the

 * GNU General Public License ("GPL") as published by the Free Software

 * Foundation, either version 2 of that License or (at your option) any

 * later version.

 *

 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE

 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

 * POSSIBILITY OF SUCH DAMAGE.

 */

#ifndef __FSL_DPMNG_H

#define __FSL_DPMNG_H



/*

 * Management Complex General API

 * Contains general API for the Management Complex firmware

 */



struct fsl_mc_io;



/**

 * Management Complex firmware version information

 */

#define MC_VER_MAJOR 8

#define MC_VER_MINOR 0



/**

 * struct mc_version

 * @major: Major version number: incremented on API compatibility changes

 * @minor: Minor version number: incremented on API additions (that are

 *		backward compatible); reset when major version is incremented

 * @revision: Internal revision number: incremented on implementation changes

 *		and/or bug fixes that have no impact on API

 */

struct mc_version {

	u32 major;

	u32 minor;

	u32 revision;

};



int mc_get_version(struct fsl_mc_io *mc_io,

		   u32 cmd_flags,

		   struct mc_version *mc_ver_info);



#endif /* __FSL_DPMNG_H */