Unverified Commit e845bcc8 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'riscv-soc-fixes-for-v6.9-rc6' of... 

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: default avatarConor 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: default avatarArnd Bergmann <arnd@arndb.de>
parents daa1bd43 3aa20d1f

drivers/cache/sifive_ccache.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/firmware/microchip/mpfs-auto-update.c

+5 −3
Original line number Diff line number Diff line
@@ -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;