Skip to content

drivers/misc/amd-apml: add 2 DPC to SBRMI #260

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
modolaty wants to merge 1 commit into
base: integ_sp8
Choose a base branch
from
Open

drivers/misc/amd-apml: add 2 DPC to SBRMI #260

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 19 additions & 3 deletions drivers/misc/amd-apml/sbrmi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,11 @@
#define I3C_I2C_MSG_XFER_SIZE 0x2

/* DIMM temp */
#define DIMM_BASE_ID (0x80)
#define DIMM_TEMP_OFFSET (21)
// Default SP7/SP8 number of DIMMs per SOC is 16
// the following default DIMM ID for each SOC DIMM Ch is from SP7 Product specification
#define MAX_DIMM_COUNT (16)
Comment thread
modolaty marked this conversation as resolved.
uint32_t dimm_id[MAX_DIMM_COUNT]={0x87,0x83,0x85,0x81,0x86,0x82,0x84,0x80,0x8f,0x8b,0x8d,0x89,0x8e,0x8a,0x8c,0x88};
Comment thread
modolaty marked this conversation as resolved.

/* to hold the data.in, and data.out fields of for
* i3c_transfer to work when the MIPI driver is in
Expand Down Expand Up @@ -123,8 +126,13 @@ static int sbrmi_read(struct device *dev, enum hwmon_sensor_types type,
msg.data_out.mb_out[RD_WR_DATA_INDEX] = rmi_dev->pwr_limit_max;
break;
case hwmon_temp_input:
if (channel >= MAX_DIMM_COUNT) {
pr_err("SBRMI:hwmon_temp_input: Error Ch %d is >= Max %d\n", channel, MAX_DIMM_COUNT);
Comment thread
modolaty marked this conversation as resolved.
ret = -EINVAL;
goto out;
}
msg.cmd = SBRMI_READ_DIMM_THERMAL_SENSOR;
msg.data_in.mb_in[RD_WR_DATA_INDEX] = (DIMM_BASE_ID + channel);
msg.data_in.mb_in[RD_WR_DATA_INDEX] = dimm_id[channel];
ret = rmi_mailbox_xfer(rmi_dev, &msg);
if (ret < 0)
{
Expand All @@ -137,6 +145,7 @@ static int sbrmi_read(struct device *dev, enum hwmon_sensor_types type,

default:
ret = -EINVAL;
goto out;
}
if (!ret)
{
Expand All @@ -162,7 +171,7 @@ static int sbrmi_read(struct device *dev, enum hwmon_sensor_types type,
//*val= (tmp * 1000);
}
}

out:
mutex_unlock(&rmi_dev->lock);
return ret;
}
Expand Down Expand Up @@ -709,6 +718,13 @@ static int sbrmi_i3c_probe(struct i3c_device *i3cdev)
i3cdev->desc->info.pid);
}

// Read DIMM ID
ret = of_property_read_u32_array(dev->of_node, "dimm-ids", dimm_id, MAX_DIMM_COUNT);
if (ret) {
dev_info(dev, "SBRMI: Cannot read DIMM IDs, set them to default\n");
}
dev_info(dev, "SBRMI: DIMM ID[0] = %d\n", dimm_id[0]);

hwmon_dev_name = devm_kasprintf(dev, GFP_KERNEL, "sbrmi_%s",
sbrmi_addr_to_label(rmi_dev->dev_static_addr));

Expand Down