From patchwork Thu Mar 14 15:37:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Min Li X-Patchwork-Id: 13592590 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04olkn2103.outbound.protection.outlook.com [40.92.47.103]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 22CED71B51; Thu, 14 Mar 2024 15:37:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.92.47.103 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710430645; cv=fail; b=bkYtOde2BziEJmknspA6tKmqUnyEyAHNgh4FkpX89IYNDcvILgJQRMWRlz/R60bGRdxKqqtFJihpDKJIAXRuTMcODEH1JXMfccq/Quo1+rvrvVWNiIJ46/dXiK62NsKYiqcdg1mRyPmf3K0eStmxIzwgDjkDHNc8Z/oKVyZc8Kc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710430645; c=relaxed/simple; bh=0G97lcgpOYi4e6d0xlyu1pfmN6R7wKcQAWqHctNQ9gE=; h=From:To:Cc:Subject:Date:Message-ID:Content-Type:MIME-Version; b=b7+wOClYRBXF/HxPCvg1Ye/GoZo/Cxsc7SmTnlEATaNXcXrnyWm4j2jdO5LYqfDLPzcet1fSKXtDslbaODuLRj7AnEaLK0/sZZekwzAMMo+JdeOgdicozUrYRE3x65/cu8la4yVKt+SPnVP5Ox4VawgDKjZpML2AfZNG3AIDz6g= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=hotmail.com; spf=pass smtp.mailfrom=hotmail.com; dkim=pass (2048-bit key) header.d=hotmail.com header.i=@hotmail.com header.b=unnUxVm1; arc=fail smtp.client-ip=40.92.47.103 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=hotmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=hotmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=hotmail.com header.i=@hotmail.com header.b="unnUxVm1" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JB2Ajf1qYquD5aX4p9VV41SQAUVz+RVcovHcBXI6digvzl8jJ7SRTOtr4KgaiEMyYwfF0xjPvBjMsgAra4FvHbpVGuCOZBv8buMOiH3HarGv+DY2dxzLPsuNIIIvQ5bSpklMo3dw88kK3VsiL7hsgVODcoE+pcdIQ6D5SDfgrTBDlo83YtC5f8zXA5rHKjG7xcAWNfaTJVnLFSQvfgCNkixdy67AVQypwqCGVprsIU6mewlR9XKkDQDMU3cN94dszr3FtnBRftebMVY8igFimGW6xpAopHREeO384Eg0JiaHGr0X0ykjEeCeSKUY7j88nhH8RVGkEL9m8rgbbeCg9Q== 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=OrWuFTIRIPGwE6RWDvZN2PHet44Sc82dywtJ17Fv+sdgwc79HD48jyHEpGT6xU9S4/nEU+wpbBC+dnOoK9IiclSmC5Y0kL2dFsdutuw7qQn+Rb2CKFFdL707WJNOLLNdFzUX+0PUA097U4CRXHGZYT2oUXHDpo2wqQApmAk8GUmtE9vc0T8mOKJ0PMqEnLcz1eHd3upKMd+ywpNpgwDE7XnbT2OREYD8KunRjglbZrdQNQpsCRb6zRjKEHhq1sYpaBzZtXS6MFOOs0O1QkN+QycS9CFQibXxxCJpyRvtZZqMowJ/CTY5Q0RdLTryw2oFqelLBobJJ80RUbwQSS+l9A== 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=unnUxVm17+Gi2byaXZfdQjEOzEYpC7dNYthCg78TVzc3lSfG/d4ztAsKzaxrzvnSDgQWvtrwwcmDqBomiOHF52ZhV4JTcaerqCiA09rLiJCBOyS5ACmQfD8EHsRYm14z6xF8zrMDBynNLL3RrZZWE0CYMlqNA2+y1lAcOi9qw3MGdpn+KqGudBpO56/6bklchhU19mqoIDnUQUWDJIE/+dAWEX/Pu63vdcEJAZq2S4WNZG5aip0EwUpdQGyGVWaRx0H4N8NFE4FQF97nkrepnv+3mNH8MGbiPmwKIBPcp/oXi9/TA+FlHdfTKqQMRqv0+KUDqTmv/M4hdtov/86dKw== Received: from LV3P220MB1202.NAMP220.PROD.OUTLOOK.COM (2603:10b6:408:1ac::6) by PH7P220MB1063.NAMP220.PROD.OUTLOOK.COM (2603:10b6:510:31f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.36; Thu, 14 Mar 2024 15:37:20 +0000 Received: from LV3P220MB1202.NAMP220.PROD.OUTLOOK.COM ([fe80::57aa:102b:db4b:e05]) by LV3P220MB1202.NAMP220.PROD.OUTLOOK.COM ([fe80::57aa:102b:db4b:e05%7]) with mapi id 15.20.7386.017; Thu, 14 Mar 2024 15:37:20 +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 Mar 2024 11:37:03 -0400 Message-ID: X-Mailer: git-send-email 2.39.2 X-TMN: [suMbZUILqTIBHopIeDhXKL5ZBVnuW6Jr] X-ClientProxiedBy: YQBPR0101CA0208.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:67::31) To LV3P220MB1202.NAMP220.PROD.OUTLOOK.COM (2603:10b6:408:1ac::6) X-Microsoft-Original-Message-ID: <20240314153707.31551-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: LV3P220MB1202:EE_|PH7P220MB1063:EE_ X-MS-Office365-Filtering-Correlation-Id: e86c9ffa-eaa1-4516-5f22-08dc443ca2aa X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZykmMEFASRf895RXHqT9LuK/TFXfgKEJtsZBq4Na+GBaC1RiS64XkDuZNBfpY+MApWoTQyKIQQ2gmEfETcC2/wAfQ3saOV+g5TvLV/PkYxe+qgRRBtkLuSOWrEJdtP2PpkbQvGxkjmpY4sm5xXI8CR1z4qY6Kin+PMcFGlWQDz1S+C6ZrLwZ2SpfNLrxdYb9HWfDoyB0VnoszhdigOKvC6KlBni4AnZu+aLovxQ+sIXvbSbmqi9cWaEVmgM0fSQsW1ol/whivKs0kXPaYyOF1x9kgIiU7NC0Xqak64i1m5TEejWBAD2BTFainx3fEqVuOdLWEPWznbXS7cQLZ06CqXoEcWSqefCfyobWEzoCwrfcYGqQpRsoaStu8335BkoDzK7XcvbI7gHoowuMfqV2AmlKppx34K0FtIPyTzsCu1YR1cLWkdomiwxk9ugrKyTSJmRCFwT/7oukcm1jKJYoxDC8JRIJZ3Floql9UlSC7iL3/abRj76jkVBow9b2Fr1UgwBdDBCF1BZPU9QD4QXV3I9kTNh7p7s5LlY+VeNr9s/1AulkD7xKJzZpv+RUpjm0 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DqyKWAdf5anM6tAh4FF5WS4lYC6suBtok5JX/bHhoYWBVGX0Zb/ykC/y1Ppw7MaiAMRYSa6c41abjOYN1qSyMEwmlGp/7goVFYjW4NM+cz6j+rlGFFLdkMesSOjC1XqCCKL/KW3MIeXTDZjAlPQvJCd+QNQ44WULLdfBT6Cwu3cUz7g7hyReKINlj+s8J1qPnWSsP9a52n9GKqlxQx20J+WnPqthpvO3KOx1E0HstqLKJkX4Uroe6m/FnyF8ZUR59AECHBxapC3ehLXeWX6HqZkmZxWvwuqS+iEoseoeCyxZId0KtM4PuN0l+eTdUEg8141vPVIjeQxiHxmcdkJTf6TdiVkoKOha2DAnUYxcjcdLBDV82nsUl9S+Xzq2oa0WYxrLytwEHRHbHlEiJ+RANuXT5X8zAcg2RxyAZX47pvz1i3+2hJuisfdmYDK/ejLb19KMBUlnrRfXj+h7vF/5iY70biySBUVBF8KeWQRWLBP+NzxpjFW4XUXlTUXDT8uBfYYl7Dt5lKu3k7sRuQoglV2tjvdqz6Y6bGmqAeaklS9UfrfBscaZ67zTgMmF+f4CSSGPIm7HUk6TZg5pTnUpd9YLT8fIFBiUXjF+YLMsTk3v/em/61Tp+Metrq/UO6VTMHBKHMQJJyPUSfKK/2dXNDFg/yQmoNsCAryrol2JFEhkAqQDYXBvQd43zbjkORdlAfMmCgfxiFKgeFPrpsuyNp2Q7WMoMiQPDQwVgipcSHz52vMBzZXp2Pm3yxl/QNUtFYn7oGevOZJvgiHw9+u8YJzD9nkemhZYIGqebNYExcDzwmx79oABg36qVIbDEUlA+Qvc68AqsiL9s8M2WBQykvJtKOqK+yHzppwfi5tTx+ix3yRIbY2Gi/OyI9/8SFeMUBAPowdHqmTdkZOTLyH4q5FIcoe5JBMdDJwbHzNtQvvIptJUsh0Nb086eS/tkOEhZVnXpdXEiSNsFfzdNCw5IbD09OOsWb8WWyNjy4iqXdXCiysNb5BWza1Imi6Il/xfirgJVeXVkbcor/Hqj5VStdy2+ri/30sSgreyjM5KUQh7R2lt0lPWQbh1CSfj7wMLVmjRpREI7XShHJRmBIr9tF8Ye08Kcxq0eHvSTmOje5GlYvbA+OWELkj8p7iu8vYzeHLrVuq8SKmkT25vIAw+Sh1azzBKS8o4y3yjQs20in1WsMumnx1+SYqxTce4Ukahs+UJyUfAT2sxh7G0lLuI+5uVOeH3XEK0bs88XcG1D68= X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-3458f.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: e86c9ffa-eaa1-4516-5f22-08dc443ca2aa X-MS-Exchange-CrossTenant-AuthSource: LV3P220MB1202.NAMP220.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Mar 2024 15:37:20.1859 (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: PH7P220MB1063 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 Mar 14 15:37:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Min Li X-Patchwork-Id: 13592591 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04olkn2103.outbound.protection.outlook.com [40.92.47.103]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2324B73161; Thu, 14 Mar 2024 15:37:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.92.47.103 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710430647; cv=fail; b=Mx5dn+n0izO8JHg6FaAJwyCIM8Qk7PJpdyCuxHey8/0Y0RjMITWzu3Rr8J7Jqq3pyrNDq9eopbnAieJj/GEy9IDi5zHC7NAskSa/pmvJ+euIwMV+ojqIxc5L4pfhc1keGWc94c7krwQL44JqHfHyhKd5d+0f73fmYEFfp63tkBQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710430647; c=relaxed/simple; bh=KGpu6XTESecw4acs1KGy93NGZNiEm/cWrqr/MsHfZl0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=Ocqk1RkAET0PBxHmQTNNrD8z9vJiS6O+DaZ++CX8xsIoBlAVH6fbFhbJ/HuWgJuqUwSf4xU6CYP/tujQqcZVz6sCIyTfYDnSTXNLxP2Va9JpIy7dfi69IOjjBJdGv4syE487BSPv5oYdJD52olnJyrvdV4HtQzVnPB7UvgE6Enk= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=hotmail.com; spf=pass smtp.mailfrom=hotmail.com; dkim=pass (2048-bit key) header.d=hotmail.com header.i=@hotmail.com header.b=Nolyqij3; arc=fail smtp.client-ip=40.92.47.103 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=hotmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=hotmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=hotmail.com header.i=@hotmail.com header.b="Nolyqij3" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Iq/iFpu9M3+u/KFlXsr6T5uHbDtpkklMoM7A/HNn/gp7cuXbROJ3kgSQ42LQPKBikDILsYHgo2r+6XS8gzgPmvH3V2iK7oUptw6fIKbXgh6HDFsuoL23RA3Swg4lVd00Oe3gRGY99diwmwgkPaV2l92HsR+bC2AbJP8eTHK0x1T1MJTVexHHDcxWDmyON5+woHQFtRzQ+pdIlyiQ6e5GjA3VjHbK6brVXcNd21MGXtmodLhIq//Hghs6HlXB8reAiU857ochFjuKu+5qFg+diEfrrAmsXuovTFvTnjbaR+wpfnyEUOqltvlWJIPzdVuTv8Lfoc7NlCc/wjX/7W/Vew== 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=Wt50euCOOWfOuBtSMB70NnZ4blp22HUpb6QV4cp2Tn04DaSsZ2dxZSkVrJXJT+/i9twHewhXP2BEHyZWFjnIRc1Kukkb8duqA9w/WkolaghTDzxexQslZRJzHGujDbluABLmife/LVw3cIpr25McMaTir3qG+Ktq0ETVozWYBOOPf2P4/Q2fnfC8mMQXOudMac2upd86NLGYL32q3fPYKUM29pwXv/7OQNmbGfsW2NWUXD7zaIL1ocxVv4MBgfEIBbb3djYFOpvGieQ8d/ffpUEQpn5tpMM2xovYgaFBt5lLP7xw2zEeERwvJ1O3PhW4Srw3uvhhizw8xfv9y/jLlA== 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=Nolyqij3fv3G0RMmLfZhBrAmVlx5sct3YDnfiJ5V9rmsRkPEG+SqGCVm2KITlvg6cBb+ukaul9q39KqWvFlCwjXVvSrVk6OGPi53fVOxv/stfLg0Oqcz9LdBr8VIE5DYCt8C/VfhKt4sDlAcxiln7VaP3CmJdMHLa+NJg2pmsNhHdPD3AAQR7RYMWkyuguqaoOiH88xTS7fQ4gaeKpo/dL6Zy84ellkCvudMGdwpi0zF2cILkvUEZdXf5rzHGIZZnDhJURz+MBiElI8hbdUGSAriOLMrdmRqg6P7kGUiGSKBy1gkX6UCrw2sAZVpenG51EXgQRABVcsEF2umb8RHLg== Received: from LV3P220MB1202.NAMP220.PROD.OUTLOOK.COM (2603:10b6:408:1ac::6) by PH7P220MB1063.NAMP220.PROD.OUTLOOK.COM (2603:10b6:510:31f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.36; Thu, 14 Mar 2024 15:37:22 +0000 Received: from LV3P220MB1202.NAMP220.PROD.OUTLOOK.COM ([fe80::57aa:102b:db4b:e05]) by LV3P220MB1202.NAMP220.PROD.OUTLOOK.COM ([fe80::57aa:102b:db4b:e05%7]) with mapi id 15.20.7386.017; Thu, 14 Mar 2024 15:37:22 +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 Mar 2024 11:37:04 -0400 Message-ID: X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240314153707.31551-1-lnimi@hotmail.com> References: <20240314153707.31551-1-lnimi@hotmail.com> X-TMN: [ZATv621bfdZ6bff+sBwAroxHwN5hCYN8] X-ClientProxiedBy: YQBPR0101CA0208.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:67::31) To LV3P220MB1202.NAMP220.PROD.OUTLOOK.COM (2603:10b6:408:1ac::6) X-Microsoft-Original-Message-ID: <20240314153707.31551-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: LV3P220MB1202:EE_|PH7P220MB1063:EE_ X-MS-Office365-Filtering-Correlation-Id: cd011521-e712-4c1f-00e3-08dc443ca441 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4lceALnJy6GNIba0D/Fv6Tbfg1YyjOIjyWQHRfvU4ewxaLLoaQu6xj79+x+XamDWT8UkKIt0VTglfIvguCp636PgqPTcdl3saV+n03wXPDMXL+wEZ78QtIIvQmBqyz7DPaPVzy7Du+thU7dDaNIlToSIavoa19qC9z0VyBuc8/BXNv9cbu6LTbZg89T0UQQmKxGwBfpZ5nwis+q4CC+USaN43iZpJ3xB17mU62BnxO6QtRITLCu0rtdVi3vhDItZngtn2oJbWnhV35aNjCch9CMwWZnNrrGGol1A49nl9p8tS8Cu1n3lU+WE9WEiaZ+Jxvdp+FI/iye3YJGw13oxXUqId2ozk9y6AYI9G+TPbefP40Z7aYXPaXn5fovr3CMQtVjTXa3ubrTF0SheTvOwdE8vEKvf2sC5n2+s/raba57D/uKY1ubyDuRgR3vupeN5KteUYEfXtpaTB9G/t9IAckKrhN4FhNi+0cBjpOTmssrhV7PEXugZ9wStzvJLR6Ks+njjkv8SFgXXo48hrRbbfzv3Tm5xI2GMYI7exnSm03SpUFD0ddxJ1EcNwGg7SQJM X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: zyJm+mfLdGC/jIjA6aLyYqjpUkD7aK7s0EqotVjp5QCS7rmmaFdQn+LErIfThNmCJll6FeUtk5SifbUqLndS1TGwwh5rNOo4ypgSQmKBJ6tAWWr7SuMf1eKOJr5QWYYRysVyT5v4eyXIZ4XN++mI1k8GJUCPq+cewSEyaPpHBe2QfWaC4+lUIeax4tAeTKp+MdpTzyhmpyTom+rs95WSf5wtBJjygDWLxLzxLh5nDAfVG0QJoHquf8vxFge4C2SDBvlAMONztdyveaHPYHyxEGHbz0Q1Xdup6lE3F02tc0IXbIl4/T9sTsG7hJvOYe/LZRdc8fg61VZdRM8OV9hWVG26iQptZ2p3ocGSmpCZXd/dwS8sSntQdBawyhco/lDDU9pIQjzwoxAvP4ZYt3nH1I+tRyIoS+XJAO/EqJajBsCoLQlBaggJywYcYIqQp3BRpsOCxXSeMMbMygtGuLkCqB1awVTKRDr4IExlZXuIoMFwDVsf103JttFu/cYRh8FbepoHlg5tXQ9DyCghUdALrslIt9Qkaaq1Q+No87C0xqsfX+U9E2FvNdN+OPNdv97oHzvodL2/joxNarnOhBPOKGQbxPv0p9csJn6pkGv9tDBktCV8amCVBVCjNO2f0gauMOuui1rpOKcEjHNkkncndZE/9fhd85Y47ZD+F0CBiSxXyeLYmRyFkDenX5hsgajIuS0fpTPp+MdXBym+KcArEarjTEOtvYEf7XwX8aep6fsW90P+DiBF22zBvUwrpJMOekXYIDSBvi0huO8+tuGJZHP+GQzGbLYpP0RzEXKJt4hMbUYSQkN+xyLrULkoXsT08zu62DQsJh9VzghWGL6Hqrd/WJoSvPnnP7iGAw9jVK2pP/XtZfu6TutsNrA/8PqyqZkDLkoHHos9o1WVq0jEKY3NZ8MJ7tR8M8Qu1oyzxjSRxA02dXAG+e9JXYQSMcSMePlQSYtfr1sCgahDBpyQUWTPXZNzLg7smD06evQYamOwRXGKoHN0djLFeLIR0oGy4Py+VIKIxHFk4ZPquoDEk2p7E3oIwv1eR/9PfPsNz75FGtAY3agdf4mAtgKFQ9rEQt92jdEZozzfx0qpa4O0pd55bvFL2kTonXNvCHjAXKjilOygQFDZVozW6zRfxM6jSLr0E8g1ayiZIxufcZAX4MHY9ao8YJfn45c7fYw5yDHBZvawh4d+7u9zwd5hdMlwSQClm4OC1cWeyCHRZ9zaj7iJPIE1m1kt8QBZXDQHblc= X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-3458f.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: cd011521-e712-4c1f-00e3-08dc443ca441 X-MS-Exchange-CrossTenant-AuthSource: LV3P220MB1202.NAMP220.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Mar 2024 15:37:22.7258 (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: PH7P220MB1063 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 Mar 14 15:37:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Min Li X-Patchwork-Id: 13592592 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04olkn2103.outbound.protection.outlook.com [40.92.47.103]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 28B8A7350F; Thu, 14 Mar 2024 15:37:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.92.47.103 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710430649; cv=fail; b=ACAiPhZiFpAHVHISPrcq9vuLOiUsSemLBN03Z8A4b2VUtQ38zO3q+KfylmhJXxic5I5+jLHZihKC+QV5bTJUukbBA8+RVy+HhVpJMTbOWCunZxskuhoSwAhFlTzNDkGdyQSplBQ/QZceUZEGvzcWaSaUfMizOD2PVjD28fZTgEo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710430649; c=relaxed/simple; bh=cHB5Bd3AQvD4qN37/en3h/15oj4vABf1xasMvTLVjTY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=qFA0Ag02Z0HKLuSyXrv9gaUXDqWlJAs8VnF8/z9nrbtpP9pFG3hdjQXXiDdCCUcpe2+Mqq88E61eJ3Vuut9yNgtXMciFRPV+gljGLLX2sbO8xJFMX/QQl1xyC+QOSJ1o7u6Eo+SRdF/yvTz6OeljHifB6LAbyxb47TeYnCWE86g= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=hotmail.com; spf=pass smtp.mailfrom=hotmail.com; dkim=pass (2048-bit key) header.d=hotmail.com header.i=@hotmail.com header.b=keUc/O6R; arc=fail smtp.client-ip=40.92.47.103 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=hotmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=hotmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=hotmail.com header.i=@hotmail.com header.b="keUc/O6R" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=n8gPKnIr8mZBXkmS5KSF056+hBvwB97DRnk/LUNY919gKf0oXyumMPlXY7W0ObxIMDrY4tSS+5jWOnmOwiSKtxlhN94hN75ZqFcn/NcMEXIOQ9fXu91YsYofayT0jANysVy2lo2R9KGRGCTR7c+UErBl1EvfruhXqDKbeH2DVRNGP4QuOv69y6zlBZt5M9USvXuJ6xdDy8rsnhltLuOZUHA/BTr0f8HKsEwZQjT3eO+DqZRg3YNm4gzhD9f1hI+JLLfPMndt/KBoF6VtmbaJVpDzfBvhBdbvus3ue+P053+bZXND6pRrmN8ILNKeiULG24DmjZeH3pQp7EC+jX3FwA== 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=LrcWuHEQBCMvBxzsIoNkcFF5Lz7FqWnvMJcyvTlgSNRZCTKdwROOtgc0ehUc2jKdOYbvYqkgJq2we1EWRYGym9YTaOwtk6dN+D9+W9uOqWZo+JLBU/NmjIAe60/W+uembFOhpYswZF6j1fSPui6sUyjhMxpwH8n24dmBgI2e4A1ATq6aeK85U//zlajLwGdb7fK44ywem42uvCLczdfDSrhtO/CfiqIXAWpMii4zn1qAvdciMR5jTzbqx2g5iii/0qwwzoY/L1GM+YCEliN9yX92y8Ew09A3ld69dam0wmuOSVs2kmG2DtUZLmI9iAbmwTN4MynXVD2z9fRRaLYcCg== 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=keUc/O6Rt0+FSiB2wuC4YT/uGqmqwdENDaTrR9tUZd23w52RPaNaaZBiM6oa1wXIvTPm++C5bORwSjxGRDsyBJEnf8swwuNAsbO6CbM41PzeyIhG9NHLPuCJkPtnK+sL8CmdO2PfbXInKKDVNtXknEcnk+dnu/HyHvm8R3z+uqkVGbq0t1PSM5jFPsoW3s5ICBI0CqnWnUkxwsAI2LKrTAJxuCXAGCM9BcKb5KD7kATL+GIw14609/+bbF9GFaTSTfP6Nd/1m9GiIRy0VSXmGffqLsZU/kIZGvopeWVouD3PVVAcHXqo0b5aS5ipVanZoh7eDRBmCDBb533c6B7F+Q== Received: from LV3P220MB1202.NAMP220.PROD.OUTLOOK.COM (2603:10b6:408:1ac::6) by PH7P220MB1063.NAMP220.PROD.OUTLOOK.COM (2603:10b6:510:31f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.36; Thu, 14 Mar 2024 15:37:24 +0000 Received: from LV3P220MB1202.NAMP220.PROD.OUTLOOK.COM ([fe80::57aa:102b:db4b:e05]) by LV3P220MB1202.NAMP220.PROD.OUTLOOK.COM ([fe80::57aa:102b:db4b:e05%7]) with mapi id 15.20.7386.017; Thu, 14 Mar 2024 15:37:24 +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 Mar 2024 11:37:05 -0400 Message-ID: X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240314153707.31551-1-lnimi@hotmail.com> References: <20240314153707.31551-1-lnimi@hotmail.com> X-TMN: [4pGlyp3N7cOO278St41PqinubMPgCecZ] X-ClientProxiedBy: YQBPR0101CA0208.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:67::31) To LV3P220MB1202.NAMP220.PROD.OUTLOOK.COM (2603:10b6:408:1ac::6) X-Microsoft-Original-Message-ID: <20240314153707.31551-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: LV3P220MB1202:EE_|PH7P220MB1063:EE_ X-MS-Office365-Filtering-Correlation-Id: 866e1b6f-5007-4e1a-b628-08dc443ca580 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BCgt5mQEkcxiucpyKK8aBGfXp2ZjpOkfDUPhS1TybMPGMecVtHaSbXloMbp7/i8XiOM/oONdJguV5tfuhXh5eYAQXCc4Td8sCIYL1vwDtVrdZXOD9wp0J01h2cRB28mQhGGvuW7Rrn8Y7b5cMby2jkSp7B5x687GzfOgYPEvnHF0e86JkfWT6+hDpWsAI1sUUz7/0Df0/pWcRyAJa/xun9S9zTIjCYvq3Yp4we2awAsgyGkmi3D1u0DrXwLVf/9JEHLnaTKu8LJm++hbK+TghX4EdXuDYTDg9RefV8GIVyhiUWX1487d4/BqCk/iKAkTI+YS6CN0B9xChPzogiBqy6c/97W85wbIXrjFdrj0duxDlDNIx3bdP4RSa/n58lr95fHW5sn4tKjwRFYoGgkQJvlqDg2l4bTZ4ZT/TQc9phi70GU6gle1bXTpO9FWfVuTtUHtNJyv+QTjKKyOFj2zQV062yqPWGZP2yJ+4DHKU4gSEuz/7/SrqqIpvhzJo94SJVCf45b56Xs/SybsVU6GsRVD4JL7sbpcD5xSGeGcj89LbuEzrdWP9pXZI9MibRQn X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 2RUJkGyFdzhQaXZ3GKVbAU/NkyP3wvNdpeGVeHgM0JwGe5bFkM3BkGDXjSygpfQbCPMMyX+tP9aZ4em7BsbBANg1/xV4re4eGtUuPFNupObuJqxlKJOQmROVEI5/vDvydPgrOxu+kSrOnR/ZLj+p6Z5J9P51ahw3hpchip2K4PLdyThlSrtrtICMhl6Bx1Es3oXSH54K7AlKS2fw74RO3DZStmIm9vntA0zN4kSWYG4qo25JFHL6cCKVB3e1qg4aKutgZucYYLtTuTiTInnQF75Tg7e3pzNlbf7uMXPzz0f2jI79aTzw4tONX76pMhOgGygLISTTnIWd3+4vFvQEdf6L5p+hc4feR8yKG/MS+7F41gBkmRUuvsNKFZ2MkChB8WZK0k97ytAd0jXyV+0VOGwqXcK3h0LQALnQt8miUi51wl5nJjWRwY6OgmwmdSuFrLTUSZpJDeR9ZnWirDINw+oRB1cXfv7ES77DRCGH/6z+riQXdLpzZ9fYzk6ijljsN4iVOR8RItqLbo/3T4vyCgyrVGwiGrEIrPZIR9UZcxdXiCBjFi1OqG12lsOC9AnJBHhCSjmOF/sqflr1h86EZiN0CeHR2EEMtDxo+sjsDhNgB+g/mwMy1nToG+cTIyahZ/XOC+4C2ax2a324e/BC10FC9lId7wTEzUr7NVWPWu0vH09JBJVgUnUpolav+X1FEDFTFO/6uFil16zCSgP8E2TBsCD06ZFgsCvj0IJ1hCypEUlreyqL8heGm4WWCtRc59/aSeQVcb6TA6g9ez//Uheu5ouluLp4kXvNdLHMG2uO7Hn8aF6BaOGJLyxSNEJUYBXVwT7i3stULtN9hi7aa41GvOCJbCk4ZmRSuztEJgZ3N2y3su1SD1RAWhajNgy1EdVcLRHKLSPtg7nL2pTrJvlgaXfn5+5qXTKGnIkyFhy8Tzwy+UVmLme+e6LBwusierSLe3uV10xOcZoz0abNS/KTkcZtRpYx9LelFf4yIT09dpQ6gh+6I6VTY9YNuXaiGUD/qFfX8tHybErejKzP+jCKS4iyNluKyKDLqqF+NKZl5pD6lM8f1defI24doo+rjPSdGsWO3VEQ0rchVSqD95IsJyacILA52nLlFr8MBLmpUxbEOc8QxaHP+L1Joej2esMgttBvfzNJcDylx4RMytRb5IHJoUliAtwJ8pv/MfhcZGipPa8IymAvpcgcPmgxUhsJXODkDXLoll8rlcDmfBqtIgx40UR1kLzkQpNgKNU= X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-3458f.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 866e1b6f-5007-4e1a-b628-08dc443ca580 X-MS-Exchange-CrossTenant-AuthSource: LV3P220MB1202.NAMP220.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Mar 2024 15:37:24.8125 (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: PH7P220MB1063 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 Mar 14 15:37:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Min Li X-Patchwork-Id: 13592593 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04olkn2103.outbound.protection.outlook.com [40.92.47.103]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0F3DB71B3C; Thu, 14 Mar 2024 15:37:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.92.47.103 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710430651; cv=fail; b=ukkfyXwJThUplVMoAukbmctPxJmrBYBXErPp8849JDARdyH1xKZI/fdOYTwneYa89D0KCqTtgfihIl1G5y9EEvTQRjCMOioM6/6SxiE9HDpFjiR0Y4CjNwicI09D+PHlcKVRorixrs2JQWbvGs8U5W0bfDlkgMxpWuqTT066vY4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710430651; c=relaxed/simple; bh=lBev2nx+Rwa/bnJJgAjIrRVrYkHTGj8aoqvOO+ETPmQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=W16t3pULEe8x3+vQ2A1dhCne5GggAk4sodylzXrdXTsa7KyHyEj9VZhVuRVLOvdqBo754n/AzMPlvpU+nNN9O3q0RXd9gB0c0dDAyBTO4EQ4s6YfEke3kK/78eSnMiI2xA5mphwgkzKYygmf/QUEZIR9PL4CNVfT227tIWoDI04= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=hotmail.com; spf=pass smtp.mailfrom=hotmail.com; dkim=pass (2048-bit key) header.d=hotmail.com header.i=@hotmail.com header.b=O7pnVY0M; arc=fail smtp.client-ip=40.92.47.103 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=hotmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=hotmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=hotmail.com header.i=@hotmail.com header.b="O7pnVY0M" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LG2i+f6uWRlN6azCdj8c2u2Hrtgddft07qRuArbT/7OVbh+/a0YDESRNS+KnDTehkHKm+nfVKw8rzh7kWiOsZlMVoJ6UWsxUtic6gEfldttD3C8DLJptxwvdWIjGXduCx36M9zLG5AfXslCSQ3LdN6MCnzHohV6Exnm9C+Q/a4kkd2YS+Adnok1tORoSSHwsGcgiSCJQdaHm3K1pfYNB6o7X7MqxqtIkmwrY4+A7DMplpnz6AZNP3puamVpZmLuULpqzBhLlMf+PSVyu4GdlbFH9pI7rUTcl/WS/q3MGZGHXROfrFp42a0gJD77P9UnyvLf4Wk8sjujLMDVIr5GpWg== 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=XX3+u7ns1MxYPNRtOgeZqt8keqB1oGDLyXPgzIF9edgYRwGDzqM7fHIS5EGFs8nMvqAmEqmGz5T0YxEuNIPCMs2mLypsRN9IiRtXgFfvpLZyCRhXNoM6NV57ZltU8JFA5zAKP1YeYmmZHdhVEqAacmzlVevFAmS2S+92xrxHkX5glqktLatMKNufM5y7yQNIgb1OGkKzdTLwB1Oa1wRb0CSSsSpUtpN3U5JKTkyFFY0p0K1tKchS3d1tdQ5EUd3CbhGrvzYfrW2SKBML7YISPJy0cKqMwZwR3PF1RnXyh7o4ai14/XfK5G9WswU9Hru1RPJzFtg80jDp3dd+KHkPtg== 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=O7pnVY0MfJIbZu8VhJiSb+fuOr+Pyy322xOhXlGhMLSSmCra/24m387jbhrl550XDHu0GkxYzjYfLB+AQe0pBnhTytwgE63UZ7SEiVNT8Iz5Zn7wBi0eaii9Xnc4g6woW/lk5JIMFQBeZu96u6LUw8Bj9BJ2jatlAOer+/m9OlTQwRAVwjWQAYjDPRxBXyk+uGoiPCjuUo4ML5ktTc9tfe0958Ha13FSg5DFtDZdfVxKbgVQwXflmwLIX3LJMtD67jf1iU+l1wuI8rWqc2AGlysKE1Azb8lgqh97JoeMGAja7n1e4DKRtSOxII1q5f3LIJg7dtW2Cx9LHieC2SoPgQ== Received: from LV3P220MB1202.NAMP220.PROD.OUTLOOK.COM (2603:10b6:408:1ac::6) by PH7P220MB1063.NAMP220.PROD.OUTLOOK.COM (2603:10b6:510:31f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.36; Thu, 14 Mar 2024 15:37:26 +0000 Received: from LV3P220MB1202.NAMP220.PROD.OUTLOOK.COM ([fe80::57aa:102b:db4b:e05]) by LV3P220MB1202.NAMP220.PROD.OUTLOOK.COM ([fe80::57aa:102b:db4b:e05%7]) with mapi id 15.20.7386.017; Thu, 14 Mar 2024 15:37:26 +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 Mar 2024 11:37:06 -0400 Message-ID: X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240314153707.31551-1-lnimi@hotmail.com> References: <20240314153707.31551-1-lnimi@hotmail.com> X-TMN: [HJW/M7Gn5LER1pceoInwWyEsVMurQO1K] X-ClientProxiedBy: YQBPR0101CA0208.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:67::31) To LV3P220MB1202.NAMP220.PROD.OUTLOOK.COM (2603:10b6:408:1ac::6) X-Microsoft-Original-Message-ID: <20240314153707.31551-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: LV3P220MB1202:EE_|PH7P220MB1063:EE_ X-MS-Office365-Filtering-Correlation-Id: 274125dc-20d4-498a-99e4-08dc443ca69d X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: S5BmreBY4HzmIAIt4Hvi9GsZ8/59UeppWJ48dvt5kZpm/utoOZquKKpAEf7kolLi9KYMP2WneUhTS5Y78b5gR8nwv4kvQoDCGdo1H8Uyop1rIzRmfItDkYRlXnL8wcpO9wTAvrNsK9dMsEo3IIRqVj0gPwzlrRI2L5yq0VKUmkTomDXcnjIFr4K3nfRedk1KRgp44dNTFErCwIheFFA2mdFS6DCXe3kAlkXE/ZqvUnj1jybUnhVS+b20nDcTCldxm9LyBJMt9mJgN+NDr4nl710NFTEv7sF52ysnFNxJ/pFXzqsPYiF+Jd66SiCL2lzXoBRElicjv1leR+V7d8RDxMrjTMdw2RzPdyG2COVL7r/qmf72m2x/r1v6+32Duhd6kK3k5JYMmMv5J9sUufXzb/wZEAuDIzztL9sZzNlM7woCh4M1Dzk65T3PVl6J6fXou4BroV4okU65FNr6h66dEyZ5y+y+zUUTX4jLWHC9bHiVlDlDz0DU6kphAkv1AtXWMDMPPDVDV02sI+jfC5k5M8xn+6mqQbPpN+uUvgAa9rbEIlwarRPAqnKJuS0SWzSK X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GiP3iqpo4ASGEKb/rF0E7IhkTAJThIwsE6ayQNKQgDOU+JMCZNpn3ECyPr6p1oF+nTVQqRS+gduJOboQwnypz1DMsRfiVjCHzEyQwr6+MWsCHWT/Qwe8vCwLFpc4I/nscIWVOggmBNimODv0vSKvl/y57HtTuL3N+0X1lPeNR8KBgibVng2IuQAqis1+/PetrT4cohSR3iqOl6wGRDDFrHGJEWust6c73Zg2f77orr/1i+DmwiohMtYVj8Zs9MK7Ddcen8dnLtgEDq1W1CGl28m7jjbcLlAeP1duXtW3HpUSKHK2OquD6vBub/WaPsqa6hXWpBeR5QDnHrW3dSAv6PCZsduX3ZZ45P8DcUoN2Quc2c6StvWlykpLbXbFnvkvUJLKF4rPjEnAwzIFFyQYqkVuKbwb8TaRRlhuqOeDo6FU2jdpPdzGtFktV5buGS30W5nn0foepHhi/23kZIhSwT1voaGBkhHy8IDeKfVClkQIHTea6PrfQJI+Nu3Fo98dN6yoobjTNQUD39tHJ+4xBmsGxg9OtLYbEsGsw7Ty36K3m1JuNnte/dlkhv6+w/L1goyAW2GrpKGHVnhHeTou/d7eO9by/b05GTCigZsXlP0Iua6Nmc9UTxYRMFChcN9IXE40cdH1QS7SSU1ar2Fqtr4ikBf8NgKKbnhi/e/5AoVCVV7kahMK+JQWsQvO1bcndUe8U78UNORfOQMn4PjVIpT1Z7lA9z0is9WK0p7dq5WlqQjPeQlAB0SXpKGbMo2ZdRjuuvHpRS+k4koe8MPIfGRf/cSdd3PlxzsBQL0cas83CV/8Ft+4RBs/NufkixnFuSEwGgoZAHuUB+poM7kjanlqaQVOKnMHR8k0gfaAk9c9cSS0jKLeTlZi449+q5xOa85eilo0xotQ7tDoGJXRhRD0TXmJEWGp3RaqZNIMdw5z+0UoQqr2um/LyH2MkNIHXoObH1mnUZ/6K7PF3YotTe/SBf/EqDdoOVdpsbDHd5AyvyIadeqjHJSVtc2dsCK2qCjwJaYDheZq1Emz66o6DP5eOSeAyH2aOJDGj4/+KjAAJAtseQTBkyFpD18peI4A98Q2mHgmRKmg/a8/eoMCjheG5xyq44fAmKTd4WymrOOI/mNfE/RJIfpSleI3U2sn/A4XNYbzaA8aOBTskpEK2KaRGWLqwCQueAHrFIsDGC6ORmKWW7ygbS42/ZLPBK3n3GcEbxTfL9UxyA6gewN/7vjWkYi91VjrhPLnqelryZY= X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-3458f.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 274125dc-20d4-498a-99e4-08dc443ca69d X-MS-Exchange-CrossTenant-AuthSource: LV3P220MB1202.NAMP220.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Mar 2024 15:37:26.6301 (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: PH7P220MB1063 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 Mar 14 15:37:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Min Li X-Patchwork-Id: 13592594 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04olkn2103.outbound.protection.outlook.com [40.92.47.103]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0985B74411; Thu, 14 Mar 2024 15:37:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.92.47.103 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710430653; cv=fail; b=mSGr4czJE2vbgadjuzFJP/EKDLdKpiVrKO3mRd42YShUwCnNcJ9EvGeb9xtviff5eOyf1zip2voKph2ix4ZNGKev7Z1cMHmEAfN3HkvrQ2QvO/U+tgdRzeTmJFrkiw8vQG3tqOEmJr98UwJnzHxem39b+TdlzQ90+gvaNz+CDw4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710430653; c=relaxed/simple; bh=G5yuoFn4CqSSLUoKUQSfijFjkAWJVZyf9iameQLSATM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=NvNL1Dy+JHpsgKhFjWC+wfnQIGO2IqB+oP23LAY9IPR+dw0Wh9QnsPyTQIb7E2/vt+GfI+cCmhKAfPNWI+Nxd/y+bWpilRrKxptTNy5BXHYfLxygUHg/h17dq60SPyC7cvRXXQHVnz4Gk2TUhvq9f5oZGnIKnbmFg/706g+Rkxk= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=hotmail.com; spf=pass smtp.mailfrom=hotmail.com; dkim=pass (2048-bit key) header.d=hotmail.com header.i=@hotmail.com header.b=GhvG/Vx3; arc=fail smtp.client-ip=40.92.47.103 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=hotmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=hotmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=hotmail.com header.i=@hotmail.com header.b="GhvG/Vx3" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=K8nGjCDfk6ML3/je67MB4JGeI7umZqBstIy37gVJu1ELzduwpYR0gOAANAMTgjD+iukfdB2KQKuBpOB/vFCRf2RsEueFa4FxQkJVvH1BqMSl4PlUeeXXFSS/uc7oWi8sG0p7yd0AIbKHJjBTKte1KlErPV1q590vBqgEmxQM+hJNxhL5JU5pBObAuUkUgw8HbvwIwVwJmLReR8o8uz7fcOIvzfz10QvzFzev/HPlsjq/tCFUbt7h4eUkL3cD82znM41vBXXttOV5k9+UWjMNRWYIJ+oVdyWQdtIQ0CMcXENlO+ssBJcp0app26xDyNI8CTyfjNXcFctpYkdueg9H/g== 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=cWL/rPcvzKt+ffO5Ri2GNzf8/MYo9AOVhItdq/76z37Bjp1R0tZ3yw7wY32fIzFasSSLwZcPS/HGuxDUwWGS4lhPTU/hFF0EsbKsqBP/7sY8D6qorLAFd9WyB9TXTbDuvFuwWmtuKHt2FgRy1snTbVa1akajZ5zB0k7EzfSlJhgyW/FSF68LqOlpZZQmhJtMNDZlPQOPB5VcYidasB4idV+mE/eRZGzNQSrT1D+YQAsC4u9q/TS+TdyzQYLZGgGY5SBk8c8B5qX+0ZBPxPwHcwsArVk/VVfNByap9GjE/t/mSTPx0MmjeS+vAnepHmSUbSmeP79i+S78XTbkiRLaRg== 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=GhvG/Vx3k0JSTcH+MMJIdqCG0BgEIvoxTsnRxre/u7i8yo5xhYEwLVrBvGc0n80diYqOm7T35oFbOta/5sIauVKlOM/HTJRK21xjzjSbWcc1A0O/n9RKHQYbT2Ne2L5lhw4vDVzZDKV1414wTBS0fYRDNU/FfL7TSdq1jzPprEHs9qgWfb5HuCrOa8dBK2yOJ+uO0ilWVFPRAz9z7h2FsimgBxRBWx06g5dgSc6OAv580+Zct9XwHRDv54gIJHqzIgFN5RfVr56RmoHFho5S9hWuNNL6IuAXZzbUILxDskmfpVJVPDKtEVDV4/2N4Rk7ATeLKuZfxX3gdbp2NjdLcw== Received: from LV3P220MB1202.NAMP220.PROD.OUTLOOK.COM (2603:10b6:408:1ac::6) by PH7P220MB1063.NAMP220.PROD.OUTLOOK.COM (2603:10b6:510:31f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.36; Thu, 14 Mar 2024 15:37:28 +0000 Received: from LV3P220MB1202.NAMP220.PROD.OUTLOOK.COM ([fe80::57aa:102b:db4b:e05]) by LV3P220MB1202.NAMP220.PROD.OUTLOOK.COM ([fe80::57aa:102b:db4b:e05%7]) with mapi id 15.20.7386.017; Thu, 14 Mar 2024 15:37: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 5/5] ptp: clockmatrix: move register and firmware related definition to idt8a340_reg.h Date: Thu, 14 Mar 2024 11:37:07 -0400 Message-ID: X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240314153707.31551-1-lnimi@hotmail.com> References: <20240314153707.31551-1-lnimi@hotmail.com> X-TMN: [zR7w7SlwlIcwIccWUpxo2hdCd4RY8KDJ] X-ClientProxiedBy: YQBPR0101CA0208.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:67::31) To LV3P220MB1202.NAMP220.PROD.OUTLOOK.COM (2603:10b6:408:1ac::6) X-Microsoft-Original-Message-ID: <20240314153707.31551-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: LV3P220MB1202:EE_|PH7P220MB1063:EE_ X-MS-Office365-Filtering-Correlation-Id: 3137dff1-d5e1-4b43-4f09-08dc443ca7b4 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: g5in300KGKBDF+KAtE19nN9dWvcdsN4AVIc64xFhsDbJY/dY6Zn4GDELYsW4DYRf83L76oI5KYmvb9J6iWM7OXxIPHfO9iGewsBoEfxUL0VptGrWuJdoOCTJ+txbqHZveCgyZOZ4kpIWt7XGMT8SIh/rnEQXcz1CIjuMt04PZUaR1+Rw0LCwW7g69U/nwEwpbXyJcAIXqvSz91aDY2YoqBXDj21U2lw3HxOAMFtCHJMkG8rHbLue4xBx015Ec4FVzV/GOU77GkG/QTvRpUDhega+oJtCS/sd+NnamReRneYiaSeJQAaSoa8FnR+iEm67nTC+8tgOSNZxyXIwZO2isRHo9git/CZLHZ+6ShMYCmRNs/mBTnVeWx5lq0Kcn4eLqC5lraILUiOimMJqpSpOxdGU1Zwl1wbCLMpansCqkQWTUAySnvobgSe2nifQ8lprY+KKcTR3u7Pdum0QqRjoifysapsx31Z2G4uSIU5xmbYVMIiJ2H5/rvm8BfuL+ESKcGscEJBrsvdEBP+DbulBuYxRdEKSkXX7zObYFpoiZIyPwiYb2rTLk0SSJmND0H1A X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gXjcBsYnxdXIMzT6GQaJKveW1ksYNNWGcgWTWDaEECuhSTCQ9gh+v+Xa2fkObFFcU4Uu3hU98jPYc6nqloYqIYQa97KCGjKcHhCMmRNE+wtrLukEuaqPE7R6ZydLuBYodSahyUWGptxWz9/x7VcivAhS3CCeHjV8oo+sblTrkIWiE53x8FxLa/9W7yeNOk78ZV7cXerRqsmnlkxdE1lPKQFll2npwTIwWIJ8WLpGJOUyvdlwjCEkYMygBb9SIe6z4KLVGVx1Ch+iKBtP7dCoxqKqx3/UvtGQPl0QRLLipqsg2E+5cnSGAuh8KiTf/3QO/g6QsPJMsyCSn8kIQRx9ExKqEBXi7l5ik6bPf4ntOgm13hD3WveIEyb270rdgCXdWg/9yX1xzSFs/hXF58avjIx2uS+uuwB/tP3GXPLzlHcVwz0HhZcN6t6tD+oqwLAvMMiveMekIFzqE2kDI826BIwSHfDym6Za8QHBJULU3QpChryJS+sbbPH0JjQ5vn4sRawyhYe4k7PMjfPIAtO7B+zxD3Z1Ee7BE3bBnb8x4ZfPhOiI2h6Gw6Nm7Vs/uZBl5dB88NL5Hcy0v5PQxskdYbUlkC/MKp1vWadOxuzkb2hsfsn4mvAmB3MlloQkSbKDoO1TuXKoQor5mhnwLNaijZXDm7izKOkOgayYPoa4u8WdzvOnJDIr+35IzvtOc9ENGASImmnXLVdX80ajwjpShtEjwofAdJN65HBVcQjD+t18FdzmbwlvI0wMinAKUehyq3m34NKTVec5DNew9Kt9pn8Q/MgYK/HjNJoSKB48SemNaoBf12hcUBpxif8zBQgVsVFt/fJ/ZP6OVPblkXx8DKmHjQP10oyxBABHf0v2mqWctNCEYDW7MSdVmgC21rdnZ8sBPWABf77Og8BYiMPWnkqVrWFBkLsd78q2yfFlX2a7SI51uANtAZZTqBMkU8TVI8tymE0L3qg21u0JjC5gv+areHTHf67JD+lIW+SR8INSqfTeJCMuTgC7wY3iznUOBLVVX7R6zcsO2cxfKOifCCriVYeGdRic5TcahiWnIWe2ftdvFGGyjHbVuAVnFOwZfG++adH8eicIt4rtmn4HjKwu8Elqw0oTjGfsHXh5YRgxy+2/UkhR7WF5hG+wckP3tPFqd6byM/E4zzUNBwr+dQi4Ldnml0N7WATShlAFBajFeHd/6o3msTWk/RngmeaFqTEMRKm2TXHJqZFZX4kpUpD0s9+nIa0/7xwKexVIzts= X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-3458f.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 3137dff1-d5e1-4b43-4f09-08dc443ca7b4 X-MS-Exchange-CrossTenant-AuthSource: LV3P220MB1202.NAMP220.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Mar 2024 15:37:28.5181 (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: PH7P220MB1063 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