Unverified Commit 15c46d85 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'amlogic-drivers-for-v6.7' of... 

Merge tag 'amlogic-drivers-for-v6.7' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into soc/drivers

Amlogic drivers changes for v6.7:
- correct meson_sm_* API retval handling
- Use device_get_match_data() in meson SM

* tag 'amlogic-drivers-for-v6.7' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
  firmware: meson: Use device_get_match_data()
  drivers: meson: sm: correct meson_sm_* API retval handling

Link: https://lore.kernel.org/r/00ef6ab3-59c1-484a-9d70-50f16e4cc584@linaro.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents e855cbf2 5d59b6a4

drivers/firmware/meson/meson_sm.c

+16 −9
Original line number Diff line number Diff line
@@ -13,9 +13,10 @@ 
#include <linux/io.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/of_platform.h>

#include <linux/platform_device.h>

#include <linux/printk.h>

#include <linux/property.h>

#include <linux/types.h>

#include <linux/sizes.h>

 #include <linux/slab.h>
@@ -67,7 +68,7 @@ static u32 meson_sm_get_cmd(const struct meson_sm_chip *chip, 
	return cmd->smc_id;

}



static u32 __meson_sm_call(u32 cmd, u32 arg0, u32 arg1, u32 arg2,

static s32 __meson_sm_call(u32 cmd, u32 arg0, u32 arg1, u32 arg2,

			   u32 arg3, u32 arg4)

{

	struct arm_smccc_res res;
@@ -102,9 +103,10 @@ static void __iomem *meson_sm_map_shmem(u32 cmd_shmem, unsigned int size) 
 * Return:	0 on success, a negative value on error

 */

int meson_sm_call(struct meson_sm_firmware *fw, unsigned int cmd_index,

		  u32 *ret, u32 arg0, u32 arg1, u32 arg2, u32 arg3, u32 arg4)

		  s32 *ret, u32 arg0, u32 arg1, u32 arg2, u32 arg3, u32 arg4)

{

	u32 cmd, lret;

	u32 cmd;

	s32 lret;



	if (!fw->chip)

		return -ENOENT;
@@ -143,7 +145,7 @@ int meson_sm_call_read(struct meson_sm_firmware *fw, void *buffer, 
		       unsigned int bsize, unsigned int cmd_index, u32 arg0,

		       u32 arg1, u32 arg2, u32 arg3, u32 arg4)

{

	u32 size;

	s32 size;

	int ret;



	if (!fw->chip)
@@ -158,11 +160,16 @@ int meson_sm_call_read(struct meson_sm_firmware *fw, void *buffer, 
	if (meson_sm_call(fw, cmd_index, &size, arg0, arg1, arg2, arg3, arg4) < 0)

		return -EINVAL;



	if (size > bsize)

	if (size < 0 || size > bsize)

		return -EINVAL;



	ret = size;



	/* In some cases (for example GET_CHIP_ID command),

	 * SMC doesn't return the number of bytes read, even

	 * though the bytes were actually read into sm_shmem_out.

	 * So this check is needed.

	 */

	if (!size)

		size = bsize;
@@ -192,7 +199,7 @@ int meson_sm_call_write(struct meson_sm_firmware *fw, void *buffer, 
			unsigned int size, unsigned int cmd_index, u32 arg0,

			u32 arg1, u32 arg2, u32 arg3, u32 arg4)

{

	u32 written;

	s32 written;



	if (!fw->chip)

		return -ENOENT;
@@ -208,7 +215,7 @@ int meson_sm_call_write(struct meson_sm_firmware *fw, void *buffer, 
	if (meson_sm_call(fw, cmd_index, &written, arg0, arg1, arg2, arg3, arg4) < 0)

		return -EINVAL;



	if (!written)

	if (written <= 0 || written > size)

		return -EINVAL;



	return written;
@@ -291,7 +298,7 @@ static int __init meson_sm_probe(struct platform_device *pdev) 
	if (!fw)

		return -ENOMEM;



	chip = of_match_device(meson_sm_ids, dev)->data;

	chip = device_get_match_data(dev);

	if (!chip)

		return -EINVAL;

include/linux/firmware/meson/meson_sm.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ enum { 
struct meson_sm_firmware;



int meson_sm_call(struct meson_sm_firmware *fw, unsigned int cmd_index,

		  u32 *ret, u32 arg0, u32 arg1, u32 arg2, u32 arg3, u32 arg4);

		  s32 *ret, u32 arg0, u32 arg1, u32 arg2, u32 arg3, u32 arg4);

int meson_sm_call_write(struct meson_sm_firmware *fw, void *buffer,

			unsigned int b_size, unsigned int cmd_index, u32 arg0,

			u32 arg1, u32 arg2, u32 arg3, u32 arg4);