A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-09 05:39:54 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "slimbus: Add changes to make slimbus GKI compliant"

Browse source
This commit is contained in:
qctecmdr 2020-03-23 02:28:04 -07:00 • committed by Gerrit - the friendly Code Review server
commit 738fdf4fd1
10 changed files with 109 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

6
drivers/of/Kconfig
View file

@ -99,12 +99,6 @@ config OF_RESERVED_MEM_CHECK
config OF_RESOLVE
bool
config OF_SLIMBUS
def_tristate SLIMBUS
depends on SLIMBUS
help
OpenFirmware SLIMBUS accessors
config OF_OVERLAY
bool "Device Tree overlays"
select OF_DYNAMIC

1
drivers/of/Makefile
View file

@ -12,7 +12,6 @@ obj-$(CONFIG_OF_UNITTEST) += unittest.o
obj-$(CONFIG_OF_MDIO) += of_mdio.o
obj-$(CONFIG_OF_RESERVED_MEM) += of_reserved_mem.o
obj-$(CONFIG_OF_RESOLVE) += resolver.o
obj-$(CONFIG_OF_SLIMBUS) += of_slimbus.o
obj-$(CONFIG_OF_OVERLAY) += overlay.o
obj-$(CONFIG_OF_NUMA) += of_numa.o

85
drivers/of/of_slimbus.c
View file

@ -1,85 +0,0 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.
*/
/* OF helpers for SLIMbus */
#include <linux/slimbus/slimbus.h>
#include <linux/irq.h>
#include <linux/slab.h>
#include <linux/of.h>
#include <linux/of_irq.h>
#include <linux/of_slimbus.h>
int of_register_slim_devices(struct slim_controller *ctrl)
{
struct device_node *node;
struct slim_boardinfo *binfo = NULL;
struct slim_boardinfo *temp;
int n = 0;
int ret = 0;
if (!ctrl->dev.of_node)
return -EINVAL;
for_each_available_child_of_node(ctrl->dev.of_node, node) {
struct property *prop;
struct slim_device *slim;
char *name;
prop = of_find_property(node, "elemental-addr", NULL);
if (!prop || prop->length != 6) {
dev_err(&ctrl->dev, "of_slim: invalid E-addr\n");
continue;
}
name = kzalloc(SLIMBUS_NAME_SIZE, GFP_KERNEL);
if (!name) {
ret = -ENOMEM;
of_node_put(node);
goto of_slim_err;
}
if (of_modalias_node(node, name, SLIMBUS_NAME_SIZE) < 0) {
dev_err(&ctrl->dev, "of_slim: modalias failure on %s\n",
node->full_name);
kfree(name);
continue;
}
slim = kzalloc(sizeof(struct slim_device), GFP_KERNEL);
if (!slim) {
ret = -ENOMEM;
kfree(name);
of_node_put(node);
goto of_slim_err;
}
memcpy(slim->e_addr, prop->value, 6);
temp = krealloc(binfo, (n + 1) * sizeof(struct slim_boardinfo),
GFP_KERNEL);
if (!temp) {
kfree(name);
kfree(slim);
ret = -ENOMEM;
of_node_put(node);
goto of_slim_err;
}
binfo = temp;
slim->dev.of_node = of_node_get(node);
slim->name = (const char *)name;
binfo[n].bus_num = ctrl->nr;
binfo[n].slim_slave = slim;
n++;
}
ret = slim_register_board_info(binfo, n);
if (!ret)
goto of_slim_ret;
of_slim_err:
while (n-- > 0) {
kfree(binfo[n].slim_slave->name);
kfree(binfo[n].slim_slave);
}
of_slim_ret:
kfree(binfo);
return ret;
}
EXPORT_SYMBOL(of_register_slim_devices);

3
drivers/slimbus/Kconfig
View file

@ -3,7 +3,7 @@
# SLIMbus driver configuration
#
menuconfig SLIMBUS
bool "SLIMbus support"
tristate "SLIMbus support"
depends on HAS_IOMEM
help
Slimbus is standard interface between baseband and
@ -50,4 +50,5 @@ config SLIMBUS_MSM_NGD
the bus using messaging interface, and communicating with master
component residing on ADSP for bandwidth and data-channel
management.
endif

3
drivers/slimbus/Makefile
View file

@ -4,4 +4,5 @@
#
obj-$(CONFIG_SLIMBUS) += slimbus.o
obj-$(CONFIG_SLIMBUS_MSM_CTRL) += slim-msm.o slim-msm-ctrl.o
obj-$(CONFIG_SLIMBUS_MSM_NGD) += slim-msm.o slim-msm-ngd.o
obj-$(CONFIG_SLIMBUS_MSM_NGD) += slimbus-ngd.o
slimbus-ngd-y := slim-msm.o slim-msm-ngd.o

3
drivers/slimbus/slim-msm-ctrl.c
View file

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.
* Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.
*/
#include <linux/irq.h>
@ -16,7 +16,6 @@
#include <linux/clk.h>
#include <linux/pm_runtime.h>
#include <linux/of.h>
#include <linux/of_slimbus.h>
#include <linux/msm-sps.h>
#include <linux/qdsp6v2/apr.h>
#include "slim-msm.h"

1
drivers/slimbus/slim-msm-ngd.c
View file

@ -19,7 +19,6 @@
#include <linux/pm_runtime.h>
#include <linux/of.h>
#include <linux/of_platform.h>
#include <linux/of_slimbus.h>
#include <linux/timer.h>
#include <linux/msm-sps.h>
#include <soc/qcom/service-locator.h>

79
drivers/slimbus/slimbus.c
View file

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.
* Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.
*/
#include <linux/kernel.h>
@ -11,6 +11,10 @@
#include <linux/idr.h>
#include <linux/pm_runtime.h>
#include <linux/slimbus/slimbus.h>
#include <linux/irq.h>
#include <linux/slab.h>
#include <linux/of.h>
#include <linux/of_irq.h>
#define SLIM_PORT_HDL(la, f, p) ((la)<<24 | (f) << 16 | (p))
@ -3437,4 +3441,77 @@ clk_pause_ret:
}
EXPORT_SYMBOL(slim_ctrl_clk_pause);
int of_register_slim_devices(struct slim_controller *ctrl)
{
struct device_node *node;
struct slim_boardinfo *binfo = NULL;
struct slim_boardinfo *temp;
int n = 0;
int ret = 0;
if (!ctrl->dev.of_node)
return -EINVAL;
for_each_available_child_of_node(ctrl->dev.of_node, node) {
struct property *prop;
struct slim_device *slim;
char *name;
prop = of_find_property(node, "elemental-addr", NULL);
if (!prop || prop->length != 6) {
dev_err(&ctrl->dev, "of_slim: invalid E-addr\n");
continue;
}
name = kzalloc(SLIMBUS_NAME_SIZE, GFP_KERNEL);
if (!name) {
ret = -ENOMEM;
of_node_put(node);
goto of_slim_err;
}
if (of_modalias_node(node, name, SLIMBUS_NAME_SIZE) < 0) {
dev_err(&ctrl->dev, "of_slim: modalias failure on %s\n",
node->full_name);
kfree(name);
continue;
}
slim = kzalloc(sizeof(struct slim_device), GFP_KERNEL);
if (!slim) {
ret = -ENOMEM;
kfree(name);
of_node_put(node);
goto of_slim_err;
}
memcpy(slim->e_addr, prop->value, 6);
temp = krealloc(binfo, (n + 1) * sizeof(struct slim_boardinfo),
GFP_KERNEL);
if (!temp) {
kfree(name);
kfree(slim);
ret = -ENOMEM;
of_node_put(node);
goto of_slim_err;
}
binfo = temp;
slim->dev.of_node = of_node_get(node);
slim->name = (const char *)name;
binfo[n].bus_num = ctrl->nr;
binfo[n].slim_slave = slim;
n++;
}
ret = slim_register_board_info(binfo, n);
if (!ret)
goto of_slim_ret;
of_slim_err:
while (n-- > 0) {
kfree(binfo[n].slim_slave->name);
kfree(binfo[n].slim_slave);
}
of_slim_ret:
kfree(binfo);
return ret;
}
EXPORT_SYMBOL(of_register_slim_devices);
MODULE_LICENSE("GPL v2");

27
include/linux/of_slimbus.h
View file

@ -1,27 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.
*/
#include <linux/slimbus/slimbus.h>
#include <linux/of_irq.h>
#if IS_ENABLED(CONFIG_OF_SLIMBUS)
/*
* of_slim_register_devices() - Register devices in the SLIMbus Device Tree
* @ctrl: slim_controller which devices should be registered to.
*
* This routine scans the SLIMbus Device Tree, allocating resources and
* creating slim_devices according to the SLIMbus Device Tree
* hierarchy. Details of this hierarchy can be found in
* Documentation/devicetree/bindings/slimbus. This routine is normally
* called from the probe routine of the driver registering as a
* slim_controller.
*/
extern int of_register_slim_devices(struct slim_controller *ctrl);
#else
static int of_register_slim_devices(struct slim_controller *ctrl)
{
return 0;
}
#endif /* CONFIG_OF_SLIMBUS */

29
include/linux/slimbus/slimbus.h
View file

@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.
* Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.
*/
#ifndef _LINUX_SLIMBUS_H
@ -9,6 +9,7 @@
#include <linux/device.h>
#include <linux/mutex.h>
#include <linux/mod_devicetable.h>
#include <linux/of_irq.h>
/* Interfaces between SLIMbus manager drivers and SLIMbus infrastructure. */
@ -1168,6 +1169,7 @@ extern void slim_ctrl_add_boarddevs(struct slim_controller *ctrl);
extern const
struct slim_device_id *slim_get_device_id(const struct slim_device *sdev);
#if IS_ENABLED(CONFIG_SLIMBUS)
/*
* slim_register_board_info: Board-initialization routine.
* @info: List of all devices on all controllers present on the board.
@ -1175,16 +1177,36 @@ struct slim_device_id *slim_get_device_id(const struct slim_device *sdev);
* API enumerates respective devices on corresponding controller.
* Called from board-init function.
*/
#ifdef CONFIG_SLIMBUS
extern int slim_register_board_info(struct slim_boardinfo const *info,
unsigned int n);
/*
* of_slim_register_devices() - Register devices in the SLIMbus Device Tree
* @ctrl: slim_controller which devices should be registered to.
*
* This routine scans the SLIMbus Device Tree, allocating resources and
* creating slim_devices according to the SLIMbus Device Tree
* hierarchy. Details of this hierarchy can be found in
* Documentation/devicetree/bindings/slimbus. This routine is normally
* called from the probe routine of the driver registering as a
* slim_controller.
*/
extern int of_register_slim_devices(struct slim_controller *ctrl);
#else
static inline int slim_register_board_info(struct slim_boardinfo const *info,
unsigned int n)
{
return 0;
}
#endif
static int of_register_slim_devices(struct slim_controller *ctrl)
{
return 0;
}
#endif /* CONFIG_OF_SLIMBUS */
static inline void *slim_get_ctrldata(const struct slim_controller *dev)
{
@ -1205,4 +1227,5 @@ static inline void slim_set_clientdata(struct slim_device *dev, void *data)
{
dev_set_drvdata(&dev->dev, data);
}
#endif /* _LINUX_SLIMBUS_H */