From patchwork Thu Dec 14 15:24:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Min Li X-Patchwork-Id: 13493194 X-Patchwork-Delegate: kuba@kernel.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=hotmail.com header.i=@hotmail.com header.b="kkkg3i+H" Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04olkn2076.outbound.protection.outlook.com [40.92.45.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C5B11121; Thu, 14 Dec 2023 07:24:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lbXGhqgcN+iJ5R9wU91MYvxkLzrX3pkSMxXiJ1v4+y9L9LXFeuWgbFY1UALKWRHQQqRCgbc6D9SPDu/PzcnSV8DHsDmnkUFDcqIj1yPE/YoY4qjwMArmkEL7+/5uExhEoYQEginV3Sxg6RSGzP9tYOjW0Jl+S1e1uW6YyzhR12VE/XEpxIZtWXNJ5lmqFsCACUYJk6em9WcPzqepS1znHPy+U0d1Lpx/I92g+3F4cCpFHUHKJlkFupKxP022qJule9akPlnb0qBdXZKu+gu7ms4LB4U36AeVdHUlKtMPj0st6budDDLbfsdUzc9XNziARoUTGS+XfXtW2wNKi+GJaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=W7yMGmJPf/ciT7u0tPHKNZeyuMXes10fiJ4zu0h/8X8=; b=YfzPjE5UeC0XZPKMnAqkftahQHGj8hL+84zm1Iarc23C9KJ2bFbz3DOtm+YmRoL9EDF3Ti2Mcb29l9Vx8Sc8w7CKQLqA9TpUSNWR92BoEi7uXyKIRglepphDMPsmx2Z7FlIz/eUXho24ENW8ZRzRh7XUQu9+x9DJNj5aNRP/QH8Uo+hJUkHRyo1Y38ecuiF/6pqlark0vY+WGp8A+DNF2Z8Ps2nbuZ0WTa2QRVTCjljrad5LLWo9y39ct4Mu8UrkZk4iGP+WIhh46dAZoPLPbq5T2p/rptM2N+4Tj4m6Rx2oDphQBdNB25iSI4LzNOVIXOuUAvqb9U2sfOyw8iKMKg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=W7yMGmJPf/ciT7u0tPHKNZeyuMXes10fiJ4zu0h/8X8=; b=kkkg3i+H2LEKf6uobYlsd6uO0StgVOO3wxP48dYj8lbDtkEEeg2Ia1DvjoN0vu9Vvz43JiJAIRS5gyA1NRF1TEns1CSz7Jyy+3SbYDUUgPX0p2ihjuu1PuqxCJOqGuJ4iDdYIqVvfUVLt0AXwpEO3YN6i9TxTEo6RLTR2HiRq0c0GaIZzVZXwSq8NrdYxZwWtdz97Fpg3oAHD/0DzBPqUQu54yOfmiIOvw3R3MEwct0CHIgiUizE7cKCyxnpnd0A8j+iJEar1YO3uahy/QR32wJQukFuGYBAvk15jb3WVkBHKi7WsAjfwDpz8V2mMbKQLZLSEHg0z/cmKe/t5BBkjg== Received: from PH7PR03MB7064.namprd03.prod.outlook.com (2603:10b6:510:2a5::8) by PH0PR03MB5702.namprd03.prod.outlook.com (2603:10b6:510:41::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.28; Thu, 14 Dec 2023 15:24:28 +0000 Received: from PH7PR03MB7064.namprd03.prod.outlook.com ([fe80::9ca4:4c22:a89:9a8]) by PH7PR03MB7064.namprd03.prod.outlook.com ([fe80::9ca4:4c22:a89:9a8%7]) with mapi id 15.20.7091.028; Thu, 14 Dec 2023 15:24:28 +0000 From: Min Li To: richardcochran@gmail.com, lee@kernel.org Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Min Li Subject: [PATCH net-next v7 1/5] ptp: clockmatrix: support 32-bit address space Date: Thu, 14 Dec 2023 10:24:11 -0500 Message-ID: X-Mailer: git-send-email 2.39.2 X-TMN: [ouWZnYprU4J9ObWtF/5bUysiv0RAf7iJOGbgSxf/Q+8=] X-ClientProxiedBy: YQBPR01CA0054.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:2::26) To PH7PR03MB7064.namprd03.prod.outlook.com (2603:10b6:510:2a5::8) X-Microsoft-Original-Message-ID: <20231214152415.14785-1-lnimi@hotmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH7PR03MB7064:EE_|PH0PR03MB5702:EE_ X-MS-Office365-Filtering-Correlation-Id: 3e384250-a15b-40d5-812c-08dbfcb8c288 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ldwTaC8HETtQbU3YrZ292WXAxLC6uCBBt/LjR7Cw0uYz1PpSCZCPVp7DnWA/UcOCTUKEjzffzdDCGSsVNszH4RQYD33rqS2E5bxjMZb1M5zteeNJ2EeQIUY+TVJaPxi0GzaNYhKSN1HLT5y/K+F/IuMXc2jMu9krkq3Jcpn3xIv9VHQ35Tqi1mht43fBzQLsXxpzbDtsc9d6nkRK0kISUsuDf/KsnHLNU7m+E1xKoauY52TsL42/gN+vqc6SF/gmepde/QRnuitPImv1iZo3Gtyg1muLxsxlD+OfCgA5Ibj7FWtKF9yj50jD1fbJX1Er1m5DiygB2x/82KgarBNB5KcQu9Hmoe9V+w9dQS5aveFUeYGMG0PosdR1rsGIIA8Oa3SlXLL4AF36csDARNHMDiNzacZ/2PeXl7wtMTkUl0QWzpBmvyGLA/tjmdBH0QmaHEXGbUyVFf3F4QBadQbHy6BXzHpl7W/CilnAB/E4kgAk6+KUvMB4kk7ORLCB+jFvaP8Rb2xroTBDntiXmEZ5gbIN5XBtLqCMRdym2ky6yIwKiWkjIXiK1xpxJ+Jsa8ZP X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 55wpS38/I40SVmjamrcd1wS/W1X4RZMWiU+EvX4SfhQ6oHTwcZldsxdDOPVvjPGJACyUwQfTM36cqiBsrk2IZa5V6ua3PSifPNyggJR1EqJWGacucarlq7KBvSexVBAgrlBubGGGGRj+Wd3eaQieeaiQjqbIGnTQ1AZpyPiz9i22qe7YfEROQK3cH7ICsd8FHY+7VUQcyd9ElusjSPOusIA3zCRvoBrkTAuD60EG88/8O00Epq+zpNSm3BDopghH3OYzyAjEc/MIDJRImdxoyYC8XFMDi8V6ge1HxpPcXY+RXAaPCvE4uLvEA0y94c/WIA49cwSoOMz09u9HpGf4h9xjd6l4J0lELvsXV/N6Hx+e31q1L9cb/sfZz21DgvmOGdE2MT+uInqgACYsIWYFt3ord8TtyNOKrPMu686zrncXZFeX4JzJ06fQ8BbjW2y1aVi+UbKih4q8OkZbxr0LfePtyLIouy1W1fPH8lxRCd2SupkyG+byJrMdOJOcsqtRQDjoJeV02AjxIUtsV9UepgpP/eiiYtqv4s6wmIVLKFgHqvyh74ejY+fpjqVWv7/TAdi9gUfjlmFPZKRk0415VTtckcx9psrA1pXb6gG0QbRolfR+o407vzgAUWRSwLSJyZH7k/iiiphAzXQb89nupzIlm63Iq2074n5bhTIZYCS3GUPbPhJibH+qTFndpTOUJCxcoUAV0W06XP77R0A766ZMam5irlOxDcdd9V80cnZg+zRX0E33iProOUdZFY89kJqA8NIVTMYxjriS7gu3NRCqfLAWNdMDvA0SM53vxdSF+7pk7ffrbFEI5/T7BVgw3tacb3RCjCgFIfDSO5Y3BSwDXAPYOzZcxg4CgxuYsnY7VCJG1tza49nCDo8q23As+cI5AK3rUMNyfLXJ9JnTcS6YqlXsx+03sXi4AgCdU3LNWpav1q9fwmTJJJCAS8tzBW0nkd4q/5FYh8NVMwZ5g4PYpmBFKEurb0WyAvd1SvqZgs95XDFmuntuTzHW8FLOC34mL729LZn/yCYOkrN9lxEJWnxTfZTvcQHr4zvNWw0BXx4cbRhZ5FDbCYUfkvQI5gvKZ7HZZ6lRc/n2lSlA0CoMbg6rxnCpkJK55CW6PJnrW4sL4h1HcodCAXQ3HRnSQ2iGSndSOlyqXSIqC1We9tM6NJBXXAiucwZ7TwQcdS+w+0vOnxiPRCKskPitbkqAd6Yj6Sq7pwTuLG7ZD8Gw0w== X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-839f4.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 3e384250-a15b-40d5-812c-08dbfcb8c288 X-MS-Exchange-CrossTenant-AuthSource: PH7PR03MB7064.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Dec 2023 15:24:27.7870 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR03MB5702 X-Patchwork-Delegate: kuba@kernel.org From: Min Li We used to assume 0x2010xxxx address. Now that we need to access 0x2011xxxx address, we need to support read/write the whole 32-bit address space. Signed-off-by: Min Li --- - Drop MAX_ABS_WRITE_PHASE_PICOSECONDS advised by Rahul - Apply SCSR_ADDR to scrach register in idtcm_load_firmware advised by Simon - Apply u32 to base in idtcm_output_enable advised by Simon - Correct sync_ctrl0/1 parameter position for idtcm_write advised by Simon - Restore adjphase function suggested by Rahul - Separate unrelated stuff to patches suggested by Paolo - Squash commits and add missing commit msg suggested by Jakub drivers/ptp/ptp_clockmatrix.c | 59 ++-- drivers/ptp/ptp_clockmatrix.h | 32 +- include/linux/mfd/idt8a340_reg.h | 542 ++++++++++++++++--------------- 3 files changed, 317 insertions(+), 316 deletions(-) diff --git a/drivers/ptp/ptp_clockmatrix.c b/drivers/ptp/ptp_clockmatrix.c index f6f9d4adce04..f8556627befa 100644 --- a/drivers/ptp/ptp_clockmatrix.c +++ b/drivers/ptp/ptp_clockmatrix.c @@ -41,8 +41,8 @@ module_param(firmware, charp, 0); static int _idtcm_adjfine(struct idtcm_channel *channel, long scaled_ppm); static inline int idtcm_read(struct idtcm *idtcm, - u16 module, - u16 regaddr, + u32 module, + u32 regaddr, u8 *buf, u16 count) { @@ -50,8 +50,8 @@ static inline int idtcm_read(struct idtcm *idtcm, } static inline int idtcm_write(struct idtcm *idtcm, - u16 module, - u16 regaddr, + u32 module, + u32 regaddr, u8 *buf, u16 count) { @@ -62,7 +62,8 @@ static int contains_full_configuration(struct idtcm *idtcm, const struct firmware *fw) { struct idtcm_fwrc *rec = (struct idtcm_fwrc *)fw->data; - u16 scratch = IDTCM_FW_REG(idtcm->fw_ver, V520, SCRATCH); + u16 scratch = SCSR_ADDR(IDTCM_FW_REG(idtcm->fw_ver, V520, SCRATCH)); + u16 gpio_control = SCSR_ADDR(GPIO_USER_CONTROL); s32 full_count; s32 count = 0; u16 regaddr; @@ -70,8 +71,8 @@ static int contains_full_configuration(struct idtcm *idtcm, s32 len; /* 4 bytes skipped every 0x80 */ - full_count = (scratch - GPIO_USER_CONTROL) - - ((scratch >> 7) - (GPIO_USER_CONTROL >> 7)) * 4; + full_count = (scratch - gpio_control) - + ((scratch >> 7) - (gpio_control >> 7)) * 4; /* If the firmware contains 'full configuration' SM_RESET can be used * to ensure proper configuration. @@ -88,7 +89,7 @@ static int contains_full_configuration(struct idtcm *idtcm, rec++; /* Top (status registers) and bottom are read-only */ - if (regaddr < GPIO_USER_CONTROL || regaddr >= scratch) + if (regaddr < gpio_control || regaddr >= scratch) continue; /* Page size 128, last 4 bytes of page skipped */ @@ -506,8 +507,8 @@ static int _sync_pll_output(struct idtcm *idtcm, { int err; u8 val; - u16 sync_ctrl0; - u16 sync_ctrl1; + u32 sync_ctrl0; + u32 sync_ctrl1; u8 temp; if (qn == 0 && qn_plus_1 == 0) @@ -553,11 +554,11 @@ static int _sync_pll_output(struct idtcm *idtcm, val = SYNCTRL1_MASTER_SYNC_RST; /* Place master sync in reset */ - err = idtcm_write(idtcm, 0, sync_ctrl1, &val, sizeof(val)); + err = idtcm_write(idtcm, sync_ctrl1, 0, &val, sizeof(val)); if (err) return err; - err = idtcm_write(idtcm, 0, sync_ctrl0, &sync_src, sizeof(sync_src)); + err = idtcm_write(idtcm, sync_ctrl0, 0, &sync_src, sizeof(sync_src)); if (err) return err; @@ -570,27 +571,27 @@ static int _sync_pll_output(struct idtcm *idtcm, if (qn_plus_1) val |= SYNCTRL1_Q1_DIV_SYNC_TRIG; - err = idtcm_write(idtcm, 0, sync_ctrl1, &val, sizeof(val)); + err = idtcm_write(idtcm, sync_ctrl1, 0, &val, sizeof(val)); if (err) return err; /* PLL5 can have OUT8 as second additional output. */ if (pll == 5 && qn_plus_1 != 0) { - err = idtcm_read(idtcm, 0, HW_Q8_CTRL_SPARE, + err = idtcm_read(idtcm, HW_Q8_CTRL_SPARE, 0, &temp, sizeof(temp)); if (err) return err; temp &= ~(Q9_TO_Q8_SYNC_TRIG); - err = idtcm_write(idtcm, 0, HW_Q8_CTRL_SPARE, + err = idtcm_write(idtcm, HW_Q8_CTRL_SPARE, 0, &temp, sizeof(temp)); if (err) return err; temp |= Q9_TO_Q8_SYNC_TRIG; - err = idtcm_write(idtcm, 0, HW_Q8_CTRL_SPARE, + err = idtcm_write(idtcm, HW_Q8_CTRL_SPARE, 0, &temp, sizeof(temp)); if (err) return err; @@ -598,21 +599,21 @@ static int _sync_pll_output(struct idtcm *idtcm, /* PLL6 can have OUT11 as second additional output. */ if (pll == 6 && qn_plus_1 != 0) { - err = idtcm_read(idtcm, 0, HW_Q11_CTRL_SPARE, + err = idtcm_read(idtcm, HW_Q11_CTRL_SPARE, 0, &temp, sizeof(temp)); if (err) return err; temp &= ~(Q10_TO_Q11_SYNC_TRIG); - err = idtcm_write(idtcm, 0, HW_Q11_CTRL_SPARE, + err = idtcm_write(idtcm, HW_Q11_CTRL_SPARE, 0, &temp, sizeof(temp)); if (err) return err; temp |= Q10_TO_Q11_SYNC_TRIG; - err = idtcm_write(idtcm, 0, HW_Q11_CTRL_SPARE, + err = idtcm_write(idtcm, HW_Q11_CTRL_SPARE, 0, &temp, sizeof(temp)); if (err) return err; @@ -620,7 +621,7 @@ static int _sync_pll_output(struct idtcm *idtcm, /* Place master sync out of reset */ val &= ~(SYNCTRL1_MASTER_SYNC_RST); - err = idtcm_write(idtcm, 0, sync_ctrl1, &val, sizeof(val)); + err = idtcm_write(idtcm, sync_ctrl1, 0, &val, sizeof(val)); return err; } @@ -637,7 +638,7 @@ static int idtcm_sync_pps_output(struct idtcm_channel *channel) u8 temp; u16 output_mask = channel->output_mask; - err = idtcm_read(idtcm, 0, HW_Q8_CTRL_SPARE, + err = idtcm_read(idtcm, HW_Q8_CTRL_SPARE, 0, &temp, sizeof(temp)); if (err) return err; @@ -646,7 +647,7 @@ static int idtcm_sync_pps_output(struct idtcm_channel *channel) Q9_TO_Q8_FANOUT_AND_CLOCK_SYNC_ENABLE_MASK) out8_mux = 1; - err = idtcm_read(idtcm, 0, HW_Q11_CTRL_SPARE, + err = idtcm_read(idtcm, HW_Q11_CTRL_SPARE, 0, &temp, sizeof(temp)); if (err) return err; @@ -1253,7 +1254,7 @@ static void display_pll_and_masks(struct idtcm *idtcm) static int idtcm_load_firmware(struct idtcm *idtcm, struct device *dev) { - u16 scratch = IDTCM_FW_REG(idtcm->fw_ver, V520, SCRATCH); + u16 scratch = SCSR_ADDR(IDTCM_FW_REG(idtcm->fw_ver, V520, SCRATCH)); char fname[128] = FW_FILENAME; const struct firmware *fw; struct idtcm_fwrc *rec; @@ -1303,14 +1304,14 @@ static int idtcm_load_firmware(struct idtcm *idtcm, err = 0; /* Top (status registers) and bottom are read-only */ - if (regaddr < GPIO_USER_CONTROL || regaddr >= scratch) + if (regaddr < SCSR_ADDR(GPIO_USER_CONTROL) || regaddr >= scratch) continue; /* Page size 128, last 4 bytes of page skipped */ if ((loaddr > 0x7b && loaddr <= 0x7f) || loaddr > 0xfb) continue; - err = idtcm_write(idtcm, regaddr, 0, &val, sizeof(val)); + err = idtcm_write(idtcm, SCSR_BASE, regaddr, &val, sizeof(val)); } if (err) @@ -1340,7 +1341,7 @@ static int idtcm_output_enable(struct idtcm_channel *channel, return base; } - err = idtcm_read(idtcm, (u16)base, OUT_CTRL_1, &val, sizeof(val)); + err = idtcm_read(idtcm, (u32)base, OUT_CTRL_1, &val, sizeof(val)); if (err) return err; @@ -1349,7 +1350,7 @@ static int idtcm_output_enable(struct idtcm_channel *channel, else val &= ~SQUELCH_DISABLE; - return idtcm_write(idtcm, (u16)base, OUT_CTRL_1, &val, sizeof(val)); + return idtcm_write(idtcm, (u32)base, OUT_CTRL_1, &val, sizeof(val)); } static int idtcm_perout_enable(struct idtcm_channel *channel, @@ -1713,10 +1714,10 @@ static s32 idtcm_getmaxphase(struct ptp_clock_info *ptp __always_unused) static int _idtcm_adjphase(struct idtcm_channel *channel, s32 delta_ns) { struct idtcm *idtcm = channel->idtcm; - int err; - u8 i; u8 buf[4] = {0}; s32 phase_50ps; + int err; + u8 i; if (channel->mode != PTP_PLL_MODE_WRITE_PHASE) { err = channel->configure_write_phase(channel); diff --git a/drivers/ptp/ptp_clockmatrix.h b/drivers/ptp/ptp_clockmatrix.h index 7c17c4f7f573..ad39dc6decdf 100644 --- a/drivers/ptp/ptp_clockmatrix.h +++ b/drivers/ptp/ptp_clockmatrix.h @@ -54,21 +54,9 @@ #define LOCK_TIMEOUT_MS (2000) #define LOCK_POLL_INTERVAL_MS (10) -#define IDTCM_MAX_WRITE_COUNT (512) - #define PHASE_PULL_IN_MAX_PPB (144000) #define PHASE_PULL_IN_MIN_THRESHOLD_NS (2) -/* - * Return register address based on passed in firmware version - */ -#define IDTCM_FW_REG(FW, VER, REG) (((FW) < (VER)) ? (REG) : (REG##_##VER)) -enum fw_version { - V_DEFAULT = 0, - V487 = 1, - V520 = 2, -}; - /* PTP PLL Mode */ enum ptp_pll_mode { PTP_PLL_MODE_MIN = 0, @@ -84,16 +72,16 @@ struct idtcm_channel { struct ptp_clock_info caps; struct ptp_clock *ptp_clock; struct idtcm *idtcm; - u16 dpll_phase; - u16 dpll_freq; - u16 dpll_n; - u16 dpll_ctrl_n; - u16 dpll_phase_pull_in; - u16 tod_read_primary; - u16 tod_read_secondary; - u16 tod_write; - u16 tod_n; - u16 hw_dpll_n; + u32 dpll_phase; + u32 dpll_freq; + u32 dpll_n; + u32 dpll_ctrl_n; + u32 dpll_phase_pull_in; + u32 tod_read_primary; + u32 tod_read_secondary; + u32 tod_write; + u32 tod_n; + u32 hw_dpll_n; u8 sync_src; enum ptp_pll_mode mode; int (*configure_write_frequency)(struct idtcm_channel *channel); diff --git a/include/linux/mfd/idt8a340_reg.h b/include/linux/mfd/idt8a340_reg.h index 0c706085c205..b680a0eb5f68 100644 --- a/include/linux/mfd/idt8a340_reg.h +++ b/include/linux/mfd/idt8a340_reg.h @@ -7,20 +7,20 @@ #ifndef HAVE_IDT8A340_REG #define HAVE_IDT8A340_REG -#define PAGE_ADDR_BASE 0x0000 -#define PAGE_ADDR 0x00fc +#define SCSR_BASE 0x20100000 +#define SCSR_ADDR(x) ((x) & 0xffff) -#define HW_REVISION 0x8180 +#define HW_REVISION 0x20108180 #define REV_ID 0x007a -#define HW_DPLL_0 (0x8a00) -#define HW_DPLL_1 (0x8b00) -#define HW_DPLL_2 (0x8c00) -#define HW_DPLL_3 (0x8d00) -#define HW_DPLL_4 (0x8e00) -#define HW_DPLL_5 (0x8f00) -#define HW_DPLL_6 (0x9000) -#define HW_DPLL_7 (0x9100) +#define HW_DPLL_0 (0x20108a00) +#define HW_DPLL_1 (0x20108b00) +#define HW_DPLL_2 (0x20108c00) +#define HW_DPLL_3 (0x20108d00) +#define HW_DPLL_4 (0x20108e00) +#define HW_DPLL_5 (0x20108f00) +#define HW_DPLL_6 (0x20109000) +#define HW_DPLL_7 (0x20109100) #define HW_DPLL_TOD_SW_TRIG_ADDR__0 (0x080) #define HW_DPLL_TOD_CTRL_1 (0x089) @@ -28,22 +28,22 @@ #define HW_DPLL_TOD_OVR__0 (0x098) #define HW_DPLL_TOD_OUT_0__0 (0x0B0) -#define HW_Q0_Q1_CH_SYNC_CTRL_0 (0xa740) -#define HW_Q0_Q1_CH_SYNC_CTRL_1 (0xa741) -#define HW_Q2_Q3_CH_SYNC_CTRL_0 (0xa742) -#define HW_Q2_Q3_CH_SYNC_CTRL_1 (0xa743) -#define HW_Q4_Q5_CH_SYNC_CTRL_0 (0xa744) -#define HW_Q4_Q5_CH_SYNC_CTRL_1 (0xa745) -#define HW_Q6_Q7_CH_SYNC_CTRL_0 (0xa746) -#define HW_Q6_Q7_CH_SYNC_CTRL_1 (0xa747) -#define HW_Q8_CH_SYNC_CTRL_0 (0xa748) -#define HW_Q8_CH_SYNC_CTRL_1 (0xa749) -#define HW_Q9_CH_SYNC_CTRL_0 (0xa74a) -#define HW_Q9_CH_SYNC_CTRL_1 (0xa74b) -#define HW_Q10_CH_SYNC_CTRL_0 (0xa74c) -#define HW_Q10_CH_SYNC_CTRL_1 (0xa74d) -#define HW_Q11_CH_SYNC_CTRL_0 (0xa74e) -#define HW_Q11_CH_SYNC_CTRL_1 (0xa74f) +#define HW_Q0_Q1_CH_SYNC_CTRL_0 (0x2010a740) +#define HW_Q0_Q1_CH_SYNC_CTRL_1 (0x2010a741) +#define HW_Q2_Q3_CH_SYNC_CTRL_0 (0x2010a742) +#define HW_Q2_Q3_CH_SYNC_CTRL_1 (0x2010a743) +#define HW_Q4_Q5_CH_SYNC_CTRL_0 (0x2010a744) +#define HW_Q4_Q5_CH_SYNC_CTRL_1 (0x2010a745) +#define HW_Q6_Q7_CH_SYNC_CTRL_0 (0x2010a746) +#define HW_Q6_Q7_CH_SYNC_CTRL_1 (0x2010a747) +#define HW_Q8_CH_SYNC_CTRL_0 (0x2010a748) +#define HW_Q8_CH_SYNC_CTRL_1 (0x2010a749) +#define HW_Q9_CH_SYNC_CTRL_0 (0x2010a74a) +#define HW_Q9_CH_SYNC_CTRL_1 (0x2010a74b) +#define HW_Q10_CH_SYNC_CTRL_0 (0x2010a74c) +#define HW_Q10_CH_SYNC_CTRL_1 (0x2010a74d) +#define HW_Q11_CH_SYNC_CTRL_0 (0x2010a74e) +#define HW_Q11_CH_SYNC_CTRL_1 (0x2010a74f) #define SYNC_SOURCE_DPLL0_TOD_PPS 0x14 #define SYNC_SOURCE_DPLL1_TOD_PPS 0x15 @@ -58,8 +58,8 @@ #define SYNCTRL1_Q1_DIV_SYNC_TRIG BIT(1) #define SYNCTRL1_Q0_DIV_SYNC_TRIG BIT(0) -#define HW_Q8_CTRL_SPARE (0xa7d4) -#define HW_Q11_CTRL_SPARE (0xa7ec) +#define HW_Q8_CTRL_SPARE (0x2010a7d4) +#define HW_Q11_CTRL_SPARE (0x2010a7ec) /** * Select FOD5 as sync_trigger for Q8 divider. @@ -95,12 +95,12 @@ */ #define Q10_TO_Q11_FANOUT_AND_CLOCK_SYNC_ENABLE_MASK (BIT(0) | BIT(2)) -#define RESET_CTRL 0xc000 +#define RESET_CTRL 0x2010c000 #define SM_RESET 0x0012 #define SM_RESET_V520 0x0013 #define SM_RESET_CMD 0x5A -#define GENERAL_STATUS 0xc014 +#define GENERAL_STATUS 0x2010c014 #define BOOT_STATUS 0x0000 #define HW_REV_ID 0x000A #define BOND_ID 0x000B @@ -115,7 +115,7 @@ #define PRODUCT_ID 0x001e #define OTP_SCSR_CONFIG_SELECT 0x0022 -#define STATUS 0xc03c +#define STATUS 0x2010c03c #define DPLL0_STATUS 0x0018 #define DPLL1_STATUS 0x0019 #define DPLL2_STATUS 0x001a @@ -138,60 +138,62 @@ #define USER_GPIO0_TO_7_STATUS 0x008a #define USER_GPIO8_TO_15_STATUS 0x008b -#define GPIO_USER_CONTROL 0xc160 +#define GPIO_USER_CONTROL 0x2010c160 #define GPIO0_TO_7_OUT 0x0000 #define GPIO8_TO_15_OUT 0x0001 #define GPIO0_TO_7_OUT_V520 0x0002 #define GPIO8_TO_15_OUT_V520 0x0003 -#define STICKY_STATUS_CLEAR 0xc164 - -#define GPIO_TOD_NOTIFICATION_CLEAR 0xc16c - -#define ALERT_CFG 0xc188 - -#define SYS_DPLL_XO 0xc194 - -#define SYS_APLL 0xc19c - -#define INPUT_0 0xc1b0 -#define INPUT_1 0xc1c0 -#define INPUT_2 0xc1d0 -#define INPUT_3 0xc200 -#define INPUT_4 0xc210 -#define INPUT_5 0xc220 -#define INPUT_6 0xc230 -#define INPUT_7 0xc240 -#define INPUT_8 0xc250 -#define INPUT_9 0xc260 -#define INPUT_10 0xc280 -#define INPUT_11 0xc290 -#define INPUT_12 0xc2a0 -#define INPUT_13 0xc2b0 -#define INPUT_14 0xc2c0 -#define INPUT_15 0xc2d0 - -#define REF_MON_0 0xc2e0 -#define REF_MON_1 0xc2ec -#define REF_MON_2 0xc300 -#define REF_MON_3 0xc30c -#define REF_MON_4 0xc318 -#define REF_MON_5 0xc324 -#define REF_MON_6 0xc330 -#define REF_MON_7 0xc33c -#define REF_MON_8 0xc348 -#define REF_MON_9 0xc354 -#define REF_MON_10 0xc360 -#define REF_MON_11 0xc36c -#define REF_MON_12 0xc380 -#define REF_MON_13 0xc38c -#define REF_MON_14 0xc398 -#define REF_MON_15 0xc3a4 - -#define DPLL_0 0xc3b0 +#define STICKY_STATUS_CLEAR 0x2010c164 + +#define GPIO_TOD_NOTIFICATION_CLEAR 0x2010c16c + +#define ALERT_CFG 0x2010c188 + +#define SYS_DPLL_XO 0x2010c194 + +#define SYS_APLL 0x2010c19c + +#define INPUT_0 0x2010c1b0 +#define INPUT_1 0x2010c1c0 +#define INPUT_2 0x2010c1d0 +#define INPUT_3 0x2010c200 +#define INPUT_4 0x2010c210 +#define INPUT_5 0x2010c220 +#define INPUT_6 0x2010c230 +#define INPUT_7 0x2010c240 +#define INPUT_8 0x2010c250 +#define INPUT_9 0x2010c260 +#define INPUT_10 0x2010c280 +#define INPUT_11 0x2010c290 +#define INPUT_12 0x2010c2a0 +#define INPUT_13 0x2010c2b0 +#define INPUT_14 0x2010c2c0 +#define INPUT_15 0x2010c2d0 + +#define REF_MON_0 0x2010c2e0 +#define REF_MON_1 0x2010c2ec +#define REF_MON_2 0x2010c300 +#define REF_MON_3 0x2010c30c +#define REF_MON_4 0x2010c318 +#define REF_MON_5 0x2010c324 +#define REF_MON_6 0x2010c330 +#define REF_MON_7 0x2010c33c +#define REF_MON_8 0x2010c348 +#define REF_MON_9 0x2010c354 +#define REF_MON_10 0x2010c360 +#define REF_MON_11 0x2010c36c +#define REF_MON_12 0x2010c380 +#define REF_MON_13 0x2010c38c +#define REF_MON_14 0x2010c398 +#define REF_MON_15 0x2010c3a4 + +#define DPLL_0 0x2010c3b0 #define DPLL_CTRL_REG_0 0x0002 #define DPLL_CTRL_REG_1 0x0003 #define DPLL_CTRL_REG_2 0x0004 +#define DPLL_WF_TIMER 0x002c +#define DPLL_WP_TIMER 0x002e #define DPLL_TOD_SYNC_CFG 0x0031 #define DPLL_COMBO_SLAVE_CFG_0 0x0032 #define DPLL_COMBO_SLAVE_CFG_1 0x0033 @@ -200,69 +202,69 @@ #define DPLL_PHASE_MEASUREMENT_CFG 0x0036 #define DPLL_MODE 0x0037 #define DPLL_MODE_V520 0x003B -#define DPLL_1 0xc400 -#define DPLL_2 0xc438 -#define DPLL_2_V520 0xc43c -#define DPLL_3 0xc480 -#define DPLL_4 0xc4b8 -#define DPLL_4_V520 0xc4bc -#define DPLL_5 0xc500 -#define DPLL_6 0xc538 -#define DPLL_6_V520 0xc53c -#define DPLL_7 0xc580 -#define SYS_DPLL 0xc5b8 -#define SYS_DPLL_V520 0xc5bc - -#define DPLL_CTRL_0 0xc600 +#define DPLL_1 0x2010c400 +#define DPLL_2 0x2010c438 +#define DPLL_2_V520 0x2010c43c +#define DPLL_3 0x2010c480 +#define DPLL_4 0x2010c4b8 +#define DPLL_4_V520 0x2010c4bc +#define DPLL_5 0x2010c500 +#define DPLL_6 0x2010c538 +#define DPLL_6_V520 0x2010c53c +#define DPLL_7 0x2010c580 +#define SYS_DPLL 0x2010c5b8 +#define SYS_DPLL_V520 0x2010c5bc + +#define DPLL_CTRL_0 0x2010c600 #define DPLL_CTRL_DPLL_MANU_REF_CFG 0x0001 #define DPLL_CTRL_DPLL_FOD_FREQ 0x001c #define DPLL_CTRL_COMBO_MASTER_CFG 0x003a -#define DPLL_CTRL_1 0xc63c -#define DPLL_CTRL_2 0xc680 -#define DPLL_CTRL_3 0xc6bc -#define DPLL_CTRL_4 0xc700 -#define DPLL_CTRL_5 0xc73c -#define DPLL_CTRL_6 0xc780 -#define DPLL_CTRL_7 0xc7bc -#define SYS_DPLL_CTRL 0xc800 - -#define DPLL_PHASE_0 0xc818 +#define DPLL_CTRL_1 0x2010c63c +#define DPLL_CTRL_2 0x2010c680 +#define DPLL_CTRL_3 0x2010c6bc +#define DPLL_CTRL_4 0x2010c700 +#define DPLL_CTRL_5 0x2010c73c +#define DPLL_CTRL_6 0x2010c780 +#define DPLL_CTRL_7 0x2010c7bc +#define SYS_DPLL_CTRL 0x2010c800 + +#define DPLL_PHASE_0 0x2010c818 /* Signed 42-bit FFO in units of 2^(-53) */ #define DPLL_WR_PHASE 0x0000 -#define DPLL_PHASE_1 0xc81c -#define DPLL_PHASE_2 0xc820 -#define DPLL_PHASE_3 0xc824 -#define DPLL_PHASE_4 0xc828 -#define DPLL_PHASE_5 0xc82c -#define DPLL_PHASE_6 0xc830 -#define DPLL_PHASE_7 0xc834 - -#define DPLL_FREQ_0 0xc838 +#define DPLL_PHASE_1 0x2010c81c +#define DPLL_PHASE_2 0x2010c820 +#define DPLL_PHASE_3 0x2010c824 +#define DPLL_PHASE_4 0x2010c828 +#define DPLL_PHASE_5 0x2010c82c +#define DPLL_PHASE_6 0x2010c830 +#define DPLL_PHASE_7 0x2010c834 + +#define DPLL_FREQ_0 0x2010c838 /* Signed 42-bit FFO in units of 2^(-53) */ #define DPLL_WR_FREQ 0x0000 -#define DPLL_FREQ_1 0xc840 -#define DPLL_FREQ_2 0xc848 -#define DPLL_FREQ_3 0xc850 -#define DPLL_FREQ_4 0xc858 -#define DPLL_FREQ_5 0xc860 -#define DPLL_FREQ_6 0xc868 -#define DPLL_FREQ_7 0xc870 - -#define DPLL_PHASE_PULL_IN_0 0xc880 +#define DPLL_FREQ_1 0x2010c840 +#define DPLL_FREQ_2 0x2010c848 +#define DPLL_FREQ_3 0x2010c850 +#define DPLL_FREQ_4 0x2010c858 +#define DPLL_FREQ_5 0x2010c860 +#define DPLL_FREQ_6 0x2010c868 +#define DPLL_FREQ_7 0x2010c870 + +#define DPLL_PHASE_PULL_IN_0 0x2010c880 #define PULL_IN_OFFSET 0x0000 /* Signed 32 bit */ #define PULL_IN_SLOPE_LIMIT 0x0004 /* Unsigned 24 bit */ #define PULL_IN_CTRL 0x0007 -#define DPLL_PHASE_PULL_IN_1 0xc888 -#define DPLL_PHASE_PULL_IN_2 0xc890 -#define DPLL_PHASE_PULL_IN_3 0xc898 -#define DPLL_PHASE_PULL_IN_4 0xc8a0 -#define DPLL_PHASE_PULL_IN_5 0xc8a8 -#define DPLL_PHASE_PULL_IN_6 0xc8b0 -#define DPLL_PHASE_PULL_IN_7 0xc8b8 - -#define GPIO_CFG 0xc8c0 +#define DPLL_PHASE_PULL_IN_1 0x2010c888 +#define DPLL_PHASE_PULL_IN_2 0x2010c890 +#define DPLL_PHASE_PULL_IN_3 0x2010c898 +#define DPLL_PHASE_PULL_IN_4 0x2010c8a0 +#define DPLL_PHASE_PULL_IN_5 0x2010c8a8 +#define DPLL_PHASE_PULL_IN_6 0x2010c8b0 +#define DPLL_PHASE_PULL_IN_7 0x2010c8b8 + +#define GPIO_CFG 0x2010c8c0 #define GPIO_CFG_GBL 0x0000 -#define GPIO_0 0xc8c2 +#define GPIO_0 0x2010c8c2 #define GPIO_DCO_INC_DEC 0x0000 #define GPIO_OUT_CTRL_0 0x0001 #define GPIO_OUT_CTRL_1 0x0002 @@ -281,25 +283,25 @@ #define GPIO_TOD_NOTIFICATION_CFG 0x000f #define GPIO_CTRL 0x0010 #define GPIO_CTRL_V520 0x0011 -#define GPIO_1 0xc8d4 -#define GPIO_2 0xc8e6 -#define GPIO_3 0xc900 -#define GPIO_4 0xc912 -#define GPIO_5 0xc924 -#define GPIO_6 0xc936 -#define GPIO_7 0xc948 -#define GPIO_8 0xc95a -#define GPIO_9 0xc980 -#define GPIO_10 0xc992 -#define GPIO_11 0xc9a4 -#define GPIO_12 0xc9b6 -#define GPIO_13 0xc9c8 -#define GPIO_14 0xc9da -#define GPIO_15 0xca00 - -#define OUT_DIV_MUX 0xca12 -#define OUTPUT_0 0xca14 -#define OUTPUT_0_V520 0xca20 +#define GPIO_1 0x2010c8d4 +#define GPIO_2 0x2010c8e6 +#define GPIO_3 0x2010c900 +#define GPIO_4 0x2010c912 +#define GPIO_5 0x2010c924 +#define GPIO_6 0x2010c936 +#define GPIO_7 0x2010c948 +#define GPIO_8 0x2010c95a +#define GPIO_9 0x2010c980 +#define GPIO_10 0x2010c992 +#define GPIO_11 0x2010c9a4 +#define GPIO_12 0x2010c9b6 +#define GPIO_13 0x2010c9c8 +#define GPIO_14 0x2010c9da +#define GPIO_15 0x2010ca00 + +#define OUT_DIV_MUX 0x2010ca12 +#define OUTPUT_0 0x2010ca14 +#define OUTPUT_0_V520 0x2010ca20 /* FOD frequency output divider value */ #define OUT_DIV 0x0000 #define OUT_DUTY_CYCLE_HIGH 0x0004 @@ -307,88 +309,88 @@ #define OUT_CTRL_1 0x0009 /* Phase adjustment in FOD cycles */ #define OUT_PHASE_ADJ 0x000c -#define OUTPUT_1 0xca24 -#define OUTPUT_1_V520 0xca30 -#define OUTPUT_2 0xca34 -#define OUTPUT_2_V520 0xca40 -#define OUTPUT_3 0xca44 -#define OUTPUT_3_V520 0xca50 -#define OUTPUT_4 0xca54 -#define OUTPUT_4_V520 0xca60 -#define OUTPUT_5 0xca64 -#define OUTPUT_5_V520 0xca80 -#define OUTPUT_6 0xca80 -#define OUTPUT_6_V520 0xca90 -#define OUTPUT_7 0xca90 -#define OUTPUT_7_V520 0xcaa0 -#define OUTPUT_8 0xcaa0 -#define OUTPUT_8_V520 0xcab0 -#define OUTPUT_9 0xcab0 -#define OUTPUT_9_V520 0xcac0 -#define OUTPUT_10 0xcac0 -#define OUTPUT_10_V520 0xcad0 -#define OUTPUT_11 0xcad0 -#define OUTPUT_11_V520 0xcae0 - -#define SERIAL 0xcae0 -#define SERIAL_V520 0xcaf0 - -#define PWM_ENCODER_0 0xcb00 -#define PWM_ENCODER_1 0xcb08 -#define PWM_ENCODER_2 0xcb10 -#define PWM_ENCODER_3 0xcb18 -#define PWM_ENCODER_4 0xcb20 -#define PWM_ENCODER_5 0xcb28 -#define PWM_ENCODER_6 0xcb30 -#define PWM_ENCODER_7 0xcb38 -#define PWM_DECODER_0 0xcb40 -#define PWM_DECODER_1 0xcb48 -#define PWM_DECODER_1_V520 0xcb4a -#define PWM_DECODER_2 0xcb50 -#define PWM_DECODER_2_V520 0xcb54 -#define PWM_DECODER_3 0xcb58 -#define PWM_DECODER_3_V520 0xcb5e -#define PWM_DECODER_4 0xcb60 -#define PWM_DECODER_4_V520 0xcb68 -#define PWM_DECODER_5 0xcb68 -#define PWM_DECODER_5_V520 0xcb80 -#define PWM_DECODER_6 0xcb70 -#define PWM_DECODER_6_V520 0xcb8a -#define PWM_DECODER_7 0xcb80 -#define PWM_DECODER_7_V520 0xcb94 -#define PWM_DECODER_8 0xcb88 -#define PWM_DECODER_8_V520 0xcb9e -#define PWM_DECODER_9 0xcb90 -#define PWM_DECODER_9_V520 0xcba8 -#define PWM_DECODER_10 0xcb98 -#define PWM_DECODER_10_V520 0xcbb2 -#define PWM_DECODER_11 0xcba0 -#define PWM_DECODER_11_V520 0xcbbc -#define PWM_DECODER_12 0xcba8 -#define PWM_DECODER_12_V520 0xcbc6 -#define PWM_DECODER_13 0xcbb0 -#define PWM_DECODER_13_V520 0xcbd0 -#define PWM_DECODER_14 0xcbb8 -#define PWM_DECODER_14_V520 0xcbda -#define PWM_DECODER_15 0xcbc0 -#define PWM_DECODER_15_V520 0xcbe4 -#define PWM_USER_DATA 0xcbc8 -#define PWM_USER_DATA_V520 0xcbf0 - -#define TOD_0 0xcbcc -#define TOD_0_V520 0xcc00 +#define OUTPUT_1 0x2010ca24 +#define OUTPUT_1_V520 0x2010ca30 +#define OUTPUT_2 0x2010ca34 +#define OUTPUT_2_V520 0x2010ca40 +#define OUTPUT_3 0x2010ca44 +#define OUTPUT_3_V520 0x2010ca50 +#define OUTPUT_4 0x2010ca54 +#define OUTPUT_4_V520 0x2010ca60 +#define OUTPUT_5 0x2010ca64 +#define OUTPUT_5_V520 0x2010ca80 +#define OUTPUT_6 0x2010ca80 +#define OUTPUT_6_V520 0x2010ca90 +#define OUTPUT_7 0x2010ca90 +#define OUTPUT_7_V520 0x2010caa0 +#define OUTPUT_8 0x2010caa0 +#define OUTPUT_8_V520 0x2010cab0 +#define OUTPUT_9 0x2010cab0 +#define OUTPUT_9_V520 0x2010cac0 +#define OUTPUT_10 0x2010cac0 +#define OUTPUT_10_V520 0x2010cad0 +#define OUTPUT_11 0x2010cad0 +#define OUTPUT_11_V520 0x2010cae0 + +#define SERIAL 0x2010cae0 +#define SERIAL_V520 0x2010caf0 + +#define PWM_ENCODER_0 0x2010cb00 +#define PWM_ENCODER_1 0x2010cb08 +#define PWM_ENCODER_2 0x2010cb10 +#define PWM_ENCODER_3 0x2010cb18 +#define PWM_ENCODER_4 0x2010cb20 +#define PWM_ENCODER_5 0x2010cb28 +#define PWM_ENCODER_6 0x2010cb30 +#define PWM_ENCODER_7 0x2010cb38 +#define PWM_DECODER_0 0x2010cb40 +#define PWM_DECODER_1 0x2010cb48 +#define PWM_DECODER_1_V520 0x2010cb4a +#define PWM_DECODER_2 0x2010cb50 +#define PWM_DECODER_2_V520 0x2010cb54 +#define PWM_DECODER_3 0x2010cb58 +#define PWM_DECODER_3_V520 0x2010cb5e +#define PWM_DECODER_4 0x2010cb60 +#define PWM_DECODER_4_V520 0x2010cb68 +#define PWM_DECODER_5 0x2010cb68 +#define PWM_DECODER_5_V520 0x2010cb80 +#define PWM_DECODER_6 0x2010cb70 +#define PWM_DECODER_6_V520 0x2010cb8a +#define PWM_DECODER_7 0x2010cb80 +#define PWM_DECODER_7_V520 0x2010cb94 +#define PWM_DECODER_8 0x2010cb88 +#define PWM_DECODER_8_V520 0x2010cb9e +#define PWM_DECODER_9 0x2010cb90 +#define PWM_DECODER_9_V520 0x2010cba8 +#define PWM_DECODER_10 0x2010cb98 +#define PWM_DECODER_10_V520 0x2010cbb2 +#define PWM_DECODER_11 0x2010cba0 +#define PWM_DECODER_11_V520 0x2010cbbc +#define PWM_DECODER_12 0x2010cba8 +#define PWM_DECODER_12_V520 0x2010cbc6 +#define PWM_DECODER_13 0x2010cbb0 +#define PWM_DECODER_13_V520 0x2010cbd0 +#define PWM_DECODER_14 0x2010cbb8 +#define PWM_DECODER_14_V520 0x2010cbda +#define PWM_DECODER_15 0x2010cbc0 +#define PWM_DECODER_15_V520 0x2010cbe4 +#define PWM_USER_DATA 0x2010cbc8 +#define PWM_USER_DATA_V520 0x2010cbf0 + +#define TOD_0 0x2010cbcc +#define TOD_0_V520 0x2010cc00 /* Enable TOD counter, output channel sync and even-PPS mode */ #define TOD_CFG 0x0000 #define TOD_CFG_V520 0x0001 -#define TOD_1 0xcbce -#define TOD_1_V520 0xcc02 -#define TOD_2 0xcbd0 -#define TOD_2_V520 0xcc04 -#define TOD_3 0xcbd2 -#define TOD_3_V520 0xcc06 - -#define TOD_WRITE_0 0xcc00 -#define TOD_WRITE_0_V520 0xcc10 +#define TOD_1 0x2010cbce +#define TOD_1_V520 0x2010cc02 +#define TOD_2 0x2010cbd0 +#define TOD_2_V520 0x2010cc04 +#define TOD_3 0x2010cbd2 +#define TOD_3_V520 0x2010cc06 + +#define TOD_WRITE_0 0x2010cc00 +#define TOD_WRITE_0_V520 0x2010cc10 /* 8-bit subns, 32-bit ns, 48-bit seconds */ #define TOD_WRITE 0x0000 /* Counter increments after TOD write is completed */ @@ -397,15 +399,15 @@ #define TOD_WRITE_SELECT_CFG_0 0x000d /* TOD write trigger selection */ #define TOD_WRITE_CMD 0x000f -#define TOD_WRITE_1 0xcc10 -#define TOD_WRITE_1_V520 0xcc20 -#define TOD_WRITE_2 0xcc20 -#define TOD_WRITE_2_V520 0xcc30 -#define TOD_WRITE_3 0xcc30 -#define TOD_WRITE_3_V520 0xcc40 - -#define TOD_READ_PRIMARY_0 0xcc40 -#define TOD_READ_PRIMARY_0_V520 0xcc50 +#define TOD_WRITE_1 0x2010cc10 +#define TOD_WRITE_1_V520 0x2010cc20 +#define TOD_WRITE_2 0x2010cc20 +#define TOD_WRITE_2_V520 0x2010cc30 +#define TOD_WRITE_3 0x2010cc30 +#define TOD_WRITE_3_V520 0x2010cc40 + +#define TOD_READ_PRIMARY_0 0x2010cc40 +#define TOD_READ_PRIMARY_0_V520 0x2010cc50 /* 8-bit subns, 32-bit ns, 48-bit seconds */ #define TOD_READ_PRIMARY_BASE 0x0000 /* Counter increments after TOD write is completed */ @@ -415,15 +417,15 @@ /* Read trigger selection */ #define TOD_READ_PRIMARY_CMD 0x000e #define TOD_READ_PRIMARY_CMD_V520 0x000f -#define TOD_READ_PRIMARY_1 0xcc50 -#define TOD_READ_PRIMARY_1_V520 0xcc60 -#define TOD_READ_PRIMARY_2 0xcc60 -#define TOD_READ_PRIMARY_2_V520 0xcc80 -#define TOD_READ_PRIMARY_3 0xcc80 -#define TOD_READ_PRIMARY_3_V520 0xcc90 - -#define TOD_READ_SECONDARY_0 0xcc90 -#define TOD_READ_SECONDARY_0_V520 0xcca0 +#define TOD_READ_PRIMARY_1 0x2010cc50 +#define TOD_READ_PRIMARY_1_V520 0x2010cc60 +#define TOD_READ_PRIMARY_2 0x2010cc60 +#define TOD_READ_PRIMARY_2_V520 0x2010cc80 +#define TOD_READ_PRIMARY_3 0x2010cc80 +#define TOD_READ_PRIMARY_3_V520 0x2010cc90 + +#define TOD_READ_SECONDARY_0 0x2010cc90 +#define TOD_READ_SECONDARY_0_V520 0x2010cca0 /* 8-bit subns, 32-bit ns, 48-bit seconds */ #define TOD_READ_SECONDARY_BASE 0x0000 /* Counter increments after TOD write is completed */ @@ -434,30 +436,30 @@ #define TOD_READ_SECONDARY_CMD 0x000e #define TOD_READ_SECONDARY_CMD_V520 0x000f -#define TOD_READ_SECONDARY_1 0xcca0 -#define TOD_READ_SECONDARY_1_V520 0xccb0 -#define TOD_READ_SECONDARY_2 0xccb0 -#define TOD_READ_SECONDARY_2_V520 0xccc0 -#define TOD_READ_SECONDARY_3 0xccc0 -#define TOD_READ_SECONDARY_3_V520 0xccd0 +#define TOD_READ_SECONDARY_1 0x2010cca0 +#define TOD_READ_SECONDARY_1_V520 0x2010ccb0 +#define TOD_READ_SECONDARY_2 0x2010ccb0 +#define TOD_READ_SECONDARY_2_V520 0x2010ccc0 +#define TOD_READ_SECONDARY_3 0x2010ccc0 +#define TOD_READ_SECONDARY_3_V520 0x2010ccd0 -#define OUTPUT_TDC_CFG 0xccd0 -#define OUTPUT_TDC_CFG_V520 0xcce0 -#define OUTPUT_TDC_0 0xcd00 -#define OUTPUT_TDC_1 0xcd08 -#define OUTPUT_TDC_2 0xcd10 -#define OUTPUT_TDC_3 0xcd18 -#define INPUT_TDC 0xcd20 +#define OUTPUT_TDC_CFG 0x2010ccd0 +#define OUTPUT_TDC_CFG_V520 0x2010cce0 +#define OUTPUT_TDC_0 0x2010cd00 +#define OUTPUT_TDC_1 0x2010cd08 +#define OUTPUT_TDC_2 0x2010cd10 +#define OUTPUT_TDC_3 0x2010cd18 +#define INPUT_TDC 0x2010cd20 -#define SCRATCH 0xcf50 -#define SCRATCH_V520 0xcf4c +#define SCRATCH 0x2010cf50 +#define SCRATCH_V520 0x2010cf4c -#define EEPROM 0xcf68 -#define EEPROM_V520 0xcf64 +#define EEPROM 0x2010cf68 +#define EEPROM_V520 0x2010cf64 -#define OTP 0xcf70 +#define OTP 0x2010cf70 -#define BYTE 0xcf80 +#define BYTE 0x2010cf80 /* Bit definitions for the MAJ_REL register */ #define MAJOR_SHIFT (1) @@ -665,6 +667,16 @@ #define DPLL_STATE_MASK (0xf) #define DPLL_STATE_SHIFT (0x0) +/* + * Return register address based on passed in firmware version + */ +#define IDTCM_FW_REG(FW, VER, REG) (((FW) < (VER)) ? (REG) : (REG##_##VER)) +enum fw_version { + V_DEFAULT = 0, + V487 = 1, + V520 = 2, +}; + /* Values of DPLL_N.DPLL_MODE.PLL_MODE */ enum pll_mode { PLL_MODE_MIN = 0, From patchwork Thu Dec 14 15:24:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Min Li X-Patchwork-Id: 13493193 X-Patchwork-Delegate: kuba@kernel.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=hotmail.com header.i=@hotmail.com header.b="dGcFUNhl" Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11olkn2069.outbound.protection.outlook.com [40.92.19.69]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B52E3120; Thu, 14 Dec 2023 07:24:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WVZ5ptb0vgAVW9rH8JCjYPC42QX8Z/huA6galMCzojaVnVGKsiMflfaZbyeMAdsC7vlk+JiIG60e8mNtIdRefy02SCGB9FuKyInSxXT+ZDv4ujdqlCumVPz/uWE4PWiJNJ/Le5zpCtK9xdCFxVE5OXmJsqpCI4TLTmpMzYiv6aVg0G/MYHi4CIeee98a8rQzPSjoCF9TFDRuCVe+cbCh75LhThQlxk3uCOEHOuOOaDlP9RJ2ijVzs/FUvZVikM6uX8E5c2hThRCqm5g0E80DMczMSpme0osJvO93rh6n2mVuvPu0q97930FvtfD1Dt1K+9XFNQGJYBm4v9/ZZ81OZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=xGPPzyxW99d6Lw7ezMhtXHhJX44cjofP8jGdKVcHmig=; b=d/7OUK6WGIgPHsSPYBfErfQcg3DzYTnHl0r19MJ7bCmKHX41M0bUeK+OGz7H9bOzOjWtf9Ua9QO9dZrg2EDlyf/kCZsjfBg+c1QW1I3l1iP1CqfnvcaG/rFKeAc7fbEe8CbEvVog7jmXcTJAUZFdUn+CBf2e6WEkVyy1itrZArqnhso5MDx/zocuhtEDsedBnJKb9WA2elRl0seecup1LwlhXEX0ShCb/AlbSbeioEF3U3DdUu1QJ9Bx4yecQoYWr5MrbpeX+4vFHUzkpPVNMsk7SKzoBGwBl5yoxTcAgt70qdf0ClEZVX8NolJS4S/XunRjuezmo007X9Hg2V1gFQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=xGPPzyxW99d6Lw7ezMhtXHhJX44cjofP8jGdKVcHmig=; b=dGcFUNhlg2b7lGK1OqAwa3H4l2WuC0PQHP3IwlelOwuJrG/mlARS4JvejfdSpO0vkZschYNdFjxUxvehqZTdSCilDkzyYB2kXWmQVGy5uj81MnDypBo3ZCqNlB99vfJePn7P+tPvRIsP2QlfZE3RFVZSwok9UZsooU7i/ilznZvJ1kVT3Iq6rzqt5bKWiPzb/ue+MvOkJKFhfMbKLx97NbTEruKgeZwjnNyZloSQhY+W2rSSQqnVg53WE8h3U8fXjWDxEaMuePJ8Gi/yL40I5euebZtnNm7n/8CQYre6h4Hfkq02p8p3n906BHZcAeQPnY6ytwHhQR7y0u6PuaDhKQ== Received: from PH7PR03MB7064.namprd03.prod.outlook.com (2603:10b6:510:2a5::8) by PH0PR03MB6252.namprd03.prod.outlook.com (2603:10b6:510:e6::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.28; Thu, 14 Dec 2023 15:24:32 +0000 Received: from PH7PR03MB7064.namprd03.prod.outlook.com ([fe80::9ca4:4c22:a89:9a8]) by PH7PR03MB7064.namprd03.prod.outlook.com ([fe80::9ca4:4c22:a89:9a8%7]) with mapi id 15.20.7091.028; Thu, 14 Dec 2023 15:24:31 +0000 From: Min Li To: richardcochran@gmail.com, lee@kernel.org Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Min Li Subject: [PATCH net-next v7 2/5] ptp: clockmatrix: set write phase timer to 0 when not in PCW mode Date: Thu, 14 Dec 2023 10:24:12 -0500 Message-ID: X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231214152415.14785-1-lnimi@hotmail.com> References: <20231214152415.14785-1-lnimi@hotmail.com> X-TMN: [69T+CHlrNl+YEp8KEKym5TOkrPhuoAuo/+kJee/6yJc=] X-ClientProxiedBy: YQBPR01CA0054.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:2::26) To PH7PR03MB7064.namprd03.prod.outlook.com (2603:10b6:510:2a5::8) X-Microsoft-Original-Message-ID: <20231214152415.14785-2-lnimi@hotmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH7PR03MB7064:EE_|PH0PR03MB6252:EE_ X-MS-Office365-Filtering-Correlation-Id: 7b2c54c6-4d97-42a0-f04a-08dbfcb8c4fd X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnrf5XTkHvzLuPL047Guub836M0TKV9kS/HQspHgRwjaoz8Wvjo7seIKeHa9dAQc1pj3EtirVilnplIAIQGdMYPOrGB8QlTnL1pQ1U4N0Z3GoRzl7D1NJWtMK6GaO0tMEQeDrNl/TaplW/dRLwzlHuwlFCL94OLc9rIUez+2eQ5geZHNeDObwMxAdbFNAPwBRNGSyeana6EIlBPuv18H3vVSw9YtgVBas23lkFBPeDpYub1yH8OTbvhy4+hvFwfUvveqB5udgBcaegSU9PpshDJ58mveVq5zORbOtAR2utQJGRfKBnZouZU0q3l/L3GhA4G6Hw6JM/OiNAHSweygfs3dulXbkymCfbzmIzKqBrMAr5lE4R5bAdm7ZhxA/uA0qwn4yePuclh378gZC9C27JE/PDpsbPOm6QR5N5ZlershfokDm2m5L2CRhAPG6frck7EqbyB26ElJRNaOBl9WnbzJPW6wopgkJMRvMpwiezPShwgorwwlVVZl9P8tZCfgUL2WpKPv5S5C8YnsUJcK2EQ+3TlBzy7rBablmREKMlpY3H8RmTyKCERtGpBsys3yOVtm1TAPdbUyY6/wii263dn8r8/ZPg5Yf3zlNDEkzKAgMClhrBhMtfvP7+uZHHJLf8LuF4fSyrvBmVoAMvsHCqo9c4ikrOMmjghNyY8fFxQ2Ty+2ORain0EUh3HuhKV54kLRaLArn8bamolOxujWTTI21+QHP1g14pB2CRmAo/nf97DNjDDnjYGis3YZZYy9qIc= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: I6eKG3nh024IINtMtA9542ysBSQZjr8Ye75Se98nut/YjwC4KwXp1TiDXPCr3cUXk65MHz3Rfrvv4Ds9KFIoJt3O/W/kBIQvaDfpQoCG+5OJ7tlom0L3y7VGldEwo+Ad0PyCPV4XTsXxo9T8DFVV90ucuarV4YhTLJvoh65z4KwdKcuIuhJBhT9vS6hhWNFynDFO2oId0UHskEwxeukZml73w+YkWDeeF14MurTlJWMxQA60+1yFl4bjtgBAkeozLkMxlBaZPmdcdcIa/92Y7dg3YR/zvefWS0tAjyP4U9QG7wTVSIEPftbWZ1tB8fZULf8FZy5rIaBYVLp7edem8v53D8v2vtwl8SfUloz1Sbec6k0vyJisawHte9iKCruvC5qEPYR+pb8L1/mzX2fKL3BMHb98IOL+FFgFoCegPKCcx9Ct/gJTx9QsAbibQ8W11q0OIa1luvTEgss7VmLyJGJMTHZwV4L8ngmVUGl8ORypDXp0dD0gnZN+HUQkfSCKfM/89+tp+kMUVFWGQGh2Ft6sBsVp5m9GkI8e07c6nnq8iJ3+jpX/QvRGs3W+iMoR X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: cQHtbTyTUWhQlvVFHiilPVCEu2x+s9+nLm/iDeDf8q3HuMd613HAQu/4c5oe0nXAWOwxN++3Y5CYTcxJKdOrkV+QNlkFzqbkdjDjFjPfKNAFwwNE7092Y4Fve6PlYLUttI7TOGlJS+e2vaD+thK0AuKT9hhfv9J9i8WhoIbYFt+HmaNEbVzNy6+MuvBS0b55hkUjcvsiTCZ8wv594G/1DuTMuenhqakRysNeIBWYqnz0V9az/mRz5VNGDjEPe5C6hWZYT5vavuFPi+irSXz6CC2t0lCMjNHt3wOfV26XOFTpsV0a0yMuiDsjY88QmWDNmOY3ph83p4GyZtkxpzqbbWSM0v4BUyrALAUZulfSlTTWqCMJsMhWw2Dg9Pr07eWWUB2UfA/ryWvFRq8WpTAtBGfi9UwNB/Pw/VD6PwtVdgJNf/Glp4UxNDq4AYqhd37fiVd56KJ7/YdUs/PD1l74luvWDAKzYxcHhmh38g8jgAgwG6nuvynlIaAR5l6DDgrK7DJc5cJcHqoccWpwBGroxG9mJOpUVa0h1EiGv9WtC5D2w06V+JmEBbyzmWgt+Z4T5+qcA/7V3HoDEb6uLYUYIYdCznTNXl4d80g9T5RM0dJPx/3qxTCbeqt9fExV7QOl+DzIH7pJp9hJhp2W1xKrkkxtkcnERWFZ4ROlGhGjLkCjE87eXt4GdN6V8udeQ6CnJqZGXyOpPdY9EpppUOZiRr2rwpYLnDviEt/+5XlPVjUQxl6VtiT61yASoSR3axcrS1KLYQaao+S4obsOx6lsIuSBbUja5t42PQ+9Fvtxch7pNrKdXmRBvlbcWBP9SNFshPhp9PY+Y9rJokEjQACKWajpUCFK03WX1EdYxDXJcvYaHZr4ai4ks9uPf6zN8rJVZ5p8938iuZTD6yqGFrGdaENeqd+KYVklcRhmlFHW/2uztiRyo5OwBxyjeZhCYmnwXzBhadOAD1JEaJi76ktmlxds8fF7FSp1kbPJSedtGWRvd20B0hn1lHoDG4aELuiJeUKlyj7C2ZvZe2xB0CheZ81wBy7TZpRnm133XztbNlexgcJ0VRLdjsga1cqLl7H/qWlsEKaYDHS9wEf6qsyDNa1aAfFDivZqJu5sraLzQrG5JGj/2I0OmHyjG4q+WOkTeCwidlGPoxX7ADIxOzSl1RJuVmEz36y/6hgeQ6wOEOVhZPJ9mFgwUnk6TqGpUDXuWYW6ajHGRiiHfB91qQYsfg== X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-839f4.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 7b2c54c6-4d97-42a0-f04a-08dbfcb8c4fd X-MS-Exchange-CrossTenant-AuthSource: PH7PR03MB7064.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Dec 2023 15:24:31.9037 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR03MB6252 X-Patchwork-Delegate: kuba@kernel.org From: Min Li In order for phase pull-in to work, write phase timer shall be 0 when not in write phase mode. Also Fix u8 -> u16, DPLL_WF_TIMER and DPLL_WP_TIMER are 2-byte registers Signed-off-by: Min Li --- drivers/ptp/ptp_clockmatrix.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/ptp/ptp_clockmatrix.c b/drivers/ptp/ptp_clockmatrix.c index f8556627befa..d069b6e451ef 100644 --- a/drivers/ptp/ptp_clockmatrix.c +++ b/drivers/ptp/ptp_clockmatrix.c @@ -1396,6 +1396,20 @@ static int idtcm_set_pll_mode(struct idtcm_channel *channel, struct idtcm *idtcm = channel->idtcm; int err; u8 dpll_mode; + u8 buf[2] = {0}; + + /* Setup WF/WP timer for phase pull-in to work correctly */ + err = idtcm_write(idtcm, channel->dpll_n, DPLL_WF_TIMER, + buf, sizeof(buf)); + if (err) + return err; + + if (mode == PLL_MODE_WRITE_PHASE) + buf[0] = 160; + err = idtcm_write(idtcm, channel->dpll_n, DPLL_WP_TIMER, + buf, sizeof(buf)); + if (err) + return err; err = idtcm_read(idtcm, channel->dpll_n, IDTCM_FW_REG(idtcm->fw_ver, V520, DPLL_MODE), From patchwork Thu Dec 14 15:24:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Min Li X-Patchwork-Id: 13493195 X-Patchwork-Delegate: kuba@kernel.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=hotmail.com header.i=@hotmail.com header.b="ADTAsatE" Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12olkn2049.outbound.protection.outlook.com [40.92.21.49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1A689120; Thu, 14 Dec 2023 07:24:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HTqI1z1yoiK01ZPETCX32T1ajNzOu4pQMWCMLdO35pmXmJxgLco4bSYRSfHyW0KLK334OhN4CZKqiMBMK/0jx69ySdTvEOxCQG4U63SXqOP2aktSmY+t8pqkiu/NgnXtiBQzOyPdNHTxMs+mGJFVXy29E3n136TzlHBr+m2XtpWpW52FcH3MmcjbdRu+Rj6UTRWLly5P5UN32yrWz71cBh4mWAXExHtM3A2pPuwmrUSxdh2Ne5QSA0LDGS39lV5FZdHgb/bb/SFDwTxkhOhhZgq35iB8qiz7mgADvcY8JKFT5RBnDX0aO3ceoBDTpotPDIC/vXcCLzY9u1QTMso63Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=BTWLBrb4fL4nzNjk3Tbhv6WCgSXloJeYw3KGYpXWzDY=; b=RwHQX20f8AVgbmbjAr5s2gWoH0Tn4qbIlowT5D5qNxHePS+KzAliqW/mbwBjU+IdevPeuWQCcOWZ5MTYVIK/gzCaM1VAmTO6cHFwz/oppyvvkCsuDfTXTjQ/ahZ6dt9hm0vgAfT6I7h/LV4CgbT8jECVu/prsFQHc8PQPS6fR1lIm/E1flrLKnqtgUAmXWx3n1yRZGKHCqwPDwdcKP96B1tmO73JHRAbPppPXuIShNnkK78WHH4891k35i0Q7FXoKHhcveT5OnWhU+KXcKP9WU/xOPvjWPyUkBulb5IysF41VhgH6rDK/FW5VtMwieFyRdDJ84Sso9/replwmZYH4A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BTWLBrb4fL4nzNjk3Tbhv6WCgSXloJeYw3KGYpXWzDY=; b=ADTAsatEjbZfubeZE118xAIp4pPyN+L4TO/oSQ1o4oCy9jqGVE87P+25gBg+sUT2IXn4mw+WG8vBePOCNil8iRs6TodlRKvvrslg8aB4MiPQN1ztAykMO5Z8mQWm/LoYlJVxht/Uw9Q5ulfL6flth/Vstzq6KViGMJDhDdz4HafqDy9vTY1OCaKPjYRl9+N3HR1i8425NOpJk6n6yJslaR6TQEdfK1NF+dULpMmNov1OYMt4hYsjcugmhbJ////fuaYnrQVPsEdJ2lPSH84g0kNnsHtfdph9vx9fvCUuJTKYNK8kQcC0AjrkvVWHHHzCABVj5LLue0SUBrKG1qOmuw== Received: from PH7PR03MB7064.namprd03.prod.outlook.com (2603:10b6:510:2a5::8) by PH0PR03MB6252.namprd03.prod.outlook.com (2603:10b6:510:e6::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.28; Thu, 14 Dec 2023 15:24:35 +0000 Received: from PH7PR03MB7064.namprd03.prod.outlook.com ([fe80::9ca4:4c22:a89:9a8]) by PH7PR03MB7064.namprd03.prod.outlook.com ([fe80::9ca4:4c22:a89:9a8%7]) with mapi id 15.20.7091.028; Thu, 14 Dec 2023 15:24:35 +0000 From: Min Li To: richardcochran@gmail.com, lee@kernel.org Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Min Li Subject: [PATCH net-next v7 3/5] ptp: clockmatrix: dco input-to-output delay is 20 FOD cycles + 8ns Date: Thu, 14 Dec 2023 10:24:13 -0500 Message-ID: X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231214152415.14785-1-lnimi@hotmail.com> References: <20231214152415.14785-1-lnimi@hotmail.com> X-TMN: [/uwt5zhZU/Jrr2l2vsmunMFfCsA4H1CJXqRPSzHjTos=] X-ClientProxiedBy: YQBPR01CA0054.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:2::26) To PH7PR03MB7064.namprd03.prod.outlook.com (2603:10b6:510:2a5::8) X-Microsoft-Original-Message-ID: <20231214152415.14785-3-lnimi@hotmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH7PR03MB7064:EE_|PH0PR03MB6252:EE_ X-MS-Office365-Filtering-Correlation-Id: 9d2a40d4-0f12-4ef4-28d0-08dbfcb8c6fc X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnrf5XTkHvzLuPL047Guub83EEQFcvsLvQKYdqeeCjwGPaRFMq8YG6zAfARW0OKCwlG8add0wVZWzUblN8ZIettqhRTHRrH7oWGqoTknv0wzkCH/ScoysEOWWdtvukvDSfSaCOnb7nv0LSJU9nFWex+M9qUsCv8VKZ0MQUHSpd8xBF7XseQVS3kTIi9SaMvCWpwuJEIi5gh56iFhGubdE5jLTedoc3n9/laJeGkjJI/ENSTZ7dBHjcoVGn2qKxEE0bHJY2FjlN3HadCT0y0qnOb14hBDAOar5XeNmO9kRwJ5NyyIk4CQze/f5P4j7wyLn3anKyscsj0Lh6jnDZqImycm0yEImfP9HyeovbMfwFumg4Sroj/gU3uVZ4/dzMjVXpaIod+CF8eV4tAqQq9vFNWbAN1LBoPzY1/q7HLX00gzLTFxDreMOyihsxo68a1SeHz/pmnNaCzRr+B2FGjPWY5LDgYC4gUFG3QJkiAh0SOUHYzdXYmrtHKnmR9I0u7EDfJynfgVjK/Od6F2cWylnQxztE1Tc5c8sR5/eT37tOD6BMeCfLd/Mi3TS63zmJBTXVNxxP7r5b9GWxKtHqMpNFv030POhm7dDX21GskvTlPUZ4bY12sZTl6Y/A8SJODpAixnvrJX2fpNHQdmWA3WNDeKFBAKt3TF76O1ecERCvlFz5CNVYpuUe/YnL4lzSBqQSFHIimrEUq2sIzkfqw0TjU9a0WKcBpwhatz4lzJo6UXY36fyJZsKk5klH6bFYf3axY= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uBxw+fbdyIjAcrWMvA40bkEkvhGaBOzaMnAvH9ESf/22yIdm2w2iAeaI84fC35ATkTgvMI5DtjBAYftwbarh20BQw5G0axAlvJiWGsYZmOYRX4+e8ZYa7dY45uZe4vrPdnwrciRDPZREaTZIFZBgh/Fdx20VhgwmFYopHn9YnFN6SfIJfgzjZUJNEXfjeaL8Tzo13keb9rV00lHx+Edpwzbkv0Z46wgeCRp6JgZctlKAv1JWIUJ+uHXCB9beZME1DUJRBy4BRRo3LIrdpoC0ci8fTG8fOXyJ1z0MzloztOe8VPL4jilDZZniWgCyDjdkfiKMHciXm7MyBAkQLYZn4jZIUlbu+J35bh2nla7p/Tc9hWyeKkVUjgz580kaIUpC7VNYwzvnwA5YzMe4wbW6FEPJHk7nmN0zoMOPlhGc98peXMvImXk5kE3J4fjgQ0yqcHzJ32N4sH0hTanuMlfBnnATX1kg9o/FSes2ZmWxIqCVql7XY8oceQTyJedZdEDm9QJGqRqtxwUhx5dnZDCqX1b984BfafWYPhagISTEJ9eZchn3gZEMc0nLF3BNAr24 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 6JsD5LfQH/WG7NGeVUWRh1q5Co9qSWc5k5jw5Jo4KKmezhAK0VwgFatEUpJL1B5jfMTefeSjQRwv0L47+hEQgD9gjvkxL+kCNmDh8YQY6EfAUd+iEgBHY0KLkRoXkQVyLAXCO92BoKTaj2Rj77EexWu3dkOk4LfbRyppWqcXLQT52QN/7qDVi4VUn/zZsOqPsUl8pe9MJOvwjFTrQJojFrOE5sCRU6JgXJRGMCJ/UrK031DHLO14zaIy1vHfv1mO34vZNtWujyuBt8ZvEHxlJ8tu0b/yvPZC2MZPE9rI0cJKvGLtZTr0rjSDA0/OuuXAieoIPNFWLigsFdvQFR6uBGtCBFj5rItwP/3hBYaV8na9vZE8cTlQMW67xM92qPrHE72A6zaIQo+AR4f4DlohQO3ZP/aus893jqu0Y5eUPQCBg9gWYXyQ3fZnSx9Kh21Tu5+YT0yjgQZJHnIXaWjBKdDq7+05RuzRfhYSeN+coMHYijU5QfZPS5TD3MzxwqLC+R5+Sr60WWJzQad4LEhoVtoTGSs4HrXp+PJxTPSxqYN4iAYRsunyX37+Ro0YFVHmbpzhYfiIavjy23NHNNcEstR6X6xq/6wEjeEfc3RYFn5m6FuYTuWlMG47a4Kd7hDVmc3yCzGcof5n+3tMHyLHLLu23Gaz+Ou+BD1TLvK5EqLQyUTdgcwabyS38mYuP1fl2ACoKzFpQSxTh5xwMkrUWynkW6NFmkVa2nDvXMzYWo0sBfdyPUYzC4qtWmDjlRTk1fYmHLLY8H17Dq9G/YgqiChnmlE8YtsZnl04IMXeipsKPNi7J9ixE8YnoNlSa73B/Y90us5sKcWOZm3/AKaz0bJvsMo3wpv44sKdMu0qnblAxdm+c0BZE1UfWk+Bof6w++9F+udzIBxA956Y+tg/Kc9mmMSsnanl0LrWyGNuOkKbqKCje1Chsg3y+rSDz1TH4IpDmbBu4Ls2It/FMveRrxbZnYIU8AjvzC8bw4ysLpuG4QDaGSHHaM3sbDre54moz8hIwESQSQEuMr4ac6aN3lMyS25dQY/QssZ2NFfnKOP+T2oHgqrgxF2GXm2MId0qHwahnqPP0+6i26G+sLUA26Zb7ILEkH+sa5llmbHJcbWoep1fEg8VE5Yswa9apEM0Sqh4lJCVmgRABysBj9lqL62JlN2v9bNJtx8NFgsItEJ3ciaHmiufLMetTRS5oaUsTs1OWassvkzr1Oe8AqglEw== X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-839f4.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 9d2a40d4-0f12-4ef4-28d0-08dbfcb8c6fc X-MS-Exchange-CrossTenant-AuthSource: PH7PR03MB7064.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Dec 2023 15:24:35.1903 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR03MB6252 X-Patchwork-Delegate: kuba@kernel.org From: Min Li Set dco input-to-output delay is 20 FOD cycles + 8ns Signed-off-by: Min Li --- drivers/ptp/ptp_clockmatrix.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/ptp/ptp_clockmatrix.c b/drivers/ptp/ptp_clockmatrix.c index d069b6e451ef..21f3a2c179f5 100644 --- a/drivers/ptp/ptp_clockmatrix.c +++ b/drivers/ptp/ptp_clockmatrix.c @@ -2165,7 +2165,7 @@ static int configure_channel_pll(struct idtcm_channel *channel) /* * Compensate for the PTP DCO input-to-output delay. - * This delay is 18 FOD cycles. + * This delay is 20 FOD cycles + 8ns. */ static u32 idtcm_get_dco_delay(struct idtcm_channel *channel) { @@ -2196,7 +2196,7 @@ static u32 idtcm_get_dco_delay(struct idtcm_channel *channel) fodFreq = (u32)div_u64(m, n); if (fodFreq >= 500000000) - return (u32)div_u64(18 * (u64)NSEC_PER_SEC, fodFreq); + return (u32)div_u64(20 * (u64)NSEC_PER_SEC, fodFreq) + 8; return 0; } From patchwork Thu Dec 14 15:24:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Min Li X-Patchwork-Id: 13493196 X-Patchwork-Delegate: kuba@kernel.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=hotmail.com header.i=@hotmail.com header.b="CQ0Exy9v" Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12olkn2074.outbound.protection.outlook.com [40.92.21.74]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 15751129; Thu, 14 Dec 2023 07:24:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ShTUr1L2QRE99cmoivTLgRtjm++lAEQUOId6k/Q5frFCke2uW/MvTZBPZ/FVlQoYbUhpU6g6QFISeC89Wx6HY2sx9UGHfydvLK8pBWa/8JXkPAnUCgt/jASkcAsL89y6ydJqSuAlzYmcDNTZdcuLj1alvuGXsPMOwhBElQ4A49GwUMgNE5h3gFb4KpDvPHPxd/9PB/+UxspL5nep43ldqF3jSAmh9AcVHMNQVnI1mBX7LDQVjt+eSnNV0r9HI8rGlIYQSTtOUNtzUQTZvnCFBp29K2tu3p/ckRhSiSBVPUceCpBGMBpbv+rXhV6+ZP6xZpFdx3IahzAU8zXvjJnFGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=yoNEDh+iFq7lzKBU9CENiMetKrSdJTglln2bu+84U0E=; b=B6jivsS13K+3TPiFLhXxZ8U6tNAFRySR40OLIMzJLMmazjqC03xEVhY79YKFGG9qvSXRcv2yhtbFILgapQMb0IJnA57xW8bVl9lXAoXHDIVlfovfSHpVB2kpRMWBW/swM3G8qWb4AEI6OMXZbHWSgszRv1xpiO7zlMIYu2thqaN9LOMX/vfuzX06XsBAuPwTWYfenngdoplDI8JGSiy/2nb/NmzZy63pqzL35pxJXMCqVPvfAUd61RrDXwpv09eJCjQoWB1W5NTtLDKYWBJksJ+ZrmaVWC6BUtZSL9aq6B2IHaeXmbIY/2CE+jxsx06Jw1H7LUROlAh2WzTYvs27QA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=yoNEDh+iFq7lzKBU9CENiMetKrSdJTglln2bu+84U0E=; b=CQ0Exy9vN1TZiJVg9ahVZT6kuaFROc0bpAKjJexsM2/BrdMimoocjfg+3ttj9GvaKh1FpbATQcYBMEx1/NMqcJIRKymv378x1LLABOg2gE3uV6eBG59DpsidKg+LA6eRW807R87DXqyrgLDhvimpy100LGPYs64nJROhpR75QtiOBL3LM2Xq9oMl8MywD6XbkHBYJJ/bFKb37mG6oO/CHRft6ONIlqZPVTyO5GC1QmtyAFv23KMs11nz36Z/OQL59S6wViN8AS5trB0HxTUMHkM1bvDHokd9rDjL83P3zSagXh4f+HWo8I+VJQpEUm4XAIZlafiMqnOr/YyAU8YXtQ== Received: from PH7PR03MB7064.namprd03.prod.outlook.com (2603:10b6:510:2a5::8) by PH0PR03MB6252.namprd03.prod.outlook.com (2603:10b6:510:e6::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.28; Thu, 14 Dec 2023 15:24:38 +0000 Received: from PH7PR03MB7064.namprd03.prod.outlook.com ([fe80::9ca4:4c22:a89:9a8]) by PH7PR03MB7064.namprd03.prod.outlook.com ([fe80::9ca4:4c22:a89:9a8%7]) with mapi id 15.20.7091.028; Thu, 14 Dec 2023 15:24:38 +0000 From: Min Li To: richardcochran@gmail.com, lee@kernel.org Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Min Li Subject: [PATCH net-next v7 4/5] ptp: clockmatrix: Fix caps.max_adj to reflect DPLL_MAX_FREQ_OFFSET[MAX_FFO] Date: Thu, 14 Dec 2023 10:24:14 -0500 Message-ID: X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231214152415.14785-1-lnimi@hotmail.com> References: <20231214152415.14785-1-lnimi@hotmail.com> X-TMN: [Zmgh8/LrAfv3pRunp4/7BqZVFRCV2xZaqNIjZ+FdtDk=] X-ClientProxiedBy: YQBPR01CA0054.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:2::26) To PH7PR03MB7064.namprd03.prod.outlook.com (2603:10b6:510:2a5::8) X-Microsoft-Original-Message-ID: <20231214152415.14785-4-lnimi@hotmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH7PR03MB7064:EE_|PH0PR03MB6252:EE_ X-MS-Office365-Filtering-Correlation-Id: 55baa87e-8796-4ba7-2935-08dbfcb8c8c1 X-MS-Exchange-SLBlob-MailProps: YfhX3sd/0TXOoQ+pjPDIk5RZzV0uR20bz2AcA2n9+dedBIoQPdsBlFtdcVOno3WjbDWbU6XRwkBzE4LQ89iao8aqEDUyaJdN6qQrChPQKSxm2IsbQYfQ7HzWyJVaiFtKTIKl24WqYfLPy8J8itEgfvNBLnthc5pBgyOvW0Meao7pHDGILFDnhsO4FVO5tMvavhA4hRgfEleiAePq2qK0PxnxG0LkzhmEBw6vU4Rc1W41BX2ZyTAtBU+Lz9FrSuwI1WWsz6Ns9PMAgjEf7Oz5JU01fUqRayQI0KMWiVO4cmIyFpFsgusMHna+DKOg4aBk0CMEef8ksXROH7sPhUS/aTMtsr/OHDwl9h9n3B+G/EdQIN8AA5kUoUd1ztwRBEkiSzy9izVg5x7lld5UbusUEpKbKRrXw11kV1eculiwPM8r6zx0/6E0/3fAq8mijHUxZsYwaj0gAjmWMsqHfQCyCSWU5ew7v8Yeh3B09KZ2sba1jBSUWDaxG3FhSa6swcH7LnEjVjtUNlNuUIseOu7tAJRGxGM29W8CB8J3oQJd0shpMkpnGlghFDZaIn1DQQUyC54mjPV4Zb/77XJgMFs8uhup7fFzGySsCH+05rcR6s8mZVWdT2+dHK1mE7ko6CNk8mH/g2VHzWD/neuUS4O5JOmw66InjibmADJVEib1AeiodT52fJ9FPpzZ3Knq/qldUesAWsTCK21ikpGL1pFhjEt4foxt52mEgoCD4JpVFltVZHM2qspyNssmzMqVsJxfF05Tqsi9N8xhT0595aN/zH6/60onCtXd93sEiztTkyk= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: O7rAlQkTMQBE6kEsn7hzc9Hb4YeYaH2hrNuyqBC50JZXZoRpPmktEqHb7wEcB/0xGSX0eEfyH2f4FbtGHGZwbGougS5/8HQlQLxKxgpZhBhwxIbynosHv3YUpnLLDTYYfOAr43gTeThjSvEJEYCCSeA/xGZEQ/OJP1q2b/gd+rI2WcMfkNX4JoHNDjsfU55FJGI3bLqC1VG54H02KmOIaXSvibCKU+RsWa+KW5yo6kO/kVkWcjlRDYTOf1F1JsDhRZwcvWInTbV8qFqj5m3zHMpDZrhvwWkLpn39WQrQdUOLeYYlNquEXoDLeGNKUyNv/H/TbucJ14RC47FUC/IM5lCF7BfB0Ui7BGJz2lfSDjabpD0UgHszSzp/SKA2LUhAyUrvdkwbyU207OMfPhG/eSKibjzMY+2AryKxrWd5wzxNbhLJhgSFpb+UJ8+6in2uLiM7ata2sESE+RN/67K18POxhprodNkoLcWWeIlk/+1kolJKnSVvBzauaV9xURIfObHBQs3+kwLIEiMfVjXKzrYB8cqF1JmPFFq6dqFrhVJWB/xoTcl0FwTvc8SGLZwO X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RMGRqHa9bxnLay59SrF7+itF965OcHRVqWQHeN2cr1EtVgWORkN7HvY2H4qKb5XjMoLMJNTds/1445zoWxq9bIzRV6eNIX7Xnvyqx0VeRbiRpK/M4rf3RRvxfzkBHGrRhSY5AroH/m4tjq3FVuUJrMPk3CQd1ve/vF6Ao7dEyBoFxuhVa8WVAHOc5BFxugY2wn9thJNsBVxxOaR3fz/z7rgMV2zOcHhHsr5jKeZaCOcDfedvDyvxN4iIqhtQTntYSqz7V/A4OsAuTfX3HIYMdSh8rGAbXmFr3UnSWrbNxGyvbOBzjCgWqXRA0W5RbzHMeYZN8UWlK3JHJ4tz4diJ4zs2YthnaXlGgHDEsu/UiaCM6Xh1PQPC7akw/yydCwT8YgST53dIqEIPHWoCQ/Dmh5NX76KP9Oc86MyY72PDK4oWguSHizF1yExwk3t4qRIRG+f7F+FQvbleKjv3s9i3tdB2zGbOCyMo21uzyxAOR1hNS98kyQbaIwxoH2XVYlNpqU/vjH594Zx7xy3Tfwl2o+ZJ/kXIGXkyC3WS0d3Psm+Wkk5FWLQXhKiKdAAsca4jb0N2V49NnTnjjm5II7MVXxQQrSIFV8PRd4UsYnZFjMssrYIl85Y1cqilAYLhp3rtq6TX+6ubiQxUotCCfWk7GQ7UgnEU3Ic7mNdUv2Rb5nrp9pkQ2uiMEi9tudUTrlgZ7PgYSINh+BXPb/6cv3/sbsccDRCS4xkS/Wmovn7ZHlpcL9h8FKX4JbMkOzp1EiWePi1Mz9b1BJK1PH8McnPlb8w3PdYn2Jwz4BOMNEv/8i+h3TjVeQPryB7xg8w5Lg8DoKbq/Jw7K2bp1A2ihRLKAHoorHNJFHTFQPEL75k9cOl5Anc3VtVvluJ42kTUNV786aHntUOz1XnIPkAGOT3rKTtMJJgRFFF0Q7g9QqLgt05EMA9hlF/ntgNgD4DUkUt/QQVIXRvm7J6gb4F1pTlNhHwNkrdOrUwKX1leYvPe4RqDx4pT98EYHsLgVOMwg1U85BP8gbvWspeJr2185D77jvZMJzqouu+oAJ6RAVyGNHG/34mB5e62oZASp03JZxTXQWhce3aqAAmLUhB5sc9IrIw30F0/8amjeeuuLY8tWVoApWxDBoqCVlKNTVwDXs49DOhKMj98O+em2Hc0wSJq/6I9mfTXIo4okpcrGoYMNGabfzsQA3rts3ia+K5Gl23tVGgE2A8Z2ujemG9Mt/ANqg== X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-839f4.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 55baa87e-8796-4ba7-2935-08dbfcb8c8c1 X-MS-Exchange-CrossTenant-AuthSource: PH7PR03MB7064.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Dec 2023 15:24:38.1248 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR03MB6252 X-Patchwork-Delegate: kuba@kernel.org From: Min Li Query MAX_FREQ_OFFSET register to set the proper limit. Signed-off-by: Min Li --- drivers/ptp/ptp_clockmatrix.c | 43 +++++++++++++++++++++++++------- drivers/ptp/ptp_clockmatrix.h | 1 + include/linux/mfd/idt8a340_reg.h | 1 + 3 files changed, 36 insertions(+), 9 deletions(-) diff --git a/drivers/ptp/ptp_clockmatrix.c b/drivers/ptp/ptp_clockmatrix.c index 21f3a2c179f5..cd7b3110f8e4 100644 --- a/drivers/ptp/ptp_clockmatrix.c +++ b/drivers/ptp/ptp_clockmatrix.c @@ -1038,7 +1038,7 @@ static int _idtcm_adjtime_deprecated(struct idtcm_channel *channel, s64 delta) s64 now; if (abs(delta) < PHASE_PULL_IN_THRESHOLD_NS_DEPRECATED) { - err = channel->do_phase_pull_in(channel, delta, 0); + err = channel->do_phase_pull_in(channel, delta, channel->caps.max_adj); } else { idtcm->calculate_overhead_flag = 1; @@ -1594,7 +1594,7 @@ static int do_phase_pull_in_sw(struct idtcm_channel *channel, if (abs(delta_ns) < PHASE_PULL_IN_MIN_THRESHOLD_NS) return 0; - if (max_ffo_ppb == 0) + if (max_ffo_ppb == 0 || max_ffo_ppb > PHASE_PULL_IN_MAX_PPB) max_ffo_ppb = PHASE_PULL_IN_MAX_PPB; /* For most cases, keep phase pull-in duration 1 second */ @@ -1880,7 +1880,7 @@ static int idtcm_adjtime(struct ptp_clock_info *ptp, s64 delta) mutex_lock(idtcm->lock); if (abs(delta) < PHASE_PULL_IN_THRESHOLD_NS) { - err = channel->do_phase_pull_in(channel, delta, 0); + err = channel->do_phase_pull_in(channel, delta, channel->caps.max_adj); } else { if (delta >= 0) { ts = ns_to_timespec64(delta); @@ -1927,9 +1927,6 @@ static int idtcm_adjfine(struct ptp_clock_info *ptp, long scaled_ppm) if (channel->phase_pull_in == true) return 0; - if (scaled_ppm == channel->current_freq_scaled_ppm) - return 0; - mutex_lock(idtcm->lock); err = _idtcm_adjfine(channel, scaled_ppm); mutex_unlock(idtcm->lock); @@ -2054,7 +2051,7 @@ static struct ptp_pin_desc pin_config[MAX_TOD][MAX_REF_CLK]; static const struct ptp_clock_info idtcm_caps = { .owner = THIS_MODULE, - .max_adj = 244000, + .max_adj = MAX_FFO_PPB, .n_per_out = 12, .n_ext_ts = MAX_TOD, .n_pins = MAX_REF_CLK, @@ -2071,7 +2068,7 @@ static const struct ptp_clock_info idtcm_caps = { static const struct ptp_clock_info idtcm_caps_deprecated = { .owner = THIS_MODULE, - .max_adj = 244000, + .max_adj = MAX_FFO_PPB, .n_per_out = 12, .n_ext_ts = MAX_TOD, .n_pins = MAX_REF_CLK, @@ -2242,6 +2239,25 @@ static int configure_channel_tod(struct idtcm_channel *channel, u32 index) return 0; } +static int initialize_max_adj(struct idtcm_channel *channel) +{ + struct idtcm *idtcm = channel->idtcm; + u8 ffo_ppm; + int err; + + err = idtcm_read(idtcm, channel->dpll_n, DPLL_MAX_FREQ_OFFSET, + &ffo_ppm, sizeof(ffo_ppm)); + if (err) + return err; + + if (ffo_ppm && ffo_ppm <= (MAX_FFO_PPB / 1000)) + channel->caps.max_adj = ffo_ppm * 1000; + else + channel->caps.max_adj = MAX_FFO_PPB; + + return 0; +} + static int idtcm_enable_channel(struct idtcm *idtcm, u32 index) { struct idtcm_channel *channel; @@ -2285,6 +2301,10 @@ static int idtcm_enable_channel(struct idtcm *idtcm, u32 index) ppd->chan = index; } + err = initialize_max_adj(channel); + if (err) + return err; + err = initialize_dco_operating_mode(channel); if (err) return err; @@ -2437,8 +2457,13 @@ static int idtcm_probe(struct platform_device *pdev) err = idtcm_load_firmware(idtcm, &pdev->dev); - if (err) + if (err) { + if (err == -ENOENT) { + mutex_unlock(idtcm->lock); + return -EPROBE_DEFER; + } dev_warn(idtcm->dev, "loading firmware failed with %d", err); + } wait_for_chip_ready(idtcm); diff --git a/drivers/ptp/ptp_clockmatrix.h b/drivers/ptp/ptp_clockmatrix.h index ad39dc6decdf..31d90b1bf025 100644 --- a/drivers/ptp/ptp_clockmatrix.h +++ b/drivers/ptp/ptp_clockmatrix.h @@ -19,6 +19,7 @@ #define MAX_REF_CLK (16) #define MAX_ABS_WRITE_PHASE_NANOSECONDS (107374182L) +#define MAX_FFO_PPB (244000) #define TOD_MASK_ADDR (0xFFA5) #define DEFAULT_TOD_MASK (0x04) diff --git a/include/linux/mfd/idt8a340_reg.h b/include/linux/mfd/idt8a340_reg.h index b680a0eb5f68..13b36f4858b3 100644 --- a/include/linux/mfd/idt8a340_reg.h +++ b/include/linux/mfd/idt8a340_reg.h @@ -192,6 +192,7 @@ #define DPLL_CTRL_REG_0 0x0002 #define DPLL_CTRL_REG_1 0x0003 #define DPLL_CTRL_REG_2 0x0004 +#define DPLL_MAX_FREQ_OFFSET 0x0025 #define DPLL_WF_TIMER 0x002c #define DPLL_WP_TIMER 0x002e #define DPLL_TOD_SYNC_CFG 0x0031 From patchwork Thu Dec 14 15:24:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Min Li X-Patchwork-Id: 13493197 X-Patchwork-Delegate: kuba@kernel.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=hotmail.com header.i=@hotmail.com header.b="dcJl2BC5" Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12olkn2074.outbound.protection.outlook.com [40.92.21.74]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 21F241A4; Thu, 14 Dec 2023 07:24:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IHIBH9fhMpI6o6WB3b04prcWGr4Jhvjfw3e0n6DtQCKZLkDcNe8saaqXicN9QGj1TE6DspcSBNxEfRqMrAv31+LdXb0zbgeeJs9YPnFeSw/1GonkoR55hX+O/BQsqJWCYk5GcoiNfQG2TVmcaOage4WJkcIIX0OgYvSD8XmSadwQoZmPi2LJJZnyj2BSc3qfITUiPe0y41cQT3Sw4Z/e2f715Xr3ABcBLzS++5wQfse1OL9Tx/sKJoFTmadIt36T8wxiD6MZGssdMKop2LZxGQ0ZeXueGKWXElBUwOUJgoQjaVJBsEnFCjFvC8Fu5UCbIRJgstVLQZkemNoU+iiUpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Jg7b6p+xqD2UoF2S3eJvncZGfTYlOgCJeL446xehAFE=; b=ZkIABnOHNHKMLaFvU0oY9pTekcyo/nUlNa6JmLoyJhw4Ykiwy2XwXKuswvmlorvtDC/MWJvvCgNJ/UXHFYUDiBa8jks2IcIfvVc6QzWLIrpnbpOBxdij30eroX+M7WxMeaTEbatIy6JGssYB3B4L07B2et1XFE/qxHIBUONh8kuZlispSMBtycDBbmzqpEwUWa7QiFT3ysPlX6h1RwoqGbjfHE2OjCzKBm9lyYfZrGzKfhOZZNCM0tU4/l+3WUEIONU4ITpSk6JHeAqDjtzZP1b5Dwtvt/GKvaw8cjpab6rgpYtRBl+YFSd8GmMgNlv5qiN2V8GkMdrgLxgYIi02WQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Jg7b6p+xqD2UoF2S3eJvncZGfTYlOgCJeL446xehAFE=; b=dcJl2BC5uQkW1ErJwikbvOVeAwFOsomysuE2A6qY+e0Ond+r5tKfaEzIO1jx84SbPLManCkuar0366sqz54Q9gLhSFExAQ074qkbfBpYv7zXq/wk3Qp8JIkH+9gatguTedwihHds3USbIJUVlBAbf9aJ2KlePZ6KmXjwRoqBCR0KblJpDhjWjJTwdfUQnI5F6hbmRZAB1g03WBtSeOWXT1PhhKEv56vZMOuMOuPQ7Kjf1QOIJDgeEVo0YJ0z1gStirYI/TbR45hDj95ZKztnG+fFCUObzcGBFRSByXC+R5Zkn1t4r753UG8P2ZdWwSJizbQHpf/aTeFfi91uHdqPnw== Received: from PH7PR03MB7064.namprd03.prod.outlook.com (2603:10b6:510:2a5::8) by PH0PR03MB6252.namprd03.prod.outlook.com (2603:10b6:510:e6::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.28; Thu, 14 Dec 2023 15:24:41 +0000 Received: from PH7PR03MB7064.namprd03.prod.outlook.com ([fe80::9ca4:4c22:a89:9a8]) by PH7PR03MB7064.namprd03.prod.outlook.com ([fe80::9ca4:4c22:a89:9a8%7]) with mapi id 15.20.7091.028; Thu, 14 Dec 2023 15:24:41 +0000 From: Min Li To: richardcochran@gmail.com, lee@kernel.org Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Min Li Subject: [PATCH net-next v7 5/5] ptp: clockmatrix: move register and firmware related definition to idt8a340_reg.h Date: Thu, 14 Dec 2023 10:24:15 -0500 Message-ID: X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231214152415.14785-1-lnimi@hotmail.com> References: <20231214152415.14785-1-lnimi@hotmail.com> X-TMN: [fr9c9r7i8ZnQzcPuuAmCeUT2/59DKXe6YWXweL8VdGk=] X-ClientProxiedBy: YQBPR01CA0054.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:2::26) To PH7PR03MB7064.namprd03.prod.outlook.com (2603:10b6:510:2a5::8) X-Microsoft-Original-Message-ID: <20231214152415.14785-5-lnimi@hotmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH7PR03MB7064:EE_|PH0PR03MB6252:EE_ X-MS-Office365-Filtering-Correlation-Id: 39d98b89-fe08-42f3-a15d-08dbfcb8ca5d X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnrf5XTkHvzLuPL047Guub83ie5xQtlga+49LNCSAf9VFoHU+cQ6YFyN3zRkGfeuhEHDPhUl+OviL5mP8wIIF2cVaZBbQGF7x4RJ9AQW2L8rmt4P91jL2wwI23lTi1JttwmjCE6vTIkfCg/Gvp5b6eFGN30tUSANIBq7pDeJ0EzhzhIocOFqBQcb8C56dhbud6m3S9gqG6E8iy/+Hh2KHCxkyP7Uo8ynZtkRFuPwpzIfondfOk3+xod0oFxlGrdTOaKCvJViQlNT7b28VCW/J53cWxFBmAoMMT1R8EhniSozsLMD+1hK+YGCSPGcPdF5Tht6dHDQopoou96VBgYpYYiYb4yzwc0xtfMwLfVQupPo+R8m7M0KYJvnV9PWLbrVSi0MzjIekMpXZ4jOKzgIGwZd/dpvj0w8bGlYo1xVm52bIfqGW+IkYWJHEaIE0AWmwnyxV0uv35g4emeb/1PYCAMUaPpAwQfE/iyQlbHpDPsalBMd9A9KQPXAaYPVs/71gcph1MY8FkSO3FyyyIutQKbmLBrNuq/SfUACHwUCuiKMsnDhpWVztC7h97sSA5zs1J7AjsN/PDOuMcwpI2k7eJeSDVeLpziESkem9goANp1a/eahsKf7nlTvSGWn019WTJJ6H7TdNhMTEv2wF1ol6z/qapf/XotrgqEyyMNKZbzvortUlHuzzLE7wUwbinKHPfLKWhznTtRhTO9HG0+JbcQZh8Go9En/h4YlerNNnzIvjWJIK1bzXhwWYxiEc8zvOXw= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6uFstCzvZ32t5oiOuYB3BPauo+1yXJWCEcqLtXnQ2Jop7P1lH7BwCoe5l4+fk9J7nqGB0LsbIYt/Atku3tUJLwsMzJyQVi1fO5dpkvwnwtdXonmbLC2pbdtzRd2pkbjN8jQwsLa2VAWVkFjuPNBrkiBm6vRP7iZn22jE0pXGe0FlTr2fD631RHfsVI0M2irynsK8AZuBTkuiv9oRM9sSkLdKpSyx4c736nuG0HBNP/ZklNDDULg/kX/vspPllNCjSrJJi4hdPf5fENvFBc49gCYHSK7jW7GKDDcAcSL0OxXEyQlZ6/QDdzgh5oBc5e2HOb840gWYCacCCbDVbqus+gGwO7HX8Zbi4mAgGMzYcc5tJc5NK8molVz4gWfp2Pul88lPHVJpbD6VfQOAGTZJ4bDcvwoNPkVJJhmYZwun8ry+gZPKISWC10/uIWkv7iw79v55iSZDtyy7k9uAoFCoxXL8U05h+P/q+zTKKnCyZW4tOeB/NnGDivw+8kSeED7LdNoa8pHdCsHP/McRCDmAl4QVLHE/3ll879SFvyXvClW0FJx3jZ9NsCDZkWpxc1ix X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RQ/wRofxUxicsAaZ/rBPuinAkvuTYFa5fNlHG1mPs0m47bVqI1L0Y7Z/Us/nzOOpjxrz0MQj/eaEb763khEDeha+o/g4Xe0i++h4q5BNKAUW3BvypcvpKkZMyKMv+q27q1+pJlMvWfBETPCIv5BkHUwt4sdtg0A5kj/8Q/TXLwLt5hehVVVUDu9o1ObDHOLWdCQsrK63um2t5ciz3rfRdCN2YdTpGsHfqoC0J5dENukWpuZWncCPGDR9TDOIY7BbJiD3AkylUf1oUH4dLdOW5BvFUySgpkE/4a4vf/II9hI2LNvGhlUAxavRrJfx9Z/48J23MMBibjODfRb/UdZn17sZd9LniTTnyTqoR1S1loUqS/+Q4yDug++oun3ual+QyMhL4KPa4Byl8xxcu4c4ckJv2IsoMxVxV7Dv5p++CxWMqT0eq/fgoSpEz0ScO2ot7Vv5wCw3fGau8e6mX0uZ6X9pDXiQTTAjEW+KQ9K/rFFNJSsfZPVVTN6Ct1i8f2deavzx7HIWrdO8PnTI+c22DpjGx+S0vHSHVOj3svzy7hCDaFRc2twtWf1+NEQ9FQhxAyCARxuiK7YpE4CCAVIQhlwDS2RJeqzI8UJsY3V/LBACytzHBD4ew9i+viwxCBzOefu9db66uYeB05L/nUlYxNAztpozLZ6vts5lwUTK7pD66q0Ac8rxFAHrjjTDzlKEudTtYhkSGzbG2HByfuYRN+vy8VhvveAOf/Lmk6IdyOo81IoYhbpkZ0zT5sSlL1ToWgF1haI/I/OQTfGFnKcaydPbU/wYVWZ9dUZpTRwh+MAQtrUBzTpU1pWepo0ITIEtsvdS9N5+2SRtPAHlENEQXh0HdCIkqzH4EXAj5YkyMskkDTbG8alhPPciS1gVgTVdeiEbSh0cVp8Zc51CD1dtzRD/gCqpwLJNixLKVwmqb5xbYqEpBN0ccDVcWbvTvfGFR1nFmpebWPSmKN9pvdqsVneO3lfD5A5B2T9lsVgV6LtOQUEbkmm9mrVA/YFSCfOAoGjZFJt58nE4X97xt0SIBTInzKcsIWmSlG2xDEX7iqFT+qpnpDDcvoyp9B5/sLnKKwjjVugGVbhYprQhmZ+Dqpqejpq7RkDutvDUmjRuUBA57Gvfj+MxDd4rl2wD7NKz7CX8qyeGCDAV5lP81FZMKM6wdYfZ6PWTnkSNjtRYGbcBlR6/8jVt7gGAtP04ZO1Aqz+7eOFzta/yaokXEFmeRw== X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-839f4.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 39d98b89-fe08-42f3-a15d-08dbfcb8ca5d X-MS-Exchange-CrossTenant-AuthSource: PH7PR03MB7064.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Dec 2023 15:24:40.9175 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR03MB6252 X-Patchwork-Delegate: kuba@kernel.org From: Min Li This change is needed by rsmu driver, which will be submitted separately from mfd tree. Signed-off-by: Min Li --- drivers/ptp/ptp_clockmatrix.h | 33 --------- include/linux/mfd/idt8a340_reg.h | 121 +++++++++++++++++++++++++++++-- 2 files changed, 113 insertions(+), 41 deletions(-) diff --git a/drivers/ptp/ptp_clockmatrix.h b/drivers/ptp/ptp_clockmatrix.h index 31d90b1bf025..f041c7999ddc 100644 --- a/drivers/ptp/ptp_clockmatrix.h +++ b/drivers/ptp/ptp_clockmatrix.h @@ -21,32 +21,6 @@ #define MAX_ABS_WRITE_PHASE_NANOSECONDS (107374182L) #define MAX_FFO_PPB (244000) -#define TOD_MASK_ADDR (0xFFA5) -#define DEFAULT_TOD_MASK (0x04) - -#define SET_U16_LSB(orig, val8) (orig = (0xff00 & (orig)) | (val8)) -#define SET_U16_MSB(orig, val8) (orig = (0x00ff & (orig)) | (val8 << 8)) - -#define TOD0_PTP_PLL_ADDR (0xFFA8) -#define TOD1_PTP_PLL_ADDR (0xFFA9) -#define TOD2_PTP_PLL_ADDR (0xFFAA) -#define TOD3_PTP_PLL_ADDR (0xFFAB) - -#define TOD0_OUT_ALIGN_MASK_ADDR (0xFFB0) -#define TOD1_OUT_ALIGN_MASK_ADDR (0xFFB2) -#define TOD2_OUT_ALIGN_MASK_ADDR (0xFFB4) -#define TOD3_OUT_ALIGN_MASK_ADDR (0xFFB6) - -#define DEFAULT_OUTPUT_MASK_PLL0 (0x003) -#define DEFAULT_OUTPUT_MASK_PLL1 (0x00c) -#define DEFAULT_OUTPUT_MASK_PLL2 (0x030) -#define DEFAULT_OUTPUT_MASK_PLL3 (0x0c0) - -#define DEFAULT_TOD0_PTP_PLL (0) -#define DEFAULT_TOD1_PTP_PLL (1) -#define DEFAULT_TOD2_PTP_PLL (2) -#define DEFAULT_TOD3_PTP_PLL (3) - #define PHASE_PULL_IN_THRESHOLD_NS_DEPRECATED (150000) #define PHASE_PULL_IN_THRESHOLD_NS (15000) #define TOD_WRITE_OVERHEAD_COUNT_MAX (2) @@ -121,11 +95,4 @@ struct idtcm { ktime_t start_time; }; -struct idtcm_fwrc { - u8 hiaddr; - u8 loaddr; - u8 value; - u8 reserved; -} __packed; - #endif /* PTP_IDTCLOCKMATRIX_H */ diff --git a/include/linux/mfd/idt8a340_reg.h b/include/linux/mfd/idt8a340_reg.h index 13b36f4858b3..5aeb0820f876 100644 --- a/include/linux/mfd/idt8a340_reg.h +++ b/include/linux/mfd/idt8a340_reg.h @@ -116,16 +116,41 @@ #define OTP_SCSR_CONFIG_SELECT 0x0022 #define STATUS 0x2010c03c -#define DPLL0_STATUS 0x0018 -#define DPLL1_STATUS 0x0019 -#define DPLL2_STATUS 0x001a -#define DPLL3_STATUS 0x001b -#define DPLL4_STATUS 0x001c -#define DPLL5_STATUS 0x001d -#define DPLL6_STATUS 0x001e -#define DPLL7_STATUS 0x001f +#define IN0_MON_STATUS 0x0008 +#define IN1_MON_STATUS 0x0009 +#define IN2_MON_STATUS 0x000a +#define IN3_MON_STATUS 0x000b +#define IN4_MON_STATUS 0x000c +#define IN5_MON_STATUS 0x000d +#define IN6_MON_STATUS 0x000e +#define IN7_MON_STATUS 0x000f +#define IN8_MON_STATUS 0x0010 +#define IN9_MON_STATUS 0x0011 +#define IN10_MON_STATUS 0x0012 +#define IN11_MON_STATUS 0x0013 +#define IN12_MON_STATUS 0x0014 +#define IN13_MON_STATUS 0x0015 +#define IN14_MON_STATUS 0x0016 +#define IN15_MON_STATUS 0x0017 +#define DPLL0_STATUS 0x0018 +#define DPLL1_STATUS 0x0019 +#define DPLL2_STATUS 0x001a +#define DPLL3_STATUS 0x001b +#define DPLL4_STATUS 0x001c +#define DPLL5_STATUS 0x001d +#define DPLL6_STATUS 0x001e +#define DPLL7_STATUS 0x001f #define DPLL_SYS_STATUS 0x0020 #define DPLL_SYS_APLL_STATUS 0x0021 +#define DPLL0_REF_STATUS 0x0022 +#define DPLL1_REF_STATUS 0x0023 +#define DPLL2_REF_STATUS 0x0024 +#define DPLL3_REF_STATUS 0x0025 +#define DPLL4_REF_STATUS 0x0026 +#define DPLL5_REF_STATUS 0x0027 +#define DPLL6_REF_STATUS 0x0028 +#define DPLL7_REF_STATUS 0x0029 +#define DPLL_SYS_REF_STATUS 0x002a #define DPLL0_FILTER_STATUS 0x0044 #define DPLL1_FILTER_STATUS 0x004c #define DPLL2_FILTER_STATUS 0x0054 @@ -192,6 +217,25 @@ #define DPLL_CTRL_REG_0 0x0002 #define DPLL_CTRL_REG_1 0x0003 #define DPLL_CTRL_REG_2 0x0004 +#define DPLL_REF_PRIORITY_0 0x000f +#define DPLL_REF_PRIORITY_1 0x0010 +#define DPLL_REF_PRIORITY_2 0x0011 +#define DPLL_REF_PRIORITY_3 0x0012 +#define DPLL_REF_PRIORITY_4 0x0013 +#define DPLL_REF_PRIORITY_5 0x0014 +#define DPLL_REF_PRIORITY_6 0x0015 +#define DPLL_REF_PRIORITY_7 0x0016 +#define DPLL_REF_PRIORITY_8 0x0017 +#define DPLL_REF_PRIORITY_9 0x0018 +#define DPLL_REF_PRIORITY_10 0x0019 +#define DPLL_REF_PRIORITY_11 0x001a +#define DPLL_REF_PRIORITY_12 0x001b +#define DPLL_REF_PRIORITY_13 0x001c +#define DPLL_REF_PRIORITY_14 0x001d +#define DPLL_REF_PRIORITY_15 0x001e +#define DPLL_REF_PRIORITY_16 0x001f +#define DPLL_REF_PRIORITY_17 0x0020 +#define DPLL_REF_PRIORITY_18 0x0021 #define DPLL_MAX_FREQ_OFFSET 0x0025 #define DPLL_WF_TIMER 0x002c #define DPLL_WP_TIMER 0x002e @@ -450,6 +494,10 @@ #define OUTPUT_TDC_1 0x2010cd08 #define OUTPUT_TDC_2 0x2010cd10 #define OUTPUT_TDC_3 0x2010cd18 + +#define OUTPUT_TDC_CTRL_4 0x0006 +#define OUTPUT_TDC_CTRL_4_V520 0x0007 + #define INPUT_TDC 0x2010cd20 #define SCRATCH 0x2010cf50 @@ -668,6 +716,28 @@ #define DPLL_STATE_MASK (0xf) #define DPLL_STATE_SHIFT (0x0) +/* Bit definitions for the DPLL0_REF_STAT register */ +#define DPLL_REF_STATUS_MASK (0x1f) + +/* Bit definitions for the DPLL register */ +#define DPLL_REF_PRIORITY_ENABLE_SHIFT (0) +#define DPLL_REF_PRIORITY_REF_SHIFT (1) +#define DPLL_REF_PRIORITY_GROUP_NUMBER_SHIFT (6) + +/* Bit definitions for the IN0_MON_STATUS register */ +#define IN_MON_STATUS_LOS_SHIFT (0) +#define IN_MON_STATUS_NO_ACT_SHIFT (1) +#define IN_MON_STATUS_FFO_LIMIT_SHIFT (2) + +#define DEFAULT_PRIORITY_GROUP (0) +#define MAX_PRIORITY_GROUP (3) + +#define MAX_REF_PRIORITIES (19) + +#define MAX_ELECTRICAL_REFERENCES (16) + +#define NO_REFERENCE (0x1f) + /* * Return register address based on passed in firmware version */ @@ -778,4 +848,39 @@ enum scsr_tod_write_type_sel { SCSR_TOD_WR_TYPE_SEL_DELTA_MINUS = 2, SCSR_TOD_WR_TYPE_SEL_MAX = SCSR_TOD_WR_TYPE_SEL_DELTA_MINUS, }; + +/* firmware interface */ +struct idtcm_fwrc { + u8 hiaddr; + u8 loaddr; + u8 value; + u8 reserved; +} __packed; + +#define SET_U16_LSB(orig, val8) (orig = (0xff00 & (orig)) | (val8)) +#define SET_U16_MSB(orig, val8) (orig = (0x00ff & (orig)) | (val8 << 8)) + +#define TOD_MASK_ADDR (0xFFA5) +#define DEFAULT_TOD_MASK (0x04) + +#define TOD0_PTP_PLL_ADDR (0xFFA8) +#define TOD1_PTP_PLL_ADDR (0xFFA9) +#define TOD2_PTP_PLL_ADDR (0xFFAA) +#define TOD3_PTP_PLL_ADDR (0xFFAB) + +#define TOD0_OUT_ALIGN_MASK_ADDR (0xFFB0) +#define TOD1_OUT_ALIGN_MASK_ADDR (0xFFB2) +#define TOD2_OUT_ALIGN_MASK_ADDR (0xFFB4) +#define TOD3_OUT_ALIGN_MASK_ADDR (0xFFB6) + +#define DEFAULT_OUTPUT_MASK_PLL0 (0x003) +#define DEFAULT_OUTPUT_MASK_PLL1 (0x00c) +#define DEFAULT_OUTPUT_MASK_PLL2 (0x030) +#define DEFAULT_OUTPUT_MASK_PLL3 (0x0c0) + +#define DEFAULT_TOD0_PTP_PLL (0) +#define DEFAULT_TOD1_PTP_PLL (1) +#define DEFAULT_TOD2_PTP_PLL (2) +#define DEFAULT_TOD3_PTP_PLL (3) + #endif