kernel/git/stable/linux.git/drivers/ptp, branch linux-5.12.y

ptp: improve max_adj check against unreasonable values

2021-06-23T12:44:00+00:00

[ Upstream commit 475b92f932168a78da8109acd10bfb7578b8f2bb ] Scaled PPM conversion to PPB may (on 64bit systems) result in a value larger than s32 can hold (freq/scaled_ppm is a long). This means the kernel will not correctly reject unreasonably high ->freq values (e.g. > 4294967295ppb, 281474976645 scaled PPM). The conversion is equivalent to a division by ~66 (65.536), so the value of ppb is always smaller than ppm, but not small enough to assume narrowing the type from long -> s32 is okay. Note that reasonable user space (e.g. ptp4l) will not use such high values, anyway, 4289046510ppb ~= 4.3x, so the fix is somewhat pedantic. Fixes: d39a743511cd ("ptp: validate the requested frequency adjustment.") Fixes: d94ba80ebbea ("ptp: Added a brand new class driver for ptp clocks.") Signed-off-by: Jakub Kicinski Acked-by: Richard Cochran Signed-off-by: David S. Miller Signed-off-by: Sasha Levin

ptp: ocp: Fix a resource leak in an error handling path

2021-06-03T07:09:46+00:00

[ Upstream commit 9c1bb37f8cad5e2ee1933fa1da9a6baa7876a8e4 ] If an error occurs after a successful 'pci_ioremap_bar()' call, it must be undone by a corresponding 'pci_iounmap()' call, as already done in the remove function. Fixes: a7e1abad13f3 ("ptp: Add clock driver for the OpenCompute TimeCard.") Signed-off-by: Christophe JAILLET Acked-by: Richard Cochran Signed-off-by: David S. Miller Signed-off-by: Sasha Levin

ptp_qoriq: fix overflow in ptp_qoriq_adjfine() u64 calcalation

2021-03-24T19:10:03+00:00

Current calculation for diff of TMR_ADD register value may have 64-bit overflow in this code line, when long type scaled_ppm is large. adj *= scaled_ppm; This patch is to resolve it by using mul_u64_u64_div_u64(). Signed-off-by: Yangbo Lu Signed-off-by: David S. Miller

ptp: ptp_clockmatrix: clean-up - parenthesis around a == b are unnecessary

2021-02-17T21:49:26+00:00

Code clean-up. Signed-off-by: Vincent Cheng Signed-off-by: David S. Miller

ptp: ptp_clockmatrix: Simplify code - remove unnecessary `err` variable.

2021-02-17T21:49:26+00:00

Code clean-up. Signed-off-by: Vincent Cheng Signed-off-by: David S. Miller

ptp: ptp_clockmatrix: Coding style - tighten vertical spacing.

2021-02-17T21:49:26+00:00

Code clean-up. * Remove blank line between variable declarations. * Remove blank line between: err = blah(...) if (err) ... * Remove unnecessary blank line before/after loop constructs. Signed-off-by: Vincent Cheng Signed-off-by: David S. Miller

ptp: ptp_clockmatrix: Clean-up dev_*() messages.

2021-02-17T21:49:26+00:00

Code clean-up. * Remove unnecessary \n termination from dev_*() messages. * Remove 'char *fmt' to define strings to stay within 80 column limit. Not needed since coding guidelines increased to 100 columns limit. Keeping format in place allows static code checkers to validate the arguments. * Tighten up vertical spacing. Signed-off-by: Vincent Cheng Signed-off-by: David S. Miller

ptp: ptp_clockmatrix: Remove unused header declarations.

2021-02-17T21:49:25+00:00

Removed unused header declarations. Signed-off-by: Vincent Cheng Signed-off-by: David S. Miller

ptp: ptp_clockmatrix: Add alignment of 1 PPS to idtcm_perout_enable.

2021-02-17T21:49:25+00:00

When enabling output using PTP_CLK_REQ_PEROUT, need to align the output clock to the internal 1 PPS clock. Signed-off-by: Vincent Cheng Acked-by: Richard Cochran Signed-off-by: David S. Miller

ptp: ptp_clockmatrix: Add wait_for_sys_apll_dpll_lock.

2021-02-17T21:49:25+00:00

Part of the device initialization aligns the rising edge of the output clock to the internal 1 PPS clock. If the system APLL and DPLL is not locked, then the alignment will fail and there will be a fixed offset between the internal 1 PPS clock and the output clock. After loading the device firmware, poll the system APLL and DPLL for locked state prior to initialization, timing out after 2 seconds. Signed-off-by: Vincent Cheng Acked-by: Richard Cochran Signed-off-by: David S. Miller