iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

memory: brcmstb: dpfe: Fixup API version/commands for 7211

Browse Source 
7211 uses a newer version of API v2 which is half way between what was
defined as API v3 and what used to be called API v2 but was used with
DPFE firmwares with major versions 1.x.x.x. Starting with **the new**
API v2, we are no longer getting loadable firmware images, so the
capability to load it is removed (like v3).

To avoid spreading more confusion, map 7268/7271/7278 to the old DPFE
API version 2, 7211 to the new API v2 and introduce the specific
commands for that, and leave newer versions to map to API v3.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Markus Mayer <mmayer@broadcom.com>
This commit is contained in:
Florian Fainelli 2019-10-15 15:45:13 -07:00
parent 5d06f53d95
commit b61d3e87b6
1 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
drivers/memory/brcmstb_dpfe.c
View File

@ -231,9 +231,13 @@ static struct attribute *dpfe_v3_attrs[] = {
}; };
ATTRIBUTE_GROUPS(dpfe_v3); ATTRIBUTE_GROUPS(dpfe_v3);
/* API v2 firmware commands */ /*
static const struct dpfe_api dpfe_api_v2 = { * Old API v2 firmware commands, as defined in the rev 0.61 specification, we
.version = 2, * use a version set to 1 to denote that it is not compatible with the new API
* v2 and onwards.
*/
static const struct dpfe_api dpfe_api_old_v2 = {
.version = 1,
.fw_name = "dpfe.bin", .fw_name = "dpfe.bin",
.sysfs_attrs = dpfe_v2_groups, .sysfs_attrs = dpfe_v2_groups,
.command = { .command = {
@ -258,6 +262,30 @@ static const struct dpfe_api dpfe_api_v2 = {
} }
}; };
/*
* API v2 firmware commands, as defined in the rev 0.8 specification, named new
* v2 here
*/
static const struct dpfe_api dpfe_api_new_v2 = {
.version = 2,
.fw_name = NULL, /* We expect the firmware to have been downloaded! */
.sysfs_attrs = dpfe_v2_groups,
.command = {
[DPFE_CMD_GET_INFO] = {
[MSG_HEADER] = DPFE_MSG_TYPE_COMMAND,
[MSG_COMMAND] = 0x101,
},
[DPFE_CMD_GET_REFRESH] = {
[MSG_HEADER] = DPFE_MSG_TYPE_COMMAND,
[MSG_COMMAND] = 0x201,
},
[DPFE_CMD_GET_VENDOR] = {
[MSG_HEADER] = DPFE_MSG_TYPE_COMMAND,
[MSG_COMMAND] = 0x202,
},
}
};
/* API v3 firmware commands */ /* API v3 firmware commands */
static const struct dpfe_api dpfe_api_v3 = { static const struct dpfe_api dpfe_api_v3 = {
.version = 3, .version = 3,
@ -390,7 +418,7 @@ static void __finalize_command(struct brcmstb_dpfe_priv *priv)
* It depends on the API version which MBOX register we have to write to * It depends on the API version which MBOX register we have to write to
* to signal we are done. * to signal we are done.
*/ */
release_mbox = (priv->dpfe_api->version < 3) release_mbox = (priv->dpfe_api->version < 2)
? REG_TO_HOST_MBOX : REG_TO_DCPU_MBOX; ? REG_TO_HOST_MBOX : REG_TO_DCPU_MBOX;
writel_relaxed(0, priv->regs + release_mbox); writel_relaxed(0, priv->regs + release_mbox);
} }
@ -886,10 +914,10 @@ static int brcmstb_dpfe_remove(struct platform_device *pdev)
static const struct of_device_id brcmstb_dpfe_of_match[] = { static const struct of_device_id brcmstb_dpfe_of_match[] = {
/* Use legacy API v2 for a select number of chips */ /* Use legacy API v2 for a select number of chips */
{ .compatible = "brcm,bcm7268-dpfe-cpu", .data = &dpfe_api_v2 }, { .compatible = "brcm,bcm7268-dpfe-cpu", .data = &dpfe_api_old_v2 },
{ .compatible = "brcm,bcm7271-dpfe-cpu", .data = &dpfe_api_v2 }, { .compatible = "brcm,bcm7271-dpfe-cpu", .data = &dpfe_api_old_v2 },
{ .compatible = "brcm,bcm7278-dpfe-cpu", .data = &dpfe_api_v2 }, { .compatible = "brcm,bcm7278-dpfe-cpu", .data = &dpfe_api_old_v2 },
{ .compatible = "brcm,bcm7211-dpfe-cpu", .data = &dpfe_api_v2 }, { .compatible = "brcm,bcm7211-dpfe-cpu", .data = &dpfe_api_new_v2 },
/* API v3 is the default going forward */ /* API v3 is the default going forward */
{ .compatible = "brcm,dpfe-cpu", .data = &dpfe_api_v3 }, { .compatible = "brcm,dpfe-cpu", .data = &dpfe_api_v3 },
{} {}