From: Oleg Zadorozhnyi Two things the driver reads from the chip can be wrong on a board, and neither has anywhere else to come from. The VCO frequency is derived from the feedback divider, which is exact while the loop runs but not while a PLL sits in free-run with a divider the configuration never programmed; a board that knows its own VCO can state it. The output-to-PLL routing is read from the output map registers, which describe what the loaded configuration did -- and a board whose outputs are fanned out differently from what those registers imply can state that too. Both are optional. Absent the properties the driver behaves exactly as before, deriving one and reading the other. Signed-off-by: Oleg Zadorozhnyi Assisted-by: Claude:claude-4-opus [chat] Signed-off-by: Ali Rouhi --- drivers/dpll/sit9531x/core.c | 104 +++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/drivers/dpll/sit9531x/core.c b/drivers/dpll/sit9531x/core.c index b15859890caa..51f7d8a4ea44 100644 --- a/drivers/dpll/sit9531x/core.c +++ b/drivers/dpll/sit9531x/core.c @@ -3862,6 +3862,108 @@ static u64 sit9531x_derive_clock_id(struct sit9531x_dev *sitdev) return clkid; } +/* + * Does an Fvco fall in the band the given PLL runs in? + * + * The two bands are disjoint, and which one applies is fixed per PLL, so a + * single envelope from the bottom of the low band to the top of the high + * one would accept both the ~1 GHz gap between them and a rate belonging to + * the other PLL's band. + */ +static bool sit9531x_fvco_in_band(u8 pll_idx, u64 fvco) +{ + if (pll_idx == 1 || pll_idx == 3) + return fvco >= SIT9531X_FVCO_HIGHBAND_MIN && + fvco <= SIT9531X_FVCO_HIGHBAND_MAX; + + return fvco >= SIT9531X_FVCO_LOWBAND_MIN && + fvco <= SIT9531X_FVCO_LOWBAND_MAX; +} + +/* + * Board-config overrides for fixed efuse/blob routing the chip registers do + * not describe unambiguously. Absent properties leave pll_fvco[] zeroed + * (derive from DIVN) and out_pll_map_valid false (use the OUT_MAP registers). + */ +static void sit9531x_parse_board_config(struct sit9531x_dev *sitdev) +{ + u32 map[SIT9531X_MAX_OUTPUTS]; + int n, i, rc; + + if (device_property_present(sitdev->dev, "sitime,pll-fvco")) { + rc = device_property_read_u64_array(sitdev->dev, + "sitime,pll-fvco", + sitdev->pll_fvco, + SIT9531X_NUM_PLLS); + if (rc) { + dev_warn(sitdev->dev, + "invalid sitime,pll-fvco (%d), ignoring\n", + rc); + memset(sitdev->pll_fvco, 0, sizeof(sitdev->pll_fvco)); + } + + /* + * The override is used verbatim by the divider math, so an + * implausible value (units typo, wrong cell count worked + * around with zeros) must not silently misprogram DIVO. + * Anything outside both VCO bands is dropped with a warning + * rather than trusted. + */ + for (i = 0; i < SIT9531X_NUM_PLLS; i++) { + u64 f = sitdev->pll_fvco[i]; + + if (f && !sit9531x_fvco_in_band(i, f)) { + dev_warn(sitdev->dev, + "PLL%c Fvco override %llu Hz is outside the band that PLL runs in, ignoring\n", + 'A' + i, f); + sitdev->pll_fvco[i] = 0; + } + } + } + + if (!device_property_present(sitdev->dev, "sitime,output-pll-map")) + return; + + /* + * Any 1..MAX_OUTPUTS length is accepted so the 8-output SiT95317 need + * not pad to 12; variant detection has not run yet and entries past + * the detected num_outputs are never indexed. Trailing entries of a + * short map must read as unmapped rather than 0 (== PLLA), which + * would mark unrouted outputs active in sit9531x_out_state_fetch(). + */ + memset(sitdev->out_pll_map, SIT9531X_OUT_PLL_UNMAPPED, + sizeof(sitdev->out_pll_map)); + + n = device_property_count_u32(sitdev->dev, "sitime,output-pll-map"); + if (n <= 0 || n > SIT9531X_MAX_OUTPUTS || + device_property_read_u32_array(sitdev->dev, "sitime,output-pll-map", + map, n)) { + dev_warn(sitdev->dev, + "invalid sitime,output-pll-map, ignoring\n"); + return; + } + + /* + * The binding allows only 0-3 and 255 per entry. A stray value + * would silently unroute an output (m >= SIT9531X_NUM_PLLS reads + * as unmapped in sit9531x_out_state_fetch()), so reject the whole + * property loudly instead. + */ + for (i = 0; i < n; i++) { + if (map[i] >= SIT9531X_NUM_PLLS && + map[i] != SIT9531X_OUT_PLL_UNMAPPED) { + dev_warn(sitdev->dev, + "sitime,output-pll-map entry %d is %u (must be 0-3 or 255), ignoring map\n", + i, map[i]); + return; + } + } + + for (i = 0; i < n; i++) + sitdev->out_pll_map[i] = map[i]; + sitdev->out_pll_map_valid = true; +} + int sit9531x_dev_probe(struct sit9531x_dev *sitdev) { struct clk *xtal_clk; @@ -3906,6 +4008,8 @@ int sit9531x_dev_probe(struct sit9531x_dev *sitdev) if (sitdev->reset_gpio) fsleep(10000); /* internal boot after release */ + sit9531x_parse_board_config(sitdev); + rc = sit9531x_read_variant_id(sitdev, &variant_id); if (rc) return rc; -- 2.39.2 (Apple Git-143)