@@ -36,6 +36,7 @@ static void qseecom_client_remove(void *data)
}
static int qseecom_client_register(struct platform_device *qseecom_dev,
+ void *data,
const struct qseecom_app_desc *desc)
{
struct qseecom_client *client;
@@ -56,6 +57,7 @@ static int qseecom_client_register(struct platform_device *qseecom_dev,
client->aux_dev.name = desc->dev_name;
client->aux_dev.dev.parent = &qseecom_dev->dev;
+ client->aux_dev.dev.platform_data = data;
client->aux_dev.dev.release = qseecom_client_release;
client->app_id = app_id;
@@ -89,12 +91,14 @@ static const struct qseecom_app_desc qcom_qseecom_apps[] = {
static int qcom_qseecom_probe(struct platform_device *qseecom_dev)
{
+ void *data = dev_get_platdata(&qseecom_dev->dev);
int ret;
int i;
/* Set up client devices for each base application */
for (i = 0; i < ARRAY_SIZE(qcom_qseecom_apps); i++) {
- ret = qseecom_client_register(qseecom_dev, &qcom_qseecom_apps[i]);
+ ret = qseecom_client_register(qseecom_dev, data,
+ &qcom_qseecom_apps[i]);
if (ret)
return ret;
}
@@ -2008,10 +2008,10 @@ static const struct of_device_id qcom_scm_qseecom_allowlist[] __maybe_unused = {
{ }
};
-static bool qcom_scm_qseecom_machine_is_allowed(void)
+static bool qcom_scm_qseecom_machine_is_allowed(unsigned long *quirks)
{
+ const struct of_device_id *match;
struct device_node *np;
- bool match;
np = of_find_node_by_path("/");
if (!np)
@@ -2020,6 +2020,11 @@ static bool qcom_scm_qseecom_machine_is_allowed(void)
match = of_match_node(qcom_scm_qseecom_allowlist, np);
of_node_put(np);
+ if (match && match->data)
+ memcpy(quirks, match->data, sizeof(*quirks));
+ else
+ *quirks = 0;
+
return match;
}
@@ -2034,6 +2039,7 @@ static void qcom_scm_qseecom_free(void *data)
static int qcom_scm_qseecom_init(struct qcom_scm *scm)
{
struct platform_device *qseecom_dev;
+ unsigned long quirks;
u32 version;
int ret;
@@ -2054,7 +2060,7 @@ static int qcom_scm_qseecom_init(struct qcom_scm *scm)
dev_info(scm->dev, "qseecom: found qseecom with version 0x%x\n", version);
- if (!qcom_scm_qseecom_machine_is_allowed()) {
+ if (!qcom_scm_qseecom_machine_is_allowed(&quirks)) {
dev_info(scm->dev, "qseecom: untested machine, skipping\n");
return 0;
}
@@ -2063,17 +2069,11 @@ static int qcom_scm_qseecom_init(struct qcom_scm *scm)
* Set up QSEECOM interface device. All application clients will be
* set up and managed by the corresponding driver for it.
*/
- qseecom_dev = platform_device_alloc("qcom_qseecom", -1);
- if (!qseecom_dev)
- return -ENOMEM;
-
- qseecom_dev->dev.parent = scm->dev;
-
- ret = platform_device_add(qseecom_dev);
- if (ret) {
- platform_device_put(qseecom_dev);
- return ret;
- }
+ qseecom_dev = platform_device_register_data(scm->dev,
+ "qcom_qseecom", -1,
+ &quirks, sizeof(quirks));
+ if (IS_ERR(qseecom_dev))
+ return PTR_ERR(qseecom_dev);
return devm_add_action_or_reset(scm->dev, qcom_scm_qseecom_free, qseecom_dev);
}
Some of QSEECOM implementations might need additional quirks (e.g. some of the platforms don't (yet) support read-write UEFI variables access). Pass the quirks to the QSEECOM driver and down to individual app drivers. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> --- drivers/firmware/qcom/qcom_qseecom.c | 6 +++++- drivers/firmware/qcom/qcom_scm.c | 28 ++++++++++++++-------------- 2 files changed, 19 insertions(+), 15 deletions(-)