From: Phil Elwell <phil@raspberrypi.com>
Date: Thu, 14 Oct 2021 09:53:37 +0000 (+0100)
Subject: Merge tag 'v5.10.65' into rpi-5.10.y
X-Git-Tag: submit/tizen/20220208.074352~721
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a35653ed8ec2d69b4ed1272617817528baddf07f;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'v5.10.65' into rpi-5.10.y

This is the 5.10.65 stable release

Signed-off-by: Phil Elwell <phil@raspberrypi.com>
---

a35653ed8ec2d69b4ed1272617817528baddf07f
diff --cc drivers/firmware/raspberrypi.c
index 9179d65,1d965c1..849e63b
--- a/drivers/firmware/raspberrypi.c
+++ b/drivers/firmware/raspberrypi.c
@@@ -28,11 -28,10 +29,13 @@@ struct rpi_firmware 
  	struct mbox_chan *chan; /* The property channel. */
  	struct completion c;
  	u32 enabled;
 +	u32 get_throttled;
+ 
+ 	struct kref consumers;
  };
  
 +static struct platform_device *g_pdev;
 +
  static DEFINE_MUTEX(transaction_lock);
  
  static void response_callback(struct mbox_client *cl, void *msg)
@@@ -361,12 -269,11 +383,13 @@@ static int rpi_firmware_probe(struct pl
  	}
  
  	init_completion(&fw->c);
+ 	kref_init(&fw->consumers);
  
  	platform_set_drvdata(pdev, fw);
 +	g_pdev = pdev;
  
  	rpi_firmware_print_firmware_revision(fw);
 +	rpi_firmware_print_firmware_hash(fw);
  	rpi_register_hwmon_driver(dev, fw);
  	rpi_register_clk_driver(dev);
  
@@@ -391,9 -298,9 +414,10 @@@ static int rpi_firmware_remove(struct p
  	rpi_hwmon = NULL;
  	platform_device_unregister(rpi_clk);
  	rpi_clk = NULL;
- 	mbox_free_channel(fw->chan);
 +	g_pdev = NULL;
  
+ 	rpi_firmware_put(fw);
+ 
  	return 0;
  }