| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <ddefd4e4-b719-464b-b8bc-d4d69fa07cf1@microchip.com>
Date: Mon, 15 Jul 2024 06:46:10 +0000
From: <Varshini.Rajendran@...rochip.com>
To: <claudiu.beznea@...on.dev>, <mturquette@...libre.com>, <sboyd@...nel.org>,
<Nicolas.Ferre@...rochip.com>, <alexandre.belloni@...tlin.com>,
<linux-kernel@...r.kernel.org>, <linux-clk@...r.kernel.org>,
<linux-arm-kernel@...ts.infradead.org>
Subject: Re: [PATCH v5 13/27] clk: at91: sam9x7: add sam9x7 pmc driver
Hi Claudiu,
On 14/07/24 7:25 pm, claudiu beznea wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
>
> Hi, Varshini,
>
> On 03.07.2024 13:28, Varshini Rajendran wrote:
>> Add a driver for the PMC clocks of sam9x7 Soc family.
>>
>> Signed-off-by: Varshini Rajendran <varshini.rajendran@...rochip.com>
>> ---
>> drivers/clk/at91/Makefile | 1 +
>> drivers/clk/at91/sam9x7.c | 946 ++++++++++++++++++++++++++++++++++++++
>> 2 files changed, 947 insertions(+)
>> create mode 100644 drivers/clk/at91/sam9x7.c
>>
>> diff --git a/drivers/clk/at91/Makefile b/drivers/clk/at91/Makefile
>> index 89061b85e7d2..8e3684ba2c74 100644
>> --- a/drivers/clk/at91/Makefile
>> +++ b/drivers/clk/at91/Makefile
>> @@ -20,6 +20,7 @@ obj-$(CONFIG_SOC_AT91SAM9) += at91sam9260.o at91sam9rl.o at91sam9x5.o dt-compat.
>> obj-$(CONFIG_SOC_AT91SAM9) += at91sam9g45.o dt-compat.o
>> obj-$(CONFIG_SOC_AT91SAM9) += at91sam9n12.o at91sam9x5.o dt-compat.o
>> obj-$(CONFIG_SOC_SAM9X60) += sam9x60.o
>> +obj-$(CONFIG_SOC_SAM9X7) += sam9x7.o
>> obj-$(CONFIG_SOC_SAMA5D3) += sama5d3.o dt-compat.o
>> obj-$(CONFIG_SOC_SAMA5D4) += sama5d4.o dt-compat.o
>> obj-$(CONFIG_SOC_SAMA5D2) += sama5d2.o dt-compat.o
>> diff --git a/drivers/clk/at91/sam9x7.c b/drivers/clk/at91/sam9x7.c
>> new file mode 100644
>> index 000000000000..b031280bbb32
>> --- /dev/null
>> +++ b/drivers/clk/at91/sam9x7.c
>> @@ -0,0 +1,946 @@
>> +// SPDX-License-Identifier: GPL-2.0
>> +/*
>> + * SAM9X7 PMC code.
>> + *
>> + * Copyright (C) 2023 Microchip Technology Inc. and its subsidiaries
>> + *
>> + * Author: Varshini Rajendran <varshini.rajendran@...rochip.com>
>> + *
>> + */
>> +#include <linux/clk.h>
>> +#include <linux/clk-provider.h>
>> +#include <linux/mfd/syscon.h>
>> +#include <linux/slab.h>
>> +
>> +#include <dt-bindings/clock/at91.h>
>> +
>> +#include "pmc.h"
>> +
>> +static DEFINE_SPINLOCK(pmc_pll_lock);
>> +static DEFINE_SPINLOCK(mck_lock);
>> +
>> +/**
>> + * enum pll_ids - PLL clocks identifiers
>> + * @PLL_ID_PLLA: PLLA identifier
>> + * @PLL_ID_UPLL: UPLL identifier
>> + * @PLL_ID_AUDIO: Audio PLL identifier
>> + * @PLL_ID_LVDS: LVDS PLL identifier
>> + * @PLL_ID_PLLA_DIV2: PLLA DIV2 identifier
>> + * @PLL_ID_MAX: Max PLL Identifier
>> + */
>> +enum pll_ids {
>> + PLL_ID_PLLA,
>> + PLL_ID_UPLL,
>> + PLL_ID_AUDIO,
>> + PLL_ID_LVDS,
>> + PLL_ID_PLLA_DIV2,
>> + PLL_ID_MAX,
>> +};
>> +
>> +/**
>> + * enum pll_type - PLL type identifiers
>> + * @PLL_TYPE_FRAC: fractional PLL identifier
>> + * @PLL_TYPE_DIV: divider PLL identifier
>> + */
>> +enum pll_type {
>> + PLL_TYPE_FRAC,
>> + PLL_TYPE_DIV,
>> +};
>> +
>> +static const struct clk_master_characteristics mck_characteristics = {
>> + .output = { .min = 32000000, .max = 266666667 },
>> + .divisors = { 1, 2, 4, 3, 5},
>> + .have_div3_pres = 1,
>> +};
>> +
>> +static const struct clk_master_layout sam9x7_master_layout = {
>> + .mask = 0x373,
>> + .pres_shift = 4,
>> + .offset = 0x28,
>> +};
>> +
>> +/* Fractional PLL core output range. */
>> +static const struct clk_range plla_core_outputs[] = {
>> + { .min = 375000000, .max = 1600000000 },
>> +};
>> +
>> +static const struct clk_range upll_core_outputs[] = {
>> + { .min = 600000000, .max = 1200000000 },
>> +};
>> +
>> +static const struct clk_range lvdspll_core_outputs[] = {
>> + { .min = 400000000, .max = 800000000 },
>> +};
>> +
>> +static const struct clk_range audiopll_core_outputs[] = {
>> + { .min = 400000000, .max = 800000000 },
>> +};
>> +
>> +static const struct clk_range plladiv2_core_outputs[] = {
>> + { .min = 375000000, .max = 1600000000 },
>> +};
>> +
>> +/* Fractional PLL output range. */
>> +static const struct clk_range plla_outputs[] = {
>> + { .min = 732421, .max = 800000000 },
>> +};
>> +
>> +static const struct clk_range upll_outputs[] = {
>> + { .min = 300000000, .max = 600000000 },
>> +};
>> +
>> +static const struct clk_range lvdspll_outputs[] = {
>> + { .min = 10000000, .max = 800000000 },
>> +};
>> +
>> +static const struct clk_range audiopll_outputs[] = {
>> + { .min = 10000000, .max = 800000000 },
>> +};
>> +
>> +static const struct clk_range plladiv2_outputs[] = {
>> + { .min = 366210, .max = 400000000 },
>> +};
>> +
>> +/* PLL characteristics. */
>> +static const struct clk_pll_characteristics plla_characteristics = {
>> + .input = { .min = 20000000, .max = 50000000 },
>> + .num_output = ARRAY_SIZE(plla_outputs),
>> + .output = plla_outputs,
>> + .core_output = plla_core_outputs,
>> +};
>> +
>> +static const struct clk_pll_characteristics upll_characteristics = {
>> + .input = { .min = 20000000, .max = 50000000 },
>> + .num_output = ARRAY_SIZE(upll_outputs),
>> + .output = upll_outputs,
>> + .core_output = upll_core_outputs,
>> + .upll = true,
>> +};
>> +
>> +static const struct clk_pll_characteristics lvdspll_characteristics = {
>> + .input = { .min = 20000000, .max = 50000000 },
>> + .num_output = ARRAY_SIZE(lvdspll_outputs),
>> + .output = lvdspll_outputs,
>> + .core_output = lvdspll_core_outputs,
>> +};
>> +
>> +static const struct clk_pll_characteristics audiopll_characteristics = {
>> + .input = { .min = 20000000, .max = 50000000 },
>> + .num_output = ARRAY_SIZE(audiopll_outputs),
>> + .output = audiopll_outputs,
>> + .core_output = audiopll_core_outputs,
>> +};
>> +
>> +static const struct clk_pll_characteristics plladiv2_characteristics = {
>> + .input = { .min = 20000000, .max = 50000000 },
>> + .num_output = ARRAY_SIZE(plladiv2_outputs),
>> + .output = plladiv2_outputs,
>> + .core_output = plladiv2_core_outputs,
>> +};
>> +
>> +/* Layout for fractional PLL ID PLLA. */
>> +static const struct clk_pll_layout plla_frac_layout = {
>> + .mul_mask = GENMASK(31, 24),
>> + .frac_mask = GENMASK(21, 0),
>> + .mul_shift = 24,
>> + .frac_shift = 0,
>> + .div2 = 1,
>> +};
>> +
>> +/* Layout for fractional PLLs. */
>> +static const struct clk_pll_layout pll_frac_layout = {
>> + .mul_mask = GENMASK(31, 24),
>> + .frac_mask = GENMASK(21, 0),
>> + .mul_shift = 24,
>> + .frac_shift = 0,
>> +};
>> +
>> +/* Layout for DIV PLLs. */
>> +static const struct clk_pll_layout pll_divpmc_layout = {
>> + .div_mask = GENMASK(7, 0),
>> + .endiv_mask = BIT(29),
>> + .div_shift = 0,
>> + .endiv_shift = 29,
>> +};
>> +
>> +/* Layout for DIV PLL ID PLLADIV2. */
>> +static const struct clk_pll_layout plladiv2_divpmc_layout = {
>> + .div_mask = GENMASK(7, 0),
>> + .endiv_mask = BIT(29),
>> + .div_shift = 0,
>> + .endiv_shift = 29,
>> + .div2 = 1,
>> +};
>> +
>> +/* Layout for DIVIO dividers. */
>> +static const struct clk_pll_layout pll_divio_layout = {
>> + .div_mask = GENMASK(19, 12),
>> + .endiv_mask = BIT(30),
>> + .div_shift = 12,
>> + .endiv_shift = 30,
>> +};
>> +
>> +/*
>> + * PLL clocks description
>> + * @n: clock name
>> + * @p: clock parent
>> + * @l: clock layout
>> + * @t: clock type
>> + * @c: pll characteristics
>> + * @f: clock flags
>> + * @eid: export index in sam9x7->chws[] array
>> + */
>> +static const struct {
>> + const char *n;
>> + const char *p;
>> + const struct clk_pll_layout *l;
>> + u8 t;
>> + const struct clk_pll_characteristics *c;
>> + unsigned long f;
>> + u8 eid;
>> +} sam9x7_plls[][PLL_ID_MAX] = {
>> + [PLL_ID_PLLA] = {
>> + {
>> + .n = "plla_fracck",
>> + .p = "mainck",
>> + .l = &plla_frac_layout,
>> + .t = PLL_TYPE_FRAC,
>> + /*
>> + * This feeds plla_divpmcck which feeds CPU. It should
>> + * not be disabled.
>> + */
>> + .f = CLK_IS_CRITICAL | CLK_SET_RATE_GATE,
>> + .c = &plla_characteristics,
>> + },
>> +
>> + {
>> + .n = "plla_divpmcck",
>> + .p = "plla_fracck",
>> + .l = &pll_divpmc_layout,
>> + .t = PLL_TYPE_DIV,
>> + /* This feeds CPU. It should not be disabled */
>> + .f = CLK_IS_CRITICAL | CLK_SET_RATE_GATE,
>> + .eid = PMC_PLLACK,
>> + .c = &plla_characteristics,
>> + },
>> + },
>> +
>> + [PLL_ID_UPLL] = {
>> + {
>> + .n = "upll_fracck",
>> + .p = "main_osc",
>> + .l = &pll_frac_layout,
>> + .t = PLL_TYPE_FRAC,
>> + .f = CLK_SET_RATE_GATE,
>> + .c = &upll_characteristics,
>> + },
>> +
>> + {
>> + .n = "upll_divpmcck",
>> + .p = "upll_fracck",
>> + .l = &pll_divpmc_layout,
>> + .t = PLL_TYPE_DIV,
>> + .f = CLK_SET_RATE_GATE | CLK_SET_PARENT_GATE |
>> + CLK_SET_RATE_PARENT,
>> + .eid = PMC_UTMI,
>> + .c = &upll_characteristics,
>> + },
>> + },
>> +
>> + [PLL_ID_AUDIO] = {
>> + {
>> + .n = "audiopll_fracck",
>> + .p = "main_osc",
>> + .l = &pll_frac_layout,
>> + .f = CLK_SET_RATE_GATE,
>> + .c = &audiopll_characteristics,
>> + .t = PLL_TYPE_FRAC,
>> + },
>> +
>> + {
>> + .n = "audiopll_divpmcck",
>> + .p = "audiopll_fracck",
>> + .l = &pll_divpmc_layout,
>> + .f = CLK_SET_RATE_GATE | CLK_SET_PARENT_GATE |
>> + CLK_SET_RATE_PARENT,
>> + .c = &audiopll_characteristics,
>> + .eid = PMC_AUDIOPMCPLL,
>> + .t = PLL_TYPE_DIV,
>> + },
>> +
>> + {
>> + .n = "audiopll_diviock",
>> + .p = "audiopll_fracck",
>> + .l = &pll_divio_layout,
>> + .f = CLK_SET_RATE_GATE | CLK_SET_PARENT_GATE |
>> + CLK_SET_RATE_PARENT,
>> + .c = &audiopll_characteristics,
>> + .eid = PMC_AUDIOIOPLL,
>> + .t = PLL_TYPE_DIV,
>> + },
>> + },
>> +
>> + [PLL_ID_LVDS] = {
>> + {
>> + .n = "lvdspll_fracck",
>> + .p = "main_osc",
>> + .l = &pll_frac_layout,
>> + .f = CLK_SET_RATE_GATE,
>> + .c = &lvdspll_characteristics,
>> + .t = PLL_TYPE_FRAC,
>> + },
>> +
>> + {
>> + .n = "lvdspll_divpmcck",
>> + .p = "lvdspll_fracck",
>> + .l = &pll_divpmc_layout,
>> + .f = CLK_SET_RATE_GATE | CLK_SET_PARENT_GATE |
>> + CLK_SET_RATE_PARENT,
>> + .c = &lvdspll_characteristics,
>> + .eid = PMC_LVDSPLL,
>> + .t = PLL_TYPE_DIV,
>> + },
>> + },
>> +
>> + [PLL_ID_PLLA_DIV2] = {
>> + {
>> + .n = "plla_div2pmcck",
>> + .p = "plla_fracck",
>> + .l = &plladiv2_divpmc_layout,
>> + /*
>> + * This may feed critical parts of the system like timers.
>> + * It should not be disabled.
>> + */
>> + .f = CLK_IS_CRITICAL | CLK_SET_RATE_GATE,
>> + .c = &plladiv2_characteristics,
>> + .eid = PMC_PLLADIV2,
>> + .t = PLL_TYPE_DIV,
>> + },
>> + },
>> +};
>> +
>> +static const struct clk_programmable_layout sam9x7_programmable_layout = {
>> + .pres_mask = 0xff,
>> + .pres_shift = 8,
>> + .css_mask = 0x1f,
>> + .have_slck_mck = 0,
>> + .is_pres_direct = 1,
>> +};
>> +
>> +static const struct clk_pcr_layout sam9x7_pcr_layout = {
>> + .offset = 0x88,
>> + .cmd = BIT(31),
>> + .gckcss_mask = GENMASK(12, 8),
>> + .pid_mask = GENMASK(6, 0),
>> +};
>> +
>> +static const struct {
>> + char *n;
>> + char *p;
>> + u8 id;
>> + unsigned long flags;
>> +} sam9x7_systemck[] = {
>> + /*
>> + * ddrck feeds DDR controller and is enabled by bootloader thus we need
>> + * to keep it enabled in case there is no Linux consumer for it.
>> + */
>> + { .n = "ddrck", .p = "masterck_div", .id = 2, .flags = CLK_IS_CRITICAL },
>> + { .n = "uhpck", .p = "usbck", .id = 6 },
>> + { .n = "pck0", .p = "prog0", .id = 8 },
>> + { .n = "pck1", .p = "prog1", .id = 9 },
>> +};
>> +
>> +/*
>> + * Peripheral clocks description
>> + * @n: clock name
>> + * @f: clock flags
>> + * @id: peripheral id
>> + */
>> +static const struct {
>> + char *n;
>> + unsigned long f;
>> + u8 id;
>> +} sam9x7_periphck[] = {
>> + { .n = "pioA_clk", .id = 2, },
>> + { .n = "pioB_clk", .id = 3, },
>> + { .n = "pioC_clk", .id = 4, },
>> + { .n = "flex0_clk", .id = 5, },
>> + { .n = "flex1_clk", .id = 6, },
>> + { .n = "flex2_clk", .id = 7, },
>> + { .n = "flex3_clk", .id = 8, },
>> + { .n = "flex6_clk", .id = 9, },
>> + { .n = "flex7_clk", .id = 10, },
>> + { .n = "flex8_clk", .id = 11, },
>> + { .n = "sdmmc0_clk", .id = 12, },
>> + { .n = "flex4_clk", .id = 13, },
>> + { .n = "flex5_clk", .id = 14, },
>> + { .n = "flex9_clk", .id = 15, },
>> + { .n = "flex10_clk", .id = 16, },
>> + { .n = "tcb0_clk", .id = 17, },
>> + { .n = "pwm_clk", .id = 18, },
>> + { .n = "adc_clk", .id = 19, },
>> + { .n = "dma0_clk", .id = 20, },
>> + { .n = "uhphs_clk", .id = 22, },
>> + { .n = "udphs_clk", .id = 23, },
>> + { .n = "macb0_clk", .id = 24, },
>> + { .n = "lcd_clk", .id = 25, },
>> + { .n = "sdmmc1_clk", .id = 26, },
>> + { .n = "ssc_clk", .id = 28, },
>> + { .n = "can0_clk", .id = 29, },
>> + { .n = "can1_clk", .id = 30, },
>> + { .n = "flex11_clk", .id = 32, },
>> + { .n = "flex12_clk", .id = 33, },
>> + { .n = "i2s_clk", .id = 34, },
>> + { .n = "qspi_clk", .id = 35, },
>> + { .n = "gfx2d_clk", .id = 36, },
>> + { .n = "pit64b0_clk", .id = 37, },
>> + { .n = "trng_clk", .id = 38, },
>> + { .n = "aes_clk", .id = 39, },
>> + { .n = "tdes_clk", .id = 40, },
>> + { .n = "sha_clk", .id = 41, },
>> + { .n = "classd_clk", .id = 42, },
>> + { .n = "isi_clk", .id = 43, },
>> + { .n = "pioD_clk", .id = 44, },
>> + { .n = "tcb1_clk", .id = 45, },
>> + { .n = "dbgu_clk", .id = 47, },
>> + /*
>> + * mpddr_clk feeds DDR controller and is enabled by bootloader thus we
>> + * need to keep it enabled in case there is no Linux consumer for it.
>> + */
>> + { .n = "mpddr_clk", .id = 49, .f = CLK_IS_CRITICAL },
>> + { .n = "csi2dc_clk", .id = 52, },
>> + { .n = "csi4l_clk", .id = 53, },
>> + { .n = "dsi4l_clk", .id = 54, },
>> + { .n = "lvdsc_clk", .id = 56, },
>> + { .n = "pit64b1_clk", .id = 58, },
>> + { .n = "puf_clk", .id = 59, },
>> + { .n = "gmactsu_clk", .id = 67, },
>> +};
>> +
>> +/*
>> + * Generic clock description
>> + * @n: clock name
>> + * @pp: PLL parents
>> + * @pp_mux_table: PLL parents mux table
>> + * @r: clock output range
>> + * @pp_chg_id: id in parent array of changeable PLL parent
>> + * @pp_count: PLL parents count
>> + * @id: clock id
>> + */
>> +static const struct {
>> + const char *n;
>> + const char *pp[8];
>> + const char pp_mux_table[8];
>> + struct clk_range r;
>> + int pp_chg_id;
>> + u8 pp_count;
>> + u8 id;
>> +} sam9x7_gck[] = {
>> + {
>> + .n = "flex0_gclk",
>> + .id = 5,
>> + .pp = { "plla_div2pmcck", },
>> + .pp_mux_table = { 8, },
>> + .pp_count = 1,
>> + .pp_chg_id = INT_MIN,
>> + },
>> +
>> + {
>> + .n = "flex1_gclk",
>> + .id = 6,
>> + .pp = { "plla_div2pmcck", },
>> + .pp_mux_table = { 8, },
>> + .pp_count = 1,
>> + .pp_chg_id = INT_MIN,
>> + },
>> +
>> + {
>> + .n = "flex2_gclk",
>> + .id = 7,
>> + .pp = { "plla_div2pmcck", },
>> + .pp_mux_table = { 8, },
>> + .pp_count = 1,
>> + .pp_chg_id = INT_MIN,
>> + },
>> +
>> + {
>> + .n = "flex3_gclk",
>> + .id = 8,
>> + .pp = { "plla_div2pmcck", },
>> + .pp_mux_table = { 8, },
>> + .pp_count = 1,
>> + .pp_chg_id = INT_MIN,
>> + },
>> +
>> + {
>> + .n = "flex6_gclk",
>> + .id = 9,
>> + .pp = { "plla_div2pmcck", },
>> + .pp_mux_table = { 8, },
>> + .pp_count = 1,
>> + .pp_chg_id = INT_MIN,
>> + },
>> +
>> + {
>> + .n = "flex7_gclk",
>> + .id = 10,
>> + .pp = { "plla_div2pmcck", },
>> + .pp_mux_table = { 8, },
>> + .pp_count = 1,
>> + .pp_chg_id = INT_MIN,
>> + },
>> +
>> + {
>> + .n = "flex8_gclk",
>> + .id = 11,
>> + .pp = { "plla_div2pmcck", },
>> + .pp_mux_table = { 8, },
>> + .pp_count = 1,
>> + .pp_chg_id = INT_MIN,
>> + },
>> +
>> + {
>> + .n = "sdmmc0_gclk",
>> + .id = 12,
>> + .r = { .max = 105000000 },
>> + .pp = { "audiopll_divpmcck", "plla_div2pmcck", },
>> + .pp_mux_table = { 6, 8, },
>> + .pp_count = 2,
>> + .pp_chg_id = INT_MIN,
>> + },
>> +
>> + {
>> + .n = "flex4_gclk",
>> + .id = 13,
>> + .pp = { "plla_div2pmcck", },
>> + .pp_mux_table = { 8, },
>> + .pp_count = 1,
>> + .pp_chg_id = INT_MIN,
>> + },
>> +
>> + {
>> + .n = "flex5_gclk",
>> + .id = 14,
>> + .pp = { "plla_div2pmcck", },
>> + .pp_mux_table = { 8, },
>> + .pp_count = 1,
>> + .pp_chg_id = INT_MIN,
>> + },
>> +
>> + {
>> + .n = "flex9_gclk",
>> + .id = 15,
>> + .pp = { "plla_div2pmcck", },
>> + .pp_mux_table = { 8, },
>> + .pp_count = 1,
>> + .pp_chg_id = INT_MIN,
>> + },
>> +
>> + {
>> + .n = "flex10_gclk",
>> + .id = 16,
>> + .pp = { "plla_div2pmcck", },
>> + .pp_mux_table = { 8, },
>> + .pp_count = 1,
>> + .pp_chg_id = INT_MIN,
>> + },
>> +
>> + {
>> + .n = "tcb0_gclk",
>> + .id = 17,
>> + .pp = { "audiopll_divpmcck", "plla_div2pmcck", },
>> + .pp_mux_table = { 6, 8, },
>> + .pp_count = 2,
>> + .pp_chg_id = INT_MIN,
>> + },
>> +
>> + {
>> + .n = "adc_gclk",
>> + .id = 19,
>> + .pp = { "upll_divpmcck", "plla_div2pmcck", },
>> + .pp_mux_table = { 5, 8, },
>> + .pp_count = 2,
>> + .pp_chg_id = INT_MIN,
>> + },
>> +
>> + {
>> + .n = "lcd_gclk",
>> + .id = 25,
>> + .r = { .max = 75000000 },
>> + .pp = { "audiopll_divpmcck", "plla_div2pmcck", },
>> + .pp_mux_table = { 6, 8, },
>> + .pp_count = 2,
>> + .pp_chg_id = INT_MIN,
>> + },
>> +
>> + {
>> + .n = "sdmmc1_gclk",
>> + .id = 26,
>> + .r = { .max = 105000000 },
>> + .pp = { "audiopll_divpmcck", "plla_div2pmcck", },
>> + .pp_mux_table = { 6, 8, },
>> + .pp_count = 2,
>> + .pp_chg_id = INT_MIN,
>> + },
>> +
>> + {
>> + .n = "mcan0_gclk",
>> + .id = 29,
>> + .r = { .max = 80000000 },
>> + .pp = { "upll_divpmcck", "plla_div2pmcck", },
>> + .pp_mux_table = { 5, 8, },
>> + .pp_count = 2,
>> + .pp_chg_id = INT_MIN,
>> + },
>> +
>> + {
>> + .n = "mcan1_gclk",
>> + .id = 30,
>> + .r = { .max = 80000000 },
>> + .pp = { "upll_divpmcck", "plla_div2pmcck", },
>> + .pp_mux_table = { 5, 8, },
>> + .pp_count = 2,
>> + .pp_chg_id = INT_MIN,
>> + },
>> +
>> + {
>> + .n = "flex11_gclk",
>> + .id = 32,
>> + .pp = { "plla_div2pmcck", },
>> + .pp_mux_table = { 8, },
>> + .pp_count = 1,
>> + .pp_chg_id = INT_MIN,
>> + },
>> +
>> + {
>> + .n = "flex12_gclk",
>> + .id = 33,
>> + .pp = { "plla_div2pmcck", },
>> + .pp_mux_table = { 8, },
>> + .pp_count = 1,
>> + .pp_chg_id = INT_MIN,
>> + },
>> +
>> + {
>> + .n = "i2s_gclk",
>> + .id = 34,
>> + .r = { .max = 100000000 },
>> + .pp = { "audiopll_divpmcck", "plla_div2pmcck", },
>> + .pp_mux_table = { 6, 8, },
>> + .pp_count = 2,
>> + .pp_chg_id = INT_MIN,
>> + },
>> +
>> + {
>> + .n = "qspi_gclk",
>> + .id = 35,
>> + .r = { .max = 200000000 },
>> + .pp = { "audiopll_divpmcck", "plla_div2pmcck", },
>> + .pp_mux_table = { 6, 8, },
>> + .pp_count = 2,
>> + .pp_chg_id = INT_MIN,
>> + },
>> +
>> + {
>> + .n = "pit64b0_gclk",
>> + .id = 37,
>> + .pp = { "plla_div2pmcck", },
>> + .pp_mux_table = { 8, },
>> + .pp_count = 1,
>> + .pp_chg_id = INT_MIN,
>> + },
>> +
>> + {
>> + .n = "classd_gclk",
>> + .id = 42,
>> + .r = { .max = 100000000 },
>> + .pp = { "audiopll_divpmcck", "plla_div2pmcck", },
>> + .pp_mux_table = { 6, 8, },
>> + .pp_count = 2,
>> + .pp_chg_id = INT_MIN,
>> + },
>> +
>> + {
>> + .n = "tcb1_gclk",
>> + .id = 45,
>> + .pp = { "audiopll_divpmcck", "plla_div2pmcck", },
>> + .pp_mux_table = { 6, 8, },
>> + .pp_count = 2,
>> + .pp_chg_id = INT_MIN,
>> + },
>> +
>> + {
>> + .n = "dbgu_gclk",
>> + .id = 47,
>> + .pp = { "plla_div2pmcck", },
>> + .pp_mux_table = { 8, },
>> + .pp_count = 1,
>> + .pp_chg_id = INT_MIN,
>> + },
>> +
>> + {
>> + .n = "mipiphy_gclk",
>> + .id = 55,
>> + .r = { .max = 27000000 },
>> + .pp = { "plla_div2pmcck", },
>> + .pp_mux_table = { 8, },
>> + .pp_count = 1,
>> + .pp_chg_id = INT_MIN,
>> + },
>> +
>> + {
>> + .n = "pit64b1_gclk",
>> + .id = 58,
>> + .pp = { "plla_div2pmcck", },
>> + .pp_mux_table = { 8, },
>> + .pp_count = 1,
>> + .pp_chg_id = INT_MIN,
>> + },
>> +
>> + {
>> + .n = "gmac_gclk",
>> + .id = 67,
>> + .pp = { "audiopll_divpmcck", "plla_div2pmcck", },
>> + .pp_mux_table = { 6, 8, },
>> + .pp_count = 2,
>> + .pp_chg_id = INT_MIN,
>> + },
>> +};
>> +
>> +static void __init sam9x7_pmc_setup(struct device_node *np)
>> +{
>> + struct clk_range range = CLK_RANGE(0, 0);
>> + const char *td_slck_name, *md_slck_name, *mainxtal_name;
>> + struct pmc_data *sam9x7_pmc;
>> + const char *parent_names[9];
>> + void **clk_mux_buffer = NULL;
>> + int clk_mux_buffer_size = 0;
>> + struct clk_hw *main_osc_hw;
>> + struct regmap *regmap;
>> + struct clk_hw *hw;
>> + int i, j;
>> +
>> + i = of_property_match_string(np, "clock-names", "td_slck");
>> + if (i < 0)
>> + return;
>> +
>> + td_slck_name = of_clk_get_parent_name(np, i);
>> +
>> + i = of_property_match_string(np, "clock-names", "md_slck");
>> + if (i < 0)
>> + return;
>> +
>> + md_slck_name = of_clk_get_parent_name(np, i);
>> +
>> + i = of_property_match_string(np, "clock-names", "main_xtal");
>> + if (i < 0)
>> + return;
>> + mainxtal_name = of_clk_get_parent_name(np, i);
>> +
>> + regmap = device_node_to_regmap(np);
>> + if (IS_ERR(regmap))
>> + return;
>> +
>> + sam9x7_pmc = pmc_data_allocate(PMC_LVDSPLL + 1,
>> + nck(sam9x7_systemck),
>> + nck(sam9x7_periphck),
>> + nck(sam9x7_gck), 8);
>> + if (!sam9x7_pmc)
>> + return;
>> +
>> + clk_mux_buffer = kmalloc(sizeof(void *) *
>> + (ARRAY_SIZE(sam9x7_gck)),
>> + GFP_KERNEL);
>> + if (!clk_mux_buffer)
>> + goto err_free;
>> +
>> + hw = at91_clk_register_main_rc_osc(regmap, "main_rc_osc", 12000000,
>> + 50000000);
>> + if (IS_ERR(hw))
>> + goto err_free;
>> +
>> + hw = at91_clk_register_main_osc(regmap, "main_osc", mainxtal_name, NULL, 0);
>> + if (IS_ERR(hw))
>> + goto err_free;
>> + main_osc_hw = hw;
>> +
>> + parent_names[0] = "main_rc_osc";
>> + parent_names[1] = "main_osc";
>> + hw = at91_clk_register_sam9x5_main(regmap, "mainck", parent_names, NULL, 2);
>> + if (IS_ERR(hw))
>> + goto err_free;
>> +
>> + sam9x7_pmc->chws[PMC_MAIN] = hw;
>> +
>> + for (i = 0; i < PLL_ID_MAX; i++) {
>> + for (j = 0; j < 3; j++) {
>
> I now realize that we are alocating more than needed memory for each PLL in
> sam9x7_plls[][]. The number of columns for the 2d array is PLL_ID_MAX and
> it should be 3. I can adjust it when applying but I need you to run a
> simple boot test with it.
>
Yes. It boots and works perfectly with the change suggested. I am
pasting the snippet below just to be on the same page.
--- a/drivers/clk/at91/sam9x7.c
+++ b/drivers/clk/at91/sam9x7.c
@@ -198,7 +198,7 @@ static const struct {
const struct clk_pll_characteristics *c;
unsigned long f;
u8 eid;
-} sam9x7_plls[][PLL_ID_MAX] = {
+} sam9x7_plls[][3] = {
[PLL_ID_PLLA] = {
{
.n = "plla_fracck",
>> + struct clk_hw *parent_hw;
>> +
>> + if (!sam9x7_plls[i][j].n)
>> + continue;
>> +
>> + switch (sam9x7_plls[i][j].t) {
>> + case PLL_TYPE_FRAC:
>> + if (!strcmp(sam9x7_plls[i][j].p, "mainck"))
>> + parent_hw = sam9x7_pmc->chws[PMC_MAIN];
>> + else if (!strcmp(sam9x7_plls[i][j].p, "main_osc"))
>> + parent_hw = main_osc_hw;
>> + else
>> + parent_hw = __clk_get_hw(of_clk_get_by_name
>> + (np, sam9x7_plls[i][j].p));
>> +
>> + hw = sam9x60_clk_register_frac_pll(regmap,
>> + &pmc_pll_lock,
>> + sam9x7_plls[i][j].n,
>> + sam9x7_plls[i][j].p,
>> + parent_hw, i,
>> + sam9x7_plls[i][j].c,
>> + sam9x7_plls[i][j].l,
>> + sam9x7_plls[i][j].f);
>> + break;
>> +
>> + case PLL_TYPE_DIV:
>> + hw = sam9x60_clk_register_div_pll(regmap,
>> + &pmc_pll_lock,
>> + sam9x7_plls[i][j].n,
>> + sam9x7_plls[i][j].p, NULL, i,
>> + sam9x7_plls[i][j].c,
>> + sam9x7_plls[i][j].l,
>> + sam9x7_plls[i][j].f, 0);
>> + break;
>> +
>> + default:
>> + continue;
>> + }
>> +
>> + if (IS_ERR(hw))
>> + goto err_free;
>> +
>> + if (sam9x7_plls[i][j].eid)
>> + sam9x7_pmc->chws[sam9x7_plls[i][j].eid] = hw;
>> + }
>> + }
>> +
>> + parent_names[0] = md_slck_name;
>> + parent_names[1] = "mainck";
>> + parent_names[2] = "plla_divpmcck";
>> + parent_names[3] = "upll_divpmcck";
>> + hw = at91_clk_register_master_pres(regmap, "masterck_pres", 4,
>> + parent_names, NULL, &sam9x7_master_layout,
>> + &mck_characteristics, &mck_lock);
>> + if (IS_ERR(hw))
>> + goto err_free;
>> +
>> + hw = at91_clk_register_master_div(regmap, "masterck_div",
>> + "masterck_pres", NULL, &sam9x7_master_layout,
>> + &mck_characteristics, &mck_lock,
>> + CLK_SET_RATE_GATE, 0);
>> + if (IS_ERR(hw))
>> + goto err_free;
>> +
>> + sam9x7_pmc->chws[PMC_MCK] = hw;
>> +
>> + parent_names[0] = "plla_divpmcck";
>> + parent_names[1] = "upll_divpmcck";
>> + parent_names[2] = "main_osc";
>> + hw = sam9x60_clk_register_usb(regmap, "usbck", parent_names, 3);
>> + if (IS_ERR(hw))
>> + goto err_free;
>> +
>> + parent_names[0] = md_slck_name;
>> + parent_names[1] = td_slck_name;
>> + parent_names[2] = "mainck";
>> + parent_names[3] = "masterck_div";
>> + parent_names[4] = "plla_divpmcck";
>> + parent_names[5] = "upll_divpmcck";
>> + parent_names[6] = "audiopll_divpmcck";
>> + for (i = 0; i < 2; i++) {
>> + char name[6];
>> +
>> + snprintf(name, sizeof(name), "prog%d", i);
>> +
>> + hw = at91_clk_register_programmable(regmap, name,
>> + parent_names, NULL, 7, i,
>> + &sam9x7_programmable_layout,
>> + NULL);
>> + if (IS_ERR(hw))
>> + goto err_free;
>> +
>> + sam9x7_pmc->pchws[i] = hw;
>> + }
>> +
>> + for (i = 0; i < ARRAY_SIZE(sam9x7_systemck); i++) {
>> + hw = at91_clk_register_system(regmap, sam9x7_systemck[i].n,
>> + sam9x7_systemck[i].p, NULL,
>> + sam9x7_systemck[i].id,
>> + sam9x7_systemck[i].flags);
>> + if (IS_ERR(hw))
>> + goto err_free;
>> +
>> + sam9x7_pmc->shws[sam9x7_systemck[i].id] = hw;
>> + }
>> +
>> + for (i = 0; i < ARRAY_SIZE(sam9x7_periphck); i++) {
>> + hw = at91_clk_register_sam9x5_peripheral(regmap, &pmc_pcr_lock,
>> + &sam9x7_pcr_layout,
>> + sam9x7_periphck[i].n,
>> + "masterck_div", NULL,
>> + sam9x7_periphck[i].id,
>> + &range, INT_MIN,
>> + sam9x7_periphck[i].f);
>> + if (IS_ERR(hw))
>> + goto err_free;
>> +
>> + sam9x7_pmc->phws[sam9x7_periphck[i].id] = hw;
>> + }
>> +
>> + parent_names[0] = md_slck_name;
>> + parent_names[1] = td_slck_name;
>> + parent_names[2] = "mainck";
>> + parent_names[3] = "masterck_div";
>> + for (i = 0; i < ARRAY_SIZE(sam9x7_gck); i++) {
>> + u8 num_parents = 4 + sam9x7_gck[i].pp_count;
>> + u32 *mux_table;
>> +
>> + mux_table = kmalloc_array(num_parents, sizeof(*mux_table),
>> + GFP_KERNEL);
>> + if (!mux_table)
>> + goto err_free;
>> +
>> + PMC_INIT_TABLE(mux_table, 4);
>> + PMC_FILL_TABLE(&mux_table[4], sam9x7_gck[i].pp_mux_table,
>> + sam9x7_gck[i].pp_count);
>> + PMC_FILL_TABLE(&parent_names[4], sam9x7_gck[i].pp,
>> + sam9x7_gck[i].pp_count);
>> +
>> + hw = at91_clk_register_generated(regmap, &pmc_pcr_lock,
>> + &sam9x7_pcr_layout,
>> + sam9x7_gck[i].n,
>> + parent_names, NULL, mux_table,
>> + num_parents,
>> + sam9x7_gck[i].id,
>> + &sam9x7_gck[i].r,
>> + sam9x7_gck[i].pp_chg_id);
>> + if (IS_ERR(hw))
>> + goto err_free;
>> +
>> + sam9x7_pmc->ghws[sam9x7_gck[i].id] = hw;
>> + clk_mux_buffer[clk_mux_buffer_size++] = mux_table;
>> + }
>> +
>> + of_clk_add_hw_provider(np, of_clk_hw_pmc_get, sam9x7_pmc);
>> + kfree(clk_mux_buffer);
>> +
>> + return;
>> +
>> +err_free:
>> + if (clk_mux_buffer) {
>> + for (i = 0; i < clk_mux_buffer_size; i++)
>> + kfree(clk_mux_buffer[i]);
>> + kfree(clk_mux_buffer);
>> + }
>> + kfree(sam9x7_pmc);
>> +}
>> +
>> +/* Some clks are used for a clocksource */
>> +CLK_OF_DECLARE(sam9x7_pmc, "microchip,sam9x7-pmc", sam9x7_pmc_setup);
--
Thanks and Regards,
Varshini Rajendran.
Powered by blists - more mailing lists