| 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: <CAHCN7xL4WikbY+k+QdBS64-Kt2oHTQU1i_G44PGJDZZKkRaymw@mail.gmail.com>
Date: Wed, 4 Sep 2024 08:52:52 -0500
From: Adam Ford <aford173@...il.com>
To: Frieder Schrempf <frieder.schrempf@...tron.de>
Cc: linux-phy@...ts.infradead.org, dominique.martinet@...ark-techno.com,
linux-imx@....com, festevam@...il.com, aford@...conembedded.com,
Sandor.yu@....com, Vinod Koul <vkoul@...nel.org>,
Kishon Vijay Abraham I <kishon@...nel.org>, Marco Felsch <m.felsch@...gutronix.de>,
Lucas Stach <l.stach@...gutronix.de>,
Uwe Kleine-König <u.kleine-koenig@...gutronix.de>,
linux-kernel@...r.kernel.org
Subject: Re: [PATCH V5 3/5] phy: freescale: fsl-samsung-hdmi: Support dynamic integer
On Wed, Sep 4, 2024 at 8:35 AM Frieder Schrempf
<frieder.schrempf@...tron.de> wrote:
>
> On 04.09.24 4:32 AM, Adam Ford wrote:
> > There is currently a look-up table for a variety of resolutions.
> > Since the phy has the ability to dynamically calculate the values
> > necessary to use the intger divider which should allow more
>
> ^ integer
>
> > resolutions without having to update the look-up-table.
> >
> > If the lookup table cannot find an exact match, fall back to the
> > dynamic calculator of the integer divider.
>
> Nitpick: You have thre different versions of how to spell "lookup table"
> in the paragraphs above. Maybe you can decide on one... ;)
>
> >
> > Previously, the value of P was hard-coded to 1, this required an
> > update to the phy_pll_cfg table to add in the extra value into the
> > table, so if the value of P is calculated to be something else
> > by the PMS calculator, the calculated_phy_pll_cfg structure
> > can be used instead without having to keep track of which method
> > was used.
> >
> > Signed-off-by: Adam Ford <aford173@...il.com>
>
> The comments I have are only nitpicks and the patch seems to work fine
> for me. So feel free to add:
>
> Reviewed-by: Frieder Schrempf <frieder.schrempf@...tron.de>
> Tested-by: Frieder Schrempf <frieder.schrempf@...tron.de>
>
> > ---
> > V5: No Change
> > V4: No Change
> > V3: Change size of pll_div_regs to include PHY_REG01 (P)
> > Create calculated_phy_pll_cfg to containe the values
> > Eliminate the PMS calculation from fsl_samsung_hdmi_phy_configure
> > Make the LUT primary and fall back to integer calculator in
> > phy_clk_round_rate.
> > Check the range right away to ensure it's reaonsable rather than
> > trying to find a clock only to learn it's outside the range.
> > Overall added notes and comments where stuff may not be intuitive.
> >
> > V2: Update phy_clk_round_rate and phy_clk_set_rate to both support
> > the integer clock PMS calculator.
> > ---
> > drivers/phy/freescale/phy-fsl-samsung-hdmi.c | 341 +++++++++++++------
> > 1 file changed, 235 insertions(+), 106 deletions(-)
> >
> > diff --git a/drivers/phy/freescale/phy-fsl-samsung-hdmi.c b/drivers/phy/freescale/phy-fsl-samsung-hdmi.c
> > index 4f6874226f9a..8f2c0082aa12 100644
> > --- a/drivers/phy/freescale/phy-fsl-samsung-hdmi.c
> > +++ b/drivers/phy/freescale/phy-fsl-samsung-hdmi.c
> > @@ -16,6 +16,8 @@
> >
> > #define PHY_REG(reg) (reg * 4)
> >
> > +#define REG01_PMS_P_MASK GENMASK(3, 0)
> > +#define REG03_PMS_S_MASK GENMASK(7, 4)
> > #define REG12_CK_DIV_MASK GENMASK(5, 4)
> >
> > #define REG13_TG_CODE_LOW_MASK GENMASK(7, 0)
> > @@ -38,281 +40,296 @@
> > #define REG34_PLL_LOCK BIT(6)
> > #define REG34_PHY_CLK_READY BIT(5)
> >
> > -#define PHY_PLL_DIV_REGS_NUM 6
> > +#ifndef MHZ
> > +#define MHZ (1000UL * 1000UL)
> > +#endif
> > +
> > +#define PHY_PLL_DIV_REGS_NUM 7
> >
> > struct phy_config {
> > u32 pixclk;
> > u8 pll_div_regs[PHY_PLL_DIV_REGS_NUM];
> > };
> >
> > +/*
> > + * The calculated_phy_pll_cfg only handles integer divider for PMS only,
>
> Nitpick: Remove duplicate 'only'
>
> > + * meaning the last four entries will be fixed, but the first three will
> > + * be calculated by the PMS calculator
>
> Nitpick: Period at the end of the sentence
Good catch. I ran these through checkpatch, but I need to tell myself
not do work on this stuff at night when I am tired.
Sorry about that. My grammar isn't normally this bad. :-)
adam
>
> > + */
> > +static struct phy_config calculated_phy_pll_cfg = {
> > + .pixclk = 0,
> > + .pll_div_regs = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00 },
> > +};
> > +
> > +/* The lookup table contains values for which the fractional divder is used */
>
> Nitpick: It seems this comment would rather belong into patch 5/5.
I put it here because I wanted to distinguish between the table below
and the variable above which are both of the same structure type to
explain why we needed both.
>
> > static const struct phy_config phy_pll_cfg[] = {
> > {
> > .pixclk = 22250000,
> > - .pll_div_regs = { 0x4b, 0xf1, 0x89, 0x88, 0x80, 0x40 },
> > + .pll_div_regs = { 0xd1, 0x4b, 0xf1, 0x89, 0x88, 0x80, 0x40 },
> > }, {
> > .pixclk = 23750000,
> > - .pll_div_regs = { 0x50, 0xf1, 0x86, 0x85, 0x80, 0x40 },
> > + .pll_div_regs = { 0xd1, 0x50, 0xf1, 0x86, 0x85, 0x80, 0x40 },
> > }, {
> > .pixclk = 24000000,
> > - .pll_div_regs = { 0x50, 0xf0, 0x00, 0x00, 0x80, 0x00 },
> > + .pll_div_regs = { 0xd1, 0x50, 0xf0, 0x00, 0x00, 0x80, 0x00 },
> > }, {
> > .pixclk = 24024000,
> > - .pll_div_regs = { 0x50, 0xf1, 0x99, 0x02, 0x80, 0x40 },
> > + .pll_div_regs = { 0xd1, 0x50, 0xf1, 0x99, 0x02, 0x80, 0x40 },
> > }, {
> > .pixclk = 25175000,
> > - .pll_div_regs = { 0x54, 0xfc, 0xcc, 0x91, 0x80, 0x40 },
> > + .pll_div_regs = { 0xd1, 0x54, 0xfc, 0xcc, 0x91, 0x80, 0x40 },
> > }, {
> > .pixclk = 25200000,
> > - .pll_div_regs = { 0x54, 0xf0, 0x00, 0x00, 0x80, 0x00 },
> > + .pll_div_regs = { 0xd1, 0x54, 0xf0, 0x00, 0x00, 0x80, 0x00 },
> > }, {
> > .pixclk = 26750000,
> > - .pll_div_regs = { 0x5a, 0xf2, 0x89, 0x88, 0x80, 0x40 },
> > + .pll_div_regs = { 0xd1, 0x5a, 0xf2, 0x89, 0x88, 0x80, 0x40 },
> > }, {
> > .pixclk = 27000000,
> > - .pll_div_regs = { 0x5a, 0xf0, 0x00, 0x00, 0x80, 0x00 },
> > + .pll_div_regs = { 0xd1, 0x5a, 0xf0, 0x00, 0x00, 0x80, 0x00 },
> > }, {
> > .pixclk = 27027000,
> > - .pll_div_regs = { 0x5a, 0xf2, 0xfd, 0x0c, 0x80, 0x40 },
> > + .pll_div_regs = { 0xd1, 0x5a, 0xf2, 0xfd, 0x0c, 0x80, 0x40 },
> > }, {
> > .pixclk = 29500000,
> > - .pll_div_regs = { 0x62, 0xf4, 0x95, 0x08, 0x80, 0x40 },
> > + .pll_div_regs = { 0xd1, 0x62, 0xf4, 0x95, 0x08, 0x80, 0x40 },
> > }, {
> > .pixclk = 30750000,
> > - .pll_div_regs = { 0x66, 0xf4, 0x82, 0x01, 0x88, 0x45 },
> > + .pll_div_regs = { 0xd1, 0x66, 0xf4, 0x82, 0x01, 0x88, 0x45 },
> > }, {
> > .pixclk = 30888000,
> > - .pll_div_regs = { 0x66, 0xf4, 0x99, 0x18, 0x88, 0x45 },
> > + .pll_div_regs = { 0xd1, 0x66, 0xf4, 0x99, 0x18, 0x88, 0x45 },
> > }, {
> > .pixclk = 33750000,
> > - .pll_div_regs = { 0x70, 0xf4, 0x82, 0x01, 0x80, 0x40 },
> > + .pll_div_regs = { 0xd1, 0x70, 0xf4, 0x82, 0x01, 0x80, 0x40 },
> > }, {
> > .pixclk = 35000000,
> > - .pll_div_regs = { 0x58, 0xb8, 0x8b, 0x88, 0x80, 0x40 },
> > + .pll_div_regs = { 0xd1, 0x58, 0xb8, 0x8b, 0x88, 0x80, 0x40 },
> > }, {
> > .pixclk = 36000000,
> > - .pll_div_regs = { 0x5a, 0xb0, 0x00, 0x00, 0x80, 0x00 },
> > + .pll_div_regs = { 0xd1, 0x5a, 0xb0, 0x00, 0x00, 0x80, 0x00 },
> > }, {
> > .pixclk = 36036000,
> > - .pll_div_regs = { 0x5a, 0xb2, 0xfd, 0x0c, 0x80, 0x40 },
> > + .pll_div_regs = { 0xd1, 0x5a, 0xb2, 0xfd, 0x0c, 0x80, 0x40 },
> > }, {
> > .pixclk = 40000000,
> > - .pll_div_regs = { 0x64, 0xb0, 0x00, 0x00, 0x80, 0x00 },
> > + .pll_div_regs = { 0xd1, 0x64, 0xb0, 0x00, 0x00, 0x80, 0x00 },
> > }, {
> > .pixclk = 43200000,
> > - .pll_div_regs = { 0x5a, 0x90, 0x00, 0x00, 0x80, 0x00 },
> > + .pll_div_regs = { 0xd1, 0x5a, 0x90, 0x00, 0x00, 0x80, 0x00 },
> > }, {
> > .pixclk = 43243200,
> > - .pll_div_regs = { 0x5a, 0x92, 0xfd, 0x0c, 0x80, 0x40 },
> > + .pll_div_regs = { 0xd1, 0x5a, 0x92, 0xfd, 0x0c, 0x80, 0x40 },
> > }, {
> > .pixclk = 44500000,
> > - .pll_div_regs = { 0x5c, 0x92, 0x98, 0x11, 0x84, 0x41 },
> > + .pll_div_regs = { 0xd1, 0x5c, 0x92, 0x98, 0x11, 0x84, 0x41 },
> > }, {
> > .pixclk = 47000000,
> > - .pll_div_regs = { 0x62, 0x94, 0x95, 0x82, 0x80, 0x40 },
> > + .pll_div_regs = { 0xd1, 0x62, 0x94, 0x95, 0x82, 0x80, 0x40 },
> > }, {
> > .pixclk = 47500000,
> > - .pll_div_regs = { 0x63, 0x96, 0xa1, 0x82, 0x80, 0x40 },
> > + .pll_div_regs = { 0xd1, 0x63, 0x96, 0xa1, 0x82, 0x80, 0x40 },
> > }, {
> > .pixclk = 50349650,
> > - .pll_div_regs = { 0x54, 0x7c, 0xc3, 0x8f, 0x80, 0x40 },
> > + .pll_div_regs = { 0xd1, 0x54, 0x7c, 0xc3, 0x8f, 0x80, 0x40 },
> > }, {
> > .pixclk = 50400000,
> > - .pll_div_regs = { 0x54, 0x70, 0x00, 0x00, 0x80, 0x00 },
> > + .pll_div_regs = { 0xd1, 0x54, 0x70, 0x00, 0x00, 0x80, 0x00 },
> > }, {
> > .pixclk = 53250000,
> > - .pll_div_regs = { 0x58, 0x72, 0x84, 0x03, 0x82, 0x41 },
> > + .pll_div_regs = { 0xd1, 0x58, 0x72, 0x84, 0x03, 0x82, 0x41 },
> > }, {
> > .pixclk = 53500000,
> > - .pll_div_regs = { 0x5a, 0x72, 0x89, 0x88, 0x80, 0x40 },
> > + .pll_div_regs = { 0xd1, 0x5a, 0x72, 0x89, 0x88, 0x80, 0x40 },
> > }, {
> > .pixclk = 54000000,
> > - .pll_div_regs = { 0x5a, 0x70, 0x00, 0x00, 0x80, 0x00 },
> > + .pll_div_regs = { 0xd1, 0x5a, 0x70, 0x00, 0x00, 0x80, 0x00 },
> > }, {
> > .pixclk = 54054000,
> > - .pll_div_regs = { 0x5a, 0x72, 0xfd, 0x0c, 0x80, 0x40 },
> > + .pll_div_regs = { 0xd1, 0x5a, 0x72, 0xfd, 0x0c, 0x80, 0x40 },
> > }, {
> > .pixclk = 59000000,
> > - .pll_div_regs = { 0x62, 0x74, 0x95, 0x08, 0x80, 0x40 },
> > + .pll_div_regs = { 0xd1, 0x62, 0x74, 0x95, 0x08, 0x80, 0x40 },
> > }, {
> > .pixclk = 59340659,
> > - .pll_div_regs = { 0x62, 0x74, 0xdb, 0x52, 0x88, 0x47 },
> > + .pll_div_regs = { 0xd1, 0x62, 0x74, 0xdb, 0x52, 0x88, 0x47 },
> > }, {
> > .pixclk = 59400000,
> > - .pll_div_regs = { 0x63, 0x70, 0x00, 0x00, 0x80, 0x00 },
> > + .pll_div_regs = { 0xd1, 0x63, 0x70, 0x00, 0x00, 0x80, 0x00 },
> > }, {
> > .pixclk = 61500000,
> > - .pll_div_regs = { 0x66, 0x74, 0x82, 0x01, 0x88, 0x45 },
> > + .pll_div_regs = { 0xd1, 0x66, 0x74, 0x82, 0x01, 0x88, 0x45 },
> > }, {
> > .pixclk = 63500000,
> > - .pll_div_regs = { 0x69, 0x74, 0x89, 0x08, 0x80, 0x40 },
> > + .pll_div_regs = { 0xd1, 0x69, 0x74, 0x89, 0x08, 0x80, 0x40 },
> > }, {
> > .pixclk = 67500000,
> > - .pll_div_regs = { 0x54, 0x52, 0x87, 0x03, 0x80, 0x40 },
> > + .pll_div_regs = { 0xd1, 0x54, 0x52, 0x87, 0x03, 0x80, 0x40 },
> > }, {
> > .pixclk = 70000000,
> > - .pll_div_regs = { 0x58, 0x58, 0x8b, 0x88, 0x80, 0x40 },
> > + .pll_div_regs = { 0xd1, 0x58, 0x58, 0x8b, 0x88, 0x80, 0x40 },
> > }, {
> > .pixclk = 72000000,
> > - .pll_div_regs = { 0x5a, 0x50, 0x00, 0x00, 0x80, 0x00 },
> > + .pll_div_regs = { 0xd1, 0x5a, 0x50, 0x00, 0x00, 0x80, 0x00 },
> > }, {
> > .pixclk = 72072000,
> > - .pll_div_regs = { 0x5a, 0x52, 0xfd, 0x0c, 0x80, 0x40 },
> > + .pll_div_regs = { 0xd1, 0x5a, 0x52, 0xfd, 0x0c, 0x80, 0x40 },
> > }, {
> > .pixclk = 74176000,
> > - .pll_div_regs = { 0x5d, 0x58, 0xdb, 0xA2, 0x88, 0x41 },
> > + .pll_div_regs = { 0xd1, 0x5d, 0x58, 0xdb, 0xA2, 0x88, 0x41 },
> > }, {
> > .pixclk = 74250000,
> > - .pll_div_regs = { 0x5c, 0x52, 0x90, 0x0d, 0x84, 0x41 },
> > + .pll_div_regs = { 0xd1, 0x5c, 0x52, 0x90, 0x0d, 0x84, 0x41 },
> > }, {
> > .pixclk = 78500000,
> > - .pll_div_regs = { 0x62, 0x54, 0x87, 0x01, 0x80, 0x40 },
> > + .pll_div_regs = { 0xd1, 0x62, 0x54, 0x87, 0x01, 0x80, 0x40 },
> > }, {
> > .pixclk = 80000000,
> > - .pll_div_regs = { 0x64, 0x50, 0x00, 0x00, 0x80, 0x00 },
> > + .pll_div_regs = { 0xd1, 0x64, 0x50, 0x00, 0x00, 0x80, 0x00 },
> > }, {
> > .pixclk = 82000000,
> > - .pll_div_regs = { 0x66, 0x54, 0x82, 0x01, 0x88, 0x45 },
> > + .pll_div_regs = { 0xd1, 0x66, 0x54, 0x82, 0x01, 0x88, 0x45 },
> > }, {
> > .pixclk = 82500000,
> > - .pll_div_regs = { 0x67, 0x54, 0x88, 0x01, 0x90, 0x49 },
> > + .pll_div_regs = { 0xd1, 0x67, 0x54, 0x88, 0x01, 0x90, 0x49 },
> > }, {
> > .pixclk = 89000000,
> > - .pll_div_regs = { 0x70, 0x54, 0x84, 0x83, 0x80, 0x40 },
> > + .pll_div_regs = { 0xd1, 0x70, 0x54, 0x84, 0x83, 0x80, 0x40 },
> > }, {
> > .pixclk = 90000000,
> > - .pll_div_regs = { 0x70, 0x54, 0x82, 0x01, 0x80, 0x40 },
> > + .pll_div_regs = { 0xd1, 0x70, 0x54, 0x82, 0x01, 0x80, 0x40 },
> > }, {
> > .pixclk = 94000000,
> > - .pll_div_regs = { 0x4e, 0x32, 0xa7, 0x10, 0x80, 0x40 },
> > + .pll_div_regs = { 0xd1, 0x4e, 0x32, 0xa7, 0x10, 0x80, 0x40 },
> > }, {
> > .pixclk = 95000000,
> > - .pll_div_regs = { 0x50, 0x31, 0x86, 0x85, 0x80, 0x40 },
> > + .pll_div_regs = { 0xd1, 0x50, 0x31, 0x86, 0x85, 0x80, 0x40 },
> > }, {
> > .pixclk = 98901099,
> > - .pll_div_regs = { 0x52, 0x3a, 0xdb, 0x4c, 0x88, 0x47 },
> > + .pll_div_regs = { 0xd1, 0x52, 0x3a, 0xdb, 0x4c, 0x88, 0x47 },
> > }, {
> > .pixclk = 99000000,
> > - .pll_div_regs = { 0x52, 0x32, 0x82, 0x01, 0x88, 0x47 },
> > + .pll_div_regs = { 0xd1, 0x52, 0x32, 0x82, 0x01, 0x88, 0x47 },
> > }, {
> > .pixclk = 100699300,
> > - .pll_div_regs = { 0x54, 0x3c, 0xc3, 0x8f, 0x80, 0x40 },
> > + .pll_div_regs = { 0xd1, 0x54, 0x3c, 0xc3, 0x8f, 0x80, 0x40 },
> > }, {
> > .pixclk = 100800000,
> > - .pll_div_regs = { 0x54, 0x30, 0x00, 0x00, 0x80, 0x00 },
> > + .pll_div_regs = { 0xd1, 0x54, 0x30, 0x00, 0x00, 0x80, 0x00 },
> > }, {
> > .pixclk = 102500000,
> > - .pll_div_regs = { 0x55, 0x32, 0x8c, 0x05, 0x90, 0x4b },
> > + .pll_div_regs = { 0xd1, 0x55, 0x32, 0x8c, 0x05, 0x90, 0x4b },
> > }, {
> > .pixclk = 104750000,
> > - .pll_div_regs = { 0x57, 0x32, 0x98, 0x07, 0x90, 0x49 },
> > + .pll_div_regs = { 0xd1, 0x57, 0x32, 0x98, 0x07, 0x90, 0x49 },
> > }, {
> > .pixclk = 106500000,
> > - .pll_div_regs = { 0x58, 0x32, 0x84, 0x03, 0x82, 0x41 },
> > + .pll_div_regs = { 0xd1, 0x58, 0x32, 0x84, 0x03, 0x82, 0x41 },
> > }, {
> > .pixclk = 107000000,
> > - .pll_div_regs = { 0x5a, 0x32, 0x89, 0x88, 0x80, 0x40 },
> > + .pll_div_regs = { 0xd1, 0x5a, 0x32, 0x89, 0x88, 0x80, 0x40 },
> > }, {
> > .pixclk = 108000000,
> > - .pll_div_regs = { 0x5a, 0x30, 0x00, 0x00, 0x80, 0x00 },
> > + .pll_div_regs = { 0xd1, 0x5a, 0x30, 0x00, 0x00, 0x80, 0x00 },
> > }, {
> > .pixclk = 108108000,
> > - .pll_div_regs = { 0x5a, 0x32, 0xfd, 0x0c, 0x80, 0x40 },
> > + .pll_div_regs = { 0xd1, 0x5a, 0x32, 0xfd, 0x0c, 0x80, 0x40 },
> > }, {
> > .pixclk = 118000000,
> > - .pll_div_regs = { 0x62, 0x34, 0x95, 0x08, 0x80, 0x40 },
> > + .pll_div_regs = { 0xd1, 0x62, 0x34, 0x95, 0x08, 0x80, 0x40 },
> > }, {
> > .pixclk = 118800000,
> > - .pll_div_regs = { 0x63, 0x30, 0x00, 0x00, 0x80, 0x00 },
> > + .pll_div_regs = { 0xd1, 0x63, 0x30, 0x00, 0x00, 0x80, 0x00 },
> > }, {
> > .pixclk = 123000000,
> > - .pll_div_regs = { 0x66, 0x34, 0x82, 0x01, 0x88, 0x45 },
> > + .pll_div_regs = { 0xd1, 0x66, 0x34, 0x82, 0x01, 0x88, 0x45 },
> > }, {
> > .pixclk = 127000000,
> > - .pll_div_regs = { 0x69, 0x34, 0x89, 0x08, 0x80, 0x40 },
> > + .pll_div_regs = { 0xd1, 0x69, 0x34, 0x89, 0x08, 0x80, 0x40 },
> > }, {
> > .pixclk = 135000000,
> > - .pll_div_regs = { 0x70, 0x34, 0x82, 0x01, 0x80, 0x40 },
> > + .pll_div_regs = { 0xd1, 0x70, 0x34, 0x82, 0x01, 0x80, 0x40 },
> > }, {
> > .pixclk = 135580000,
> > - .pll_div_regs = { 0x71, 0x39, 0xe9, 0x82, 0x9c, 0x5b },
> > + .pll_div_regs = { 0xd1, 0x71, 0x39, 0xe9, 0x82, 0x9c, 0x5b },
> > }, {
> > .pixclk = 137520000,
> > - .pll_div_regs = { 0x72, 0x38, 0x99, 0x10, 0x85, 0x41 },
> > + .pll_div_regs = { 0xd1, 0x72, 0x38, 0x99, 0x10, 0x85, 0x41 },
> > }, {
> > .pixclk = 138750000,
> > - .pll_div_regs = { 0x73, 0x35, 0x88, 0x05, 0x90, 0x4d },
> > + .pll_div_regs = { 0xd1, 0x73, 0x35, 0x88, 0x05, 0x90, 0x4d },
> > }, {
> > .pixclk = 140000000,
> > - .pll_div_regs = { 0x75, 0x36, 0xa7, 0x90, 0x80, 0x40 },
> > + .pll_div_regs = { 0xd1, 0x75, 0x36, 0xa7, 0x90, 0x80, 0x40 },
> > }, {
> > .pixclk = 144000000,
> > - .pll_div_regs = { 0x78, 0x30, 0x00, 0x00, 0x80, 0x00 },
> > + .pll_div_regs = { 0xd1, 0x78, 0x30, 0x00, 0x00, 0x80, 0x00 },
> > }, {
> > .pixclk = 148352000,
> > - .pll_div_regs = { 0x7b, 0x35, 0xdb, 0x39, 0x90, 0x45 },
> > + .pll_div_regs = { 0xd1, 0x7b, 0x35, 0xdb, 0x39, 0x90, 0x45 },
> > }, {
> > .pixclk = 148500000,
> > - .pll_div_regs = { 0x7b, 0x35, 0x84, 0x03, 0x90, 0x45 },
> > + .pll_div_regs = { 0xd1, 0x7b, 0x35, 0x84, 0x03, 0x90, 0x45 },
> > }, {
> > .pixclk = 154000000,
> > - .pll_div_regs = { 0x40, 0x18, 0x83, 0x01, 0x00, 0x40 },
> > + .pll_div_regs = { 0xd1, 0x40, 0x18, 0x83, 0x01, 0x00, 0x40 },
> > }, {
> > .pixclk = 157000000,
> > - .pll_div_regs = { 0x41, 0x11, 0xa7, 0x14, 0x80, 0x40 },
> > + .pll_div_regs = { 0xd1, 0x41, 0x11, 0xa7, 0x14, 0x80, 0x40 },
> > }, {
> > .pixclk = 160000000,
> > - .pll_div_regs = { 0x42, 0x12, 0xa1, 0x20, 0x80, 0x40 },
> > + .pll_div_regs = { 0xd1, 0x42, 0x12, 0xa1, 0x20, 0x80, 0x40 },
> > }, {
> > .pixclk = 162000000,
> > - .pll_div_regs = { 0x43, 0x18, 0x8b, 0x08, 0x96, 0x55 },
> > + .pll_div_regs = { 0xd1, 0x43, 0x18, 0x8b, 0x08, 0x96, 0x55 },
> > }, {
> > .pixclk = 164000000,
> > - .pll_div_regs = { 0x45, 0x11, 0x83, 0x82, 0x90, 0x4b },
> > + .pll_div_regs = { 0xd1, 0x45, 0x11, 0x83, 0x82, 0x90, 0x4b },
> > }, {
> > .pixclk = 165000000,
> > - .pll_div_regs = { 0x45, 0x11, 0x84, 0x81, 0x90, 0x4b },
> > + .pll_div_regs = { 0xd1, 0x45, 0x11, 0x84, 0x81, 0x90, 0x4b },
> > }, {
> > .pixclk = 180000000,
> > - .pll_div_regs = { 0x4b, 0x10, 0x00, 0x00, 0x80, 0x00 },
> > + .pll_div_regs = { 0xd1, 0x4b, 0x10, 0x00, 0x00, 0x80, 0x00 },
> > }, {
> > .pixclk = 185625000,
> > - .pll_div_regs = { 0x4e, 0x12, 0x9a, 0x95, 0x80, 0x40 },
> > + .pll_div_regs = { 0xd1, 0x4e, 0x12, 0x9a, 0x95, 0x80, 0x40 },
> > }, {
> > .pixclk = 188000000,
> > - .pll_div_regs = { 0x4e, 0x12, 0xa7, 0x10, 0x80, 0x40 },
> > + .pll_div_regs = { 0xd1, 0x4e, 0x12, 0xa7, 0x10, 0x80, 0x40 },
> > }, {
> > .pixclk = 198000000,
> > - .pll_div_regs = { 0x52, 0x12, 0x82, 0x01, 0x88, 0x47 },
> > + .pll_div_regs = { 0xd1, 0x52, 0x12, 0x82, 0x01, 0x88, 0x47 },
> > }, {
> > .pixclk = 205000000,
> > - .pll_div_regs = { 0x55, 0x12, 0x8c, 0x05, 0x90, 0x4b },
> > + .pll_div_regs = { 0xd1, 0x55, 0x12, 0x8c, 0x05, 0x90, 0x4b },
> > }, {
> > .pixclk = 209500000,
> > - .pll_div_regs = { 0x57, 0x12, 0x98, 0x07, 0x90, 0x49 },
> > + .pll_div_regs = { 0xd1, 0x57, 0x12, 0x98, 0x07, 0x90, 0x49 },
> > }, {
> > .pixclk = 213000000,
> > - .pll_div_regs = { 0x58, 0x12, 0x84, 0x03, 0x82, 0x41 },
> > + .pll_div_regs = { 0xd1, 0x58, 0x12, 0x84, 0x03, 0x82, 0x41 },
> > }, {
> > .pixclk = 216000000,
> > - .pll_div_regs = { 0x5a, 0x10, 0x00, 0x00, 0x80, 0x00 },
> > + .pll_div_regs = { 0xd1, 0x5a, 0x10, 0x00, 0x00, 0x80, 0x00 },
> > }, {
> > .pixclk = 216216000,
> > - .pll_div_regs = { 0x5a, 0x12, 0xfd, 0x0c, 0x80, 0x40 },
> > + .pll_div_regs = { 0xd1, 0x5a, 0x12, 0xfd, 0x0c, 0x80, 0x40 },
> > }, {
> > .pixclk = 237600000,
> > - .pll_div_regs = { 0x63, 0x10, 0x00, 0x00, 0x80, 0x00 },
> > + .pll_div_regs = { 0xd1, 0x63, 0x10, 0x00, 0x00, 0x80, 0x00 },
> > }, {
> > .pixclk = 254000000,
> > - .pll_div_regs = { 0x69, 0x14, 0x89, 0x08, 0x80, 0x40 },
> > + .pll_div_regs = { 0xd1, 0x69, 0x14, 0x89, 0x08, 0x80, 0x40 },
> > }, {
> > .pixclk = 277500000,
> > - .pll_div_regs = { 0x73, 0x15, 0x88, 0x05, 0x90, 0x4d },
> > + .pll_div_regs = { 0xd1, 0x73, 0x15, 0x88, 0x05, 0x90, 0x4d },
> > }, {
> > .pixclk = 288000000,
> > - .pll_div_regs = { 0x78, 0x10, 0x00, 0x00, 0x80, 0x00 },
> > + .pll_div_regs = { 0xd1, 0x78, 0x10, 0x00, 0x00, 0x80, 0x00 },
> > }, {
> > .pixclk = 297000000,
> > - .pll_div_regs = { 0x7b, 0x15, 0x84, 0x03, 0x90, 0x45 },
> > + .pll_div_regs = { 0xd1, 0x7b, 0x15, 0x84, 0x03, 0x90, 0x45 },
> > },
> > };
> >
> > @@ -322,7 +339,8 @@ struct reg_settings {
> > };
> >
> > static const struct reg_settings common_phy_cfg[] = {
> > - { PHY_REG(0), 0x00 }, { PHY_REG(1), 0xd1 },
> > + { PHY_REG(0), 0x00 },
> > + /* PHY_REG(1-7) pix clk specific */
> > { PHY_REG(8), 0x4f }, { PHY_REG(9), 0x30 },
> > { PHY_REG(10), 0x33 }, { PHY_REG(11), 0x65 },
> > /* REG12 pixclk specific */
> > @@ -415,6 +433,76 @@ fsl_samsung_hdmi_phy_configure_pll_lock_det(struct fsl_samsung_hdmi_phy *phy,
> > phy->regs + PHY_REG(14));
> > }
> >
> > +static unsigned long fsl_samsung_hdmi_phy_find_pms(unsigned long fout, u8 *p, u16 *m, u8 *s)
> > +{
> > + unsigned long best_freq = 0;
> > + u32 min_delta = 0xffffffff;
> > + u8 _p, best_p;
> > + u16 _m, best_m;
> > + u8 _s, best_s;
> > +
> > + /* The ref manual states the values of 'P' range from 1 to 11 */
> > + for (_p = 1; _p <= 11; ++_p) {
> > + for (_s = 1; _s <= 16; ++_s) {
> > + u64 tmp;
> > + u32 delta;
> > +
> > + /* s must be one or even */
> > + if (_s > 1 && (_s & 0x01) == 1)
> > + _s++;
> > +
> > + /* _s cannot be 14 per the TRM */
> > + if (_s == 14)
> > + continue;
> > +
> > + /*
> > + * TODO: Ref Manual doesn't state the range of _m
> > + * so this should be further refined if possible.
> > + * This range was set based on the original values
> > + * in the look-up table
> > + */
>
> There is the strange note "Div by -Div by 255" in the RM. I think it's
> supposed to define the range, but is missing the number for the lower
> bound. The upper bound is probably 255!?
>
> But we might also leave it like it is here and extend it later after
> further testing.
I was confused by that too. I am not sure how a negative division
would work in this context.
>
> > + tmp = (u64)fout * (_p * _s);
> > + do_div(tmp, 24 * MHZ);
> > + _m = tmp;
> > + if (_m < 0x30 || _m > 0x7b)
> > + continue;
> > +
> > + /*
> > + * Rev 2 of the Ref Manual states the
> > + * VCO can range between 750MHz and
> > + * 3GHz. The VCO is assumed to be _m x
> > + * the reference frequency of 24MHz divided
> > + * by the prescaler, _p
>
> Maybe better: "The VSO is assumed to be (M * f_ref) / P"
I can reword this for better readability.
>
> > + */
> > + tmp = (u64)_m * 24 * MHZ;
> > + do_div(tmp, _p);
> > + if (tmp < 750 * MHZ ||
> > + tmp > 3000 * MHZ)
> > + continue;
> > +
> > + tmp = (u64)_m * 24 * MHZ;
> > + do_div(tmp, _p * _s);
>
> tmp already contains (_m * f_ref) / _p, so we sould be able to reuse
> that value here and simply do do_div(tmp, _s) without recalculating tmp, no?
>
> > +
> > + delta = abs(fout - tmp);
> > + if (delta < min_delta) {
> > + best_p = _p;
> > + best_s = _s;
> > + best_m = _m;
> > + min_delta = delta;
> > + best_freq = tmp;
> > + }
> > + }
> > + }
> > +
> > + if (best_freq) {
> > + *p = best_p;
> > + *m = best_m;
> > + *s = best_s;
> > + }
> > +
> > + return best_freq;
> > +}
> > +
> > static int fsl_samsung_hdmi_phy_configure(struct fsl_samsung_hdmi_phy *phy,
> > const struct phy_config *cfg)
> > {
> > @@ -428,13 +516,13 @@ static int fsl_samsung_hdmi_phy_configure(struct fsl_samsung_hdmi_phy *phy,
> > for (i = 0; i < ARRAY_SIZE(common_phy_cfg); i++)
> > writeb(common_phy_cfg[i].val, phy->regs + common_phy_cfg[i].reg);
> >
> > - /* set individual PLL registers PHY_REG2 ... PHY_REG7 */
> > + /* set individual PLL registers PHY_REG1 ... PHY_REG7 */
> > for (i = 0; i < PHY_PLL_DIV_REGS_NUM; i++)
> > - writeb(cfg->pll_div_regs[i], phy->regs + PHY_REG(2) + i * 4);
> > + writeb(cfg->pll_div_regs[i], phy->regs + PHY_REG(1) + i * 4);
> >
> > - /* High nibble of pll_div_regs[1] contains S which also gets written to REG21 */
> > + /* High nibble of PHY_REG3 and low nibble of PHY_REG21 both contain 'S' */
> > writeb(REG21_SEL_TX_CK_INV | FIELD_PREP(REG21_PMS_S_MASK,
> > - cfg->pll_div_regs[1] >> 4), phy->regs + PHY_REG(21));
> > + cfg->pll_div_regs[2] >> 4), phy->regs + PHY_REG(21));
> >
> > fsl_samsung_hdmi_phy_configure_pll_lock_det(phy, cfg);
> >
> > @@ -462,29 +550,70 @@ static unsigned long phy_clk_recalc_rate(struct clk_hw *hw,
> > static long phy_clk_round_rate(struct clk_hw *hw,
> > unsigned long rate, unsigned long *parent_rate)
> > {
> > + u32 int_div_clk;
> > int i;
> > + u16 m;
> > + u8 p, s;
> > +
> > + /* If the clock is out of range return error instead of searching */
> > + if (rate > 297000000 || rate < 22250000)
> > + return -EINVAL;
> >
> > + /* Check the look-up table */
> > for (i = ARRAY_SIZE(phy_pll_cfg) - 1; i >= 0; i--)
> > if (phy_pll_cfg[i].pixclk <= rate)
> > - return phy_pll_cfg[i].pixclk;
> > + break;
> > + /* If the rate is an exact match, return it now */
> > + if (rate == phy_pll_cfg[i].pixclk)
> > + return phy_pll_cfg[i].pixclk;
> > +
> > + /*
> > + * The math on the lookup table shows the PMS math yields a
> > + * frequency 5 x pixclk.
> > + * When we check the integer divider against the desired rate,
> > + * multiply the rate x 5 and then divide the outcome by 5.
> > + */
> > + int_div_clk = fsl_samsung_hdmi_phy_find_pms(rate * 5, &p, &m, &s) / 5;
> >
> > - return -EINVAL;
> > + /* If the rate is an exact match, return it now */
> > + if (int_div_clk == rate)
> > + return int_div_clk;
> > +
> > + /* Fall back to the closest value in the LUT */
> > + return phy_pll_cfg[i].pixclk;
> > }
> >
> > static int phy_clk_set_rate(struct clk_hw *hw,
> > unsigned long rate, unsigned long parent_rate)
> > {
> > struct fsl_samsung_hdmi_phy *phy = to_fsl_samsung_hdmi_phy(hw);
> > + u32 int_div_clk;
> > int i;
> > -
> > - for (i = ARRAY_SIZE(phy_pll_cfg) - 1; i >= 0; i--)
> > - if (phy_pll_cfg[i].pixclk <= rate)
> > - break;
> > -
> > - if (i < 0)
> > - return -EINVAL;
> > -
> > - phy->cur_cfg = &phy_pll_cfg[i];
> > + u16 m;
> > + u8 p, s;
> > +
> > + /* If the integer divider works, just use it */
> > + int_div_clk = fsl_samsung_hdmi_phy_find_pms(rate * 5, &p, &m, &s) / 5;
> > + if (int_div_clk == rate) {
> > + dev_dbg(phy->dev, "fsl_samsung_hdmi_phy: using integer divider\n");
> > + calculated_phy_pll_cfg.pixclk = int_div_clk;
> > + calculated_phy_pll_cfg.pll_div_regs[0] = FIELD_PREP(REG01_PMS_P_MASK, p);
> > + calculated_phy_pll_cfg.pll_div_regs[1] = m;
> > + calculated_phy_pll_cfg.pll_div_regs[2] = FIELD_PREP(REG03_PMS_S_MASK, s-1);
> > + /* pll_div_regs 3-6 are fixed and pre-defined already */
> > + phy->cur_cfg = &calculated_phy_pll_cfg;
> > + } else {
> > + /* Otherwise, search the LUT */
> > + dev_dbg(phy->dev, "fsl_samsung_hdmi_phy: using fractional divider\n");> + for (i = ARRAY_SIZE(phy_pll_cfg) - 1; i >= 0; i--)
> > + if (phy_pll_cfg[i].pixclk <= rate)
> > + break;
> > +
> > + if (i < 0)
> > + return -EINVAL;
> > +
> > + phy->cur_cfg = &phy_pll_cfg[i];
> > + }
> >
> > return fsl_samsung_hdmi_phy_configure(phy, phy->cur_cfg);
> > }
Powered by blists - more mailing lists