mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

RISC-V SoC driver fixes for v6.9-rc6 

firmware:
 Two changes for misleading printouts from the auto update driver, one
 for an erroneous success message and the other to make it clear
 addresses are in hex.
 
 cache:
 Samuel's fix for the ccache driver left an unused variable, so he
 sent a follow up patch to silence that complaint.
 
 Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
 -----BEGIN PGP SIGNATURE-----
 
 iHUEABYIAB0WIQRh246EGq/8RLhDjO14tDGHoIJi0gUCZiza9gAKCRB4tDGHoIJi
 0ilxAQCxhcflEAdPdRBjyqfzsex66mCIhLcoUYSvnjEuLv/7QgD/bpLaXPKsUS57
 YcZ0Bqoxghi65Y0hjL0XUbrF375AwAM=
 =TQN3
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmYwyHoACgkQYKtH/8kJ
 UicFtg//Veirn3n2bLhifaQkmi+ZVmDei15tyizRyA+rFBKWU+5oWYb+t8SPSVbR
 DRQgbDNm0juS/d8+V2SSVI83rZQJk+ehImiq1Gi/C9zQKyqjNEVbJL2DngWWA9Ha
 Evmv80YHSFTpYt62eStCpV4WdkZIVKaRA9TaJKoAERh67R6a09U+ikrAry4zTQfE
 X8FYH9snSbkgUVFnmeZ4DbxRPSEEi1iTi8mcnFt3qWsd9VyqS0lVvI2GJyaJXHlo
 XPtKFgCdTr4GuJhYQ7Aj3XWhp6AYyOZJP5FqKQxE/3mE/BMBKUHBOogvyy0RGyBw
 tsIroOE6rbEdxs7LfoyIKIOm77DZPrIF1CQdwKXRwAqv52M1/5e9RjCIVdEM3gec
 3IvdGYuxkgrNPSGLOknx5T/6cchxKwdFtOeMBitRdvsa8OLFzOVU1UQfrBxxjfpY
 jhJYUDghU/IZfsGywPCmgiCBX+xA+ki11cU42oKXx08+Wij0U3c9arN5MlFFROAQ
 zbzbXAhgP4dqFdSwBO955/pjx0aeLbIcbBRcPuhu0BqP2melvj7ikv/z9QUPByJ1
 KRezufXDLwKkUSLd7b6itc7/PbHwFwnY4ESXsRFiAptJdxz009uylhOqlh6h94+k
 2zTnkhipXbun+TL+FTwSyYDOKZHTUyKtnxHL1LLLLkc8zPrzZ2I=
 =XAYv
 -----END PGP SIGNATURE-----

Merge tag 'riscv-soc-fixes-for-v6.9-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux into arm/fixes

RISC-V SoC driver fixes for v6.9-rc6

firmware:
Two changes for misleading printouts from the auto update driver, one
for an erroneous success message and the other to make it clear
addresses are in hex.

cache:
Samuel's fix for the ccache driver left an unused variable, so he
sent a follow up patch to silence that complaint.

Signed-off-by: Conor Dooley <conor.dooley@microchip.com>

* tag 'riscv-soc-fixes-for-v6.9-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux:
  firmware: microchip: clarify that sizes and addresses are in hex
  firmware: microchip: don't unconditionally print validation success
  cache: sifive_ccache: Silence unused variable warning

Link: https://lore.kernel.org/r/20240427-unflawed-humorless-690472f9c5a0@spud
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2024-04-30 12:31:21 +02:00
parent daa1bd43e5 3aa20d1f7b
commit e845bcc8cf
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/cache/sifive_ccache.c vendored
View File

@ -290,7 +290,7 @@ static int __init sifive_ccache_init(void)
struct device_node *np;
struct resource res;
const struct of_device_id *match;
unsigned long quirks;
unsigned long quirks __maybe_unused;
int rc;
np = of_find_matching_node_and_match(NULL, sifive_ccache_ids, &match);

8
drivers/firmware/microchip/mpfs-auto-update.c
View File

@ -206,10 +206,12 @@ static int mpfs_auto_update_verify_image(struct fw_upload *fw_uploader)
if (ret | response->resp_status) {
dev_warn(priv->dev, "Verification of Upgrade Image failed!\n");
ret = ret ? ret : -EBADMSG;
goto free_message;
}
dev_info(priv->dev, "Verification of Upgrade Image passed!\n");
free_message:
devm_kfree(priv->dev, message);
free_response:
devm_kfree(priv->dev, response);
@ -265,7 +267,7 @@ static int mpfs_auto_update_set_image_address(struct mpfs_auto_update_priv *priv
AUTO_UPDATE_DIRECTORY_WIDTH);
memset(buffer + AUTO_UPDATE_BLANK_DIRECTORY, 0x0, AUTO_UPDATE_DIRECTORY_WIDTH);
dev_info(priv->dev, "Writing the image address (%x) to the flash directory (%llx)\n",
dev_info(priv->dev, "Writing the image address (0x%x) to the flash directory (0x%llx)\n",
image_address, directory_address);
ret = mtd_write(priv->flash, 0x0, erase_size, &bytes_written, (u_char *)buffer);
@ -313,7 +315,7 @@ static int mpfs_auto_update_write_bitstream(struct fw_upload *fw_uploader, const
erase.len = round_up(size, (size_t)priv->flash->erasesize);
erase.addr = image_address;
dev_info(priv->dev, "Erasing the flash at address (%x)\n", image_address);
dev_info(priv->dev, "Erasing the flash at address (0x%x)\n", image_address);
ret = mtd_erase(priv->flash, &erase);
if (ret)
goto out;
@ -323,7 +325,7 @@ static int mpfs_auto_update_write_bitstream(struct fw_upload *fw_uploader, const
* will do all of that itself - including verifying that the bitstream
* is valid.
*/
dev_info(priv->dev, "Writing the image to the flash at address (%x)\n", image_address);
dev_info(priv->dev, "Writing the image to the flash at address (0x%x)\n", image_address);
ret = mtd_write(priv->flash, (loff_t)image_address, size, &bytes_written, data);
if (ret)
goto out;