Skip to content

Dev 6.18.20 alertl minor fixes #303

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sathyapk wants to merge 3 commits into
base: dev_6.18.20
Choose a base branch
from
Open

Dev 6.18.20 alertl minor fixes #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ffd6a6f
misc: amd-apml: fix invalid returns in void stub functions
sathyapk Aug 5, 2026
a238881
misc: amd-apml: Fix modular SBRMI build
sathyapk Aug 5, 2026
cee1bc4
misc: amd-apml: fix bus_num and status types in apml_alertl
sathyapk Jun 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion drivers/misc/amd-apml/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#

obj-$(CONFIG_APML_COMMON) += apml_common.o
obj-$(CONFIG_APML_SBRMI) += sbrmi.o sbrmi-common.o
obj-$(CONFIG_APML_SBRMI) += apml_sbrmi.o
apml_sbrmi-y := sbrmi.o sbrmi-common.o
obj-$(CONFIG_APML_SBTSI) += apml_sbtsi.o
obj-$(CONFIG_APML_ALERTL) += apml_alertl.o
18 changes: 10 additions & 8 deletions drivers/misc/amd-apml/apml_alertl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@ MODULE_ALIAS("apml_alertl:" DRIVER_NAME);
* Event data contains address, bus number, PID (for I3C devices; 0 otherwise), and alert
* source information. See amd-apml.h for alert source details.
*/
static int send_uevent(u8 address, u8 bus_num, u32 alert_src,
static int send_uevent(u8 address, int bus_num, u32 alert_src,
u64 pid, struct device *dev)
{
char *alert_source[NUM_ENVP];
int ret = 0;
int i;

alert_source[ENVP_SRC_INDX] = kasprintf(GFP_KERNEL, "SOURCE=0x%08x", alert_src);
alert_source[ENVP_BUS_NUM_INDX] = kasprintf(GFP_KERNEL, "BUS_NUM=%u", bus_num);
alert_source[ENVP_BUS_NUM_INDX] = kasprintf(GFP_KERNEL, "BUS_NUM=%d", bus_num);
alert_source[ENVP_PID_INDX] = kasprintf(GFP_KERNEL, "PID=0x%016llx", pid);
alert_source[ENVP_ADDR_INDX] = kasprintf(GFP_KERNEL, "ADDRESS=0x%02x", address);
alert_source[NUM_ENVP - 1] = NULL;
Expand All @@ -62,7 +62,7 @@ static int send_uevent(u8 address, u8 bus_num, u32 alert_src,
}

dev_dbg(dev, "Sending uevent: Addr:0x%x Src:0x%08x\n bus:%d pid: 0x%llx\n",
address, alert_src, bus_num, pid);
address, alert_src, bus_num, pid);
kobject_uevent_env(&dev->kobj, KOBJ_CHANGE, alert_source);

out_free:
Expand All @@ -74,8 +74,9 @@ static int send_uevent(u8 address, u8 bus_num, u32 alert_src,

static int handle_rmi_device_alert(struct apml_device_node *device_node, struct device *dev)
{
int status = 0, ret;
u8 addr, bus_num;
unsigned int status = 0;
int ret, bus_num;
u8 addr;
u64 pid;

if (!device_node->rmi_dev || !device_node->rmi_dev->regmap) {
Expand Down Expand Up @@ -140,8 +141,9 @@ static int handle_rmi_device_alert(struct apml_device_node *device_node, struct
/* Handle TSI device alerts */
static int handle_tsi_device_alert(struct apml_device_node *device_node, struct device *dev)
{
int status = 0, ret;
u8 addr, bus_num;
unsigned int status = 0;
int ret, bus_num;
u8 addr;
u64 pid;

if (!device_node->tsi_dev || !device_node->tsi_dev->regmap) {
Expand Down Expand Up @@ -266,7 +268,7 @@ static int apml_alertl_probe(struct platform_device *pdev)

oob_alert->irq_num = ret;

/* Try to read socket-id property from DTS */
/* Try to read socket-num property from DTS */
ret = of_property_read_u8(np, "socket-num", &socket_num);
if (!ret) {
irq_name = devm_kasprintf(dev, GFP_KERNEL, "apml_irq%u", socket_num);
Expand Down
3 changes: 0 additions & 3 deletions drivers/misc/amd-apml/apml_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ static inline int apml_register_sbrmi_device(struct apml_sbrmi_device *rmi_dev)

static inline void apml_unregister_sbrmi_device(struct apml_sbrmi_device *rmi_dev)
{
return 0;
}

static inline int apml_register_sbtsi_device(struct apml_sbtsi_device *tsi_dev)
Expand All @@ -56,7 +55,6 @@ static inline int apml_register_sbtsi_device(struct apml_sbtsi_device *tsi_dev)

static inline void apml_unregister_sbtsi_device(struct apml_sbtsi_device *tsi_dev)
{
return 0
}

static inline struct apml_device_node *apml_get_device_node(struct apml_device_node *node)
Expand All @@ -66,7 +64,6 @@ static inline struct apml_device_node *apml_get_device_node(struct apml_device_n

static inline void apml_put_device_node(struct apml_device_node *node)
{
return 0;
}

#endif /* IS_ENABLED(CONFIG_APML_COMMON) */
Expand Down