Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp2294609rwb; Thu, 8 Dec 2022 23:39:28 -0800 (PST) X-Google-Smtp-Source: AA0mqf5tdbqW7CNkZGO6DAQ7RUzlYopBvRKHRocAFGypb8GfheGzkEyez+/4x8UU36s3DmEeEK0D X-Received: by 2002:a05:6a20:7d8e:b0:aa:c734:1f26 with SMTP id v14-20020a056a207d8e00b000aac7341f26mr8135859pzj.32.1670571568060; Thu, 08 Dec 2022 23:39:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670571568; cv=none; d=google.com; s=arc-20160816; b=YU8CaLfAD6i3JGx5dZO3wfLUfqP/ohE/WpryS8fjzVnyq970Tu3OA4b+2DKy1Oixs5 Pht046onylvGzjMEUB/OrRXJ61CGIxkMGTJTshGTwnwU/RYLHxRYfSW2B7IY+ht/Tkw9 F2T4iujIpJCd2FTzfsLMVSwM6tK/xbRpBZ3ilgOirdLhIQDnJuWZl5XfLTyF561t27Bo qsVAChDYp3HzUu88I+V5wtPYBaAOMd14mgsvaZEABnsB3BSP30l7ANZmPu9n/UOpbQ5L ZLYimGf3Zb3XB9YJeD5L20lEJZ/Dw8HNq/EOzqwOJ13FpMhwaLCd+SLUEr3G+3qB5Udz 9FbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=9bk4ETCcdnmYA12HUh0bDlrY5WyD4xGQ68/GnELY+3c=; b=0l6s7HnikAb1Po0fakoXdBXdKwEkW6KAcDUdU7xq1a/GPBYiRAmwtccW2gvdTc1gAr TRM6H/arGuquCl8HzvmQE9y4IIJqI4T11qApquEVbQnbb+lLfkfFiIj4keLpcKYQzAh7 xLnEGSa87oSR8QPds1jDjYI3I3qqhTgtoFmI8gLA85YGzZRTIugSeE3TAYJDsclzv2Id LjyDJiH00XMclRz+7wQ1iHE4jjJQoxkZ1YYf1dB+RPRpL5yLvce7lUvlfQh406Vdgshv pedXyFbQF2ENYkPc9uejbibk/5J/aGuRhEFu+KC2Mam1nhblbstwrTV5BKB6lWZgHTgH m+Eg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microchip.com header.s=mchp header.b=S3RuFJLX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id om3-20020a17090b3a8300b00219c87a6928si1127531pjb.90.2022.12.08.23.39.18; Thu, 08 Dec 2022 23:39:28 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@microchip.com header.s=mchp header.b=S3RuFJLX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230214AbiLIH2F (ORCPT + 75 others); Fri, 9 Dec 2022 02:28:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60090 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230088AbiLIH1H (ORCPT ); Fri, 9 Dec 2022 02:27:07 -0500 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.153.233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE5E3396E1; Thu, 8 Dec 2022 23:26:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1670570807; x=1702106807; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=H2n3BIWokbfz9eW9lEz2aHI33YccGIKBzGQNLmYQhNc=; b=S3RuFJLXZdyzD6CuSfnkw3/+Eb4u5OXUD8U1K266Y6DdbvK1p4uZCJ3z /vNq7ETxkCckM3rVV+elf7xt0MTn0oL127da6MtNR1RG3+r2XZUZDOkd3 U3GbFJK8AuFq0xJI4nmS84s3bpEaRD2f0Un3cPp8KhjX1eJ1o8HkiHx0c vE6wyRyAN86wTSg0A9u6bwX2gHXuN7Nd82TXHer7T6vUXSPA1hkpv5gVJ hGKKFQqjSlDKwSsbm8bzKopYMr25p6+nDIl+S/CJR1Tg3vdtNufjsOCaw JnmRMLOmgE3yYzQhCxuGzmn+7b+1/k6Ja5eMpr/6FJloB02GndYKD+chy A==; X-IronPort-AV: E=Sophos;i="5.96,230,1665471600"; d="scan'208";a="192353268" Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa3.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 09 Dec 2022 00:26:47 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.12; Fri, 9 Dec 2022 00:26:46 -0700 Received: from CHE-LT-I17769U.microchip.com (10.10.115.15) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server id 15.1.2507.12 via Frontend Transport; Fri, 9 Dec 2022 00:26:41 -0700 From: Arun Ramadoss To: , CC: , , , , , , , , , , , , , Subject: [Patch net-next v3 11/13] net: dsa: microchip: ptp: add support for perout programmable pins Date: Fri, 9 Dec 2022 12:54:35 +0530 Message-ID: <20221209072437.18373-12-arun.ramadoss@microchip.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20221209072437.18373-1-arun.ramadoss@microchip.com> References: <20221209072437.18373-1-arun.ramadoss@microchip.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There are two programmable pins available for Trigger output unit to generate periodic pulses. This patch add verify_pin for the available 2 pins and configure it with respect to GPIO index for the TOU unit. Tested using testptp ./testptp -i 0 -L 0,2 ./testptp -i 0 -d /dev/ptp0 -p 1000000000 ./testptp -i 1 -L 1,2 ./testptp -i 1 -d /dev/ptp0 -p 100000000 Signed-off-by: Arun Ramadoss --- v1 - v2 - checkpatch warning to limit 80 chars Patch v1 - patch is new --- drivers/net/dsa/microchip/ksz_ptp.c | 35 +++++++++++++++++++++++++++++ drivers/net/dsa/microchip/ksz_ptp.h | 3 +++ 2 files changed, 38 insertions(+) diff --git a/drivers/net/dsa/microchip/ksz_ptp.c b/drivers/net/dsa/microchip/ksz_ptp.c index 6d7edc81909e..546211ae46a3 100644 --- a/drivers/net/dsa/microchip/ksz_ptp.c +++ b/drivers/net/dsa/microchip/ksz_ptp.c @@ -175,6 +175,10 @@ static int ksz_ptp_enable_perout(struct ksz_device *dev, ptp_data->tou_mode != KSZ_PTP_TOU_IDLE) return -EBUSY; + pin = ptp_find_pin(ptp_data->clock, PTP_PF_PEROUT, request->index); + if (pin < 0) + return -EINVAL; + data32 = FIELD_PREP(PTP_GPIO_INDEX, pin) | FIELD_PREP(PTP_TOU_INDEX, request->index); ret = ksz_rmw32(dev, REG_PTP_UNIT_INDEX__4, @@ -792,6 +796,23 @@ static int ksz_ptp_enable(struct ptp_clock_info *ptp, return ret; } +static int ksz_ptp_verify_pin(struct ptp_clock_info *ptp, unsigned int pin, + enum ptp_pin_function func, unsigned int chan) +{ + int ret = 0; + + switch (func) { + case PTP_PF_NONE: + case PTP_PF_PEROUT: + break; + default: + ret = -1; + break; + } + + return ret; +} + /* Function is pointer to the do_aux_work in the ptp_clock capability */ static long ksz_ptp_do_aux_work(struct ptp_clock_info *ptp) { @@ -827,6 +848,7 @@ int ksz_ptp_clock_register(struct dsa_switch *ds) struct ksz_device *dev = ds->priv; struct ksz_ptp_data *ptp_data; int ret; + u8 i; ptp_data = &dev->ptp_data; mutex_init(&ptp_data->lock); @@ -841,12 +863,25 @@ int ksz_ptp_clock_register(struct dsa_switch *ds) ptp_data->caps.adjtime = ksz_ptp_adjtime; ptp_data->caps.do_aux_work = ksz_ptp_do_aux_work; ptp_data->caps.enable = ksz_ptp_enable; + ptp_data->caps.verify = ksz_ptp_verify_pin; + ptp_data->caps.n_pins = KSZ_PTP_N_GPIO; ptp_data->caps.n_per_out = 3; ret = ksz_ptp_start_clock(dev); if (ret) return ret; + for (i = 0; i < KSZ_PTP_N_GPIO; i++) { + struct ptp_pin_desc *ptp_pin = &ptp_data->pin_config[i]; + + snprintf(ptp_pin->name, + sizeof(ptp_pin->name), "ksz_ptp_pin_%02d", i); + ptp_pin->index = i; + ptp_pin->func = PTP_PF_NONE; + } + + ptp_data->caps.pin_config = ptp_data->pin_config; + /* Currently only P2P mode is supported. When 802_1AS bit is set, it * forwards all PTP packets to host port and none to other ports. */ diff --git a/drivers/net/dsa/microchip/ksz_ptp.h b/drivers/net/dsa/microchip/ksz_ptp.h index 9451e3a76375..0ca8ca4f804e 100644 --- a/drivers/net/dsa/microchip/ksz_ptp.h +++ b/drivers/net/dsa/microchip/ksz_ptp.h @@ -12,6 +12,8 @@ #include +#define KSZ_PTP_N_GPIO 2 + enum ksz_ptp_tou_mode { KSZ_PTP_TOU_IDLE, KSZ_PTP_TOU_PEROUT, @@ -20,6 +22,7 @@ enum ksz_ptp_tou_mode { struct ksz_ptp_data { struct ptp_clock_info caps; struct ptp_clock *clock; + struct ptp_pin_desc pin_config[KSZ_PTP_N_GPIO]; /* Serializes all operations on the PTP hardware clock */ struct mutex lock; /* lock for accessing the clock_time */ -- 2.36.1