提交 1ce2ef96 编写于 作者: P Phil Elwell 提交者: Zheng Zengkai

clk-bcm2835: Read max core clock from firmware

raspberrypi inclusion
category: feature
bugzilla: 50432

--------------------------------

The VPU is responsible for managing the core clock, usually under
direction from the bcm2835-cpufreq driver but not via the clk-bcm2835
driver. Since the core frequency can change without warning, it is
safer to report the maximum clock rate to users of the core clock -
I2C, SPI and the mini UART - to err on the safe side when calculating
clock divisors.

If the DT node for the clock driver includes a reference to the
firmware node, use the firmware API to query the maximum core clock
instead of reading the divider registers.

Prior to this patch, a "100KHz" I2C bus was sometimes clocked at about
160KHz. In particular, switching to the 4.9 kernel was likely to break
SenseHAT usage on a Pi3.
Signed-off-by: NPhil Elwell <phil@raspberrypi.org>
Signed-off-by: NFang Yafen <yafen@iscas.ac.cn>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 c10b8ef4
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <dt-bindings/clock/bcm2835.h> #include <dt-bindings/clock/bcm2835.h>
#include <soc/bcm2835/raspberrypi-firmware.h>
#define CM_PASSWORD 0x5a000000 #define CM_PASSWORD 0x5a000000
...@@ -295,6 +296,8 @@ ...@@ -295,6 +296,8 @@
#define SOC_BCM2711 BIT(1) #define SOC_BCM2711 BIT(1)
#define SOC_ALL (SOC_BCM2835 | SOC_BCM2711) #define SOC_ALL (SOC_BCM2835 | SOC_BCM2711)
#define VCMSG_ID_CORE_CLOCK 4
/* /*
* Names of clocks used within the driver that need to be replaced * Names of clocks used within the driver that need to be replaced
* with an external parent's name. This array is in the order that * with an external parent's name. This array is in the order that
...@@ -313,6 +316,7 @@ static const char *const cprman_parent_names[] = { ...@@ -313,6 +316,7 @@ static const char *const cprman_parent_names[] = {
struct bcm2835_cprman { struct bcm2835_cprman {
struct device *dev; struct device *dev;
void __iomem *regs; void __iomem *regs;
struct rpi_firmware *fw;
spinlock_t regs_lock; /* spinlock for all clocks */ spinlock_t regs_lock; /* spinlock for all clocks */
unsigned int soc; unsigned int soc;
...@@ -1016,6 +1020,30 @@ static unsigned long bcm2835_clock_get_rate(struct clk_hw *hw, ...@@ -1016,6 +1020,30 @@ static unsigned long bcm2835_clock_get_rate(struct clk_hw *hw,
return bcm2835_clock_rate_from_divisor(clock, parent_rate, div); return bcm2835_clock_rate_from_divisor(clock, parent_rate, div);
} }
static unsigned long bcm2835_clock_get_rate_vpu(struct clk_hw *hw,
unsigned long parent_rate)
{
struct bcm2835_clock *clock = bcm2835_clock_from_hw(hw);
struct bcm2835_cprman *cprman = clock->cprman;
if (cprman->fw) {
struct {
u32 id;
u32 val;
} packet;
packet.id = VCMSG_ID_CORE_CLOCK;
packet.val = 0;
if (!rpi_firmware_property(cprman->fw,
RPI_FIRMWARE_GET_MAX_CLOCK_RATE,
&packet, sizeof(packet)))
return packet.val;
}
return bcm2835_clock_get_rate(hw, parent_rate);
}
static void bcm2835_clock_wait_busy(struct bcm2835_clock *clock) static void bcm2835_clock_wait_busy(struct bcm2835_clock *clock)
{ {
struct bcm2835_cprman *cprman = clock->cprman; struct bcm2835_cprman *cprman = clock->cprman;
...@@ -1304,7 +1332,7 @@ static int bcm2835_vpu_clock_is_on(struct clk_hw *hw) ...@@ -1304,7 +1332,7 @@ static int bcm2835_vpu_clock_is_on(struct clk_hw *hw)
*/ */
static const struct clk_ops bcm2835_vpu_clock_clk_ops = { static const struct clk_ops bcm2835_vpu_clock_clk_ops = {
.is_prepared = bcm2835_vpu_clock_is_on, .is_prepared = bcm2835_vpu_clock_is_on,
.recalc_rate = bcm2835_clock_get_rate, .recalc_rate = bcm2835_clock_get_rate_vpu,
.set_rate = bcm2835_clock_set_rate, .set_rate = bcm2835_clock_set_rate,
.determine_rate = bcm2835_clock_determine_rate, .determine_rate = bcm2835_clock_determine_rate,
.set_parent = bcm2835_clock_set_parent, .set_parent = bcm2835_clock_set_parent,
...@@ -2279,6 +2307,7 @@ static int bcm2835_clk_probe(struct platform_device *pdev) ...@@ -2279,6 +2307,7 @@ static int bcm2835_clk_probe(struct platform_device *pdev)
const struct bcm2835_clk_desc *desc; const struct bcm2835_clk_desc *desc;
const size_t asize = ARRAY_SIZE(clk_desc_array); const size_t asize = ARRAY_SIZE(clk_desc_array);
const struct cprman_plat_data *pdata; const struct cprman_plat_data *pdata;
struct device_node *fw_node;
size_t i; size_t i;
u32 clk_id; u32 clk_id;
int ret; int ret;
...@@ -2299,6 +2328,14 @@ static int bcm2835_clk_probe(struct platform_device *pdev) ...@@ -2299,6 +2328,14 @@ static int bcm2835_clk_probe(struct platform_device *pdev)
if (IS_ERR(cprman->regs)) if (IS_ERR(cprman->regs))
return PTR_ERR(cprman->regs); return PTR_ERR(cprman->regs);
fw_node = of_parse_phandle(dev->of_node, "firmware", 0);
if (fw_node) {
struct rpi_firmware *fw = rpi_firmware_get(NULL);
if (!fw)
return -EPROBE_DEFER;
cprman->fw = fw;
}
memset(bcm2835_clk_claimed, 0, sizeof(bcm2835_clk_claimed)); memset(bcm2835_clk_claimed, 0, sizeof(bcm2835_clk_claimed));
for (i = 0; for (i = 0;
!of_property_read_u32_index(pdev->dev.of_node, "claim-clocks", !of_property_read_u32_index(pdev->dev.of_node, "claim-clocks",
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册