Skip to content

Commit

Permalink
ptp_ocp: implement DPLL ops
Browse files Browse the repository at this point in the history 
Implement DPLL operations in ptp_ocp driver.

Signed-off-by: Vadim Fedorenko <vadfed@fb.com>
  • Loading branch information
@vvfedorenko @intel-lab-lkp
vvfedorenko authored and intel-lab-lkp committed Oct 10, 2022
1 parent bdf2352 commit b2144aa
Show file tree
Hide file tree
Showing 3 changed files with 137 additions and 36 deletions.
1 change: 1 addition & 0 deletions drivers/ptp/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ config PTP_1588_CLOCK_OCP
depends on COMMON_CLK
select NET_DEVLINK
select CRC16
select DPLL
help
This driver adds support for an OpenCompute time card.

Expand Down
170 changes: 134 additions & 36 deletions drivers/ptp/ptp_ocp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
#include <linux/mtd/mtd.h>
#include <linux/nvmem-consumer.h>
#include <linux/crc16.h>
#include <linux/dpll.h>
#include <uapi/linux/dpll.h>

#define PCI_VENDOR_ID_FACEBOOK 0x1d9b
#define PCI_DEVICE_ID_FACEBOOK_TIMECARD 0x0400
Expand Down Expand Up @@ -336,6 +338,7 @@ struct ptp_ocp {
struct ptp_ocp_signal signal[4];
struct ptp_ocp_sma_connector sma[4];
const struct ocp_sma_op *sma_op;
struct dpll_device *dpll;
};

#define OCP_REQ_TIMESTAMP BIT(0)
Expand Down Expand Up @@ -660,18 +663,19 @@ static DEFINE_IDR(ptp_ocp_idr);
struct ocp_selector {
const char *name;
int value;
int dpll_type;
};

static const struct ocp_selector ptp_ocp_clock[] = {
{ .name = "NONE", .value = 0 },
{ .name = "TOD", .value = 1 },
{ .name = "IRIG", .value = 2 },
{ .name = "PPS", .value = 3 },
{ .name = "PTP", .value = 4 },
{ .name = "RTC", .value = 5 },
{ .name = "DCF", .value = 6 },
{ .name = "REGS", .value = 0xfe },
{ .name = "EXT", .value = 0xff },
{ .name = "NONE", .value = 0, .dpll_type = 0 },
{ .name = "TOD", .value = 1, .dpll_type = 0 },
{ .name = "IRIG", .value = 2, .dpll_type = 0 },
{ .name = "PPS", .value = 3, .dpll_type = 0 },
{ .name = "PTP", .value = 4, .dpll_type = 0 },
{ .name = "RTC", .value = 5, .dpll_type = 0 },
{ .name = "DCF", .value = 6, .dpll_type = 0 },
{ .name = "REGS", .value = 0xfe, .dpll_type = 0 },
{ .name = "EXT", .value = 0xff, .dpll_type = 0 },
{ }
};

Expand All @@ -680,37 +684,37 @@ static const struct ocp_selector ptp_ocp_clock[] = {
#define SMA_SELECT_MASK GENMASK(14, 0)

static const struct ocp_selector ptp_ocp_sma_in[] = {
{ .name = "10Mhz", .value = 0x0000 },
{ .name = "PPS1", .value = 0x0001 },
{ .name = "PPS2", .value = 0x0002 },
{ .name = "TS1", .value = 0x0004 },
{ .name = "TS2", .value = 0x0008 },
{ .name = "IRIG", .value = 0x0010 },
{ .name = "DCF", .value = 0x0020 },
{ .name = "TS3", .value = 0x0040 },
{ .name = "TS4", .value = 0x0080 },
{ .name = "FREQ1", .value = 0x0100 },
{ .name = "FREQ2", .value = 0x0200 },
{ .name = "FREQ3", .value = 0x0400 },
{ .name = "FREQ4", .value = 0x0800 },
{ .name = "None", .value = SMA_DISABLE },
{ .name = "10Mhz", .value = 0x0000, .dpll_type = DPLL_TYPE_EXT_10MHZ },
{ .name = "PPS1", .value = 0x0001, .dpll_type = DPLL_TYPE_EXT_1PPS },
{ .name = "PPS2", .value = 0x0002, .dpll_type = DPLL_TYPE_EXT_1PPS },
{ .name = "TS1", .value = 0x0004, .dpll_type = DPLL_TYPE_CUSTOM },
{ .name = "TS2", .value = 0x0008, .dpll_type = DPLL_TYPE_CUSTOM },
{ .name = "IRIG", .value = 0x0010, .dpll_type = DPLL_TYPE_CUSTOM },
{ .name = "DCF", .value = 0x0020, .dpll_type = DPLL_TYPE_CUSTOM },
{ .name = "TS3", .value = 0x0040, .dpll_type = DPLL_TYPE_CUSTOM },
{ .name = "TS4", .value = 0x0080, .dpll_type = DPLL_TYPE_CUSTOM },
{ .name = "FREQ1", .value = 0x0100, .dpll_type = DPLL_TYPE_CUSTOM },
{ .name = "FREQ2", .value = 0x0200, .dpll_type = DPLL_TYPE_CUSTOM },
{ .name = "FREQ3", .value = 0x0400, .dpll_type = DPLL_TYPE_CUSTOM },
{ .name = "FREQ4", .value = 0x0800, .dpll_type = DPLL_TYPE_CUSTOM },
{ .name = "None", .value = SMA_DISABLE, .dpll_type = DPLL_TYPE_NONE },
{ }
};

static const struct ocp_selector ptp_ocp_sma_out[] = {
{ .name = "10Mhz", .value = 0x0000 },
{ .name = "PHC", .value = 0x0001 },
{ .name = "MAC", .value = 0x0002 },
{ .name = "GNSS1", .value = 0x0004 },
{ .name = "GNSS2", .value = 0x0008 },
{ .name = "IRIG", .value = 0x0010 },
{ .name = "DCF", .value = 0x0020 },
{ .name = "GEN1", .value = 0x0040 },
{ .name = "GEN2", .value = 0x0080 },
{ .name = "GEN3", .value = 0x0100 },
{ .name = "GEN4", .value = 0x0200 },
{ .name = "GND", .value = 0x2000 },
{ .name = "VCC", .value = 0x4000 },
{ .name = "10Mhz", .value = 0x0000, .dpll_type = DPLL_TYPE_EXT_10MHZ },
{ .name = "PHC", .value = 0x0001, .dpll_type = DPLL_TYPE_INT_OSCILLATOR },
{ .name = "MAC", .value = 0x0002, .dpll_type = DPLL_TYPE_INT_OSCILLATOR },
{ .name = "GNSS1", .value = 0x0004, .dpll_type = DPLL_TYPE_GNSS },
{ .name = "GNSS2", .value = 0x0008, .dpll_type = DPLL_TYPE_GNSS },
{ .name = "IRIG", .value = 0x0010, .dpll_type = DPLL_TYPE_CUSTOM },
{ .name = "DCF", .value = 0x0020, .dpll_type = DPLL_TYPE_CUSTOM },
{ .name = "GEN1", .value = 0x0040, .dpll_type = DPLL_TYPE_CUSTOM },
{ .name = "GEN2", .value = 0x0080, .dpll_type = DPLL_TYPE_CUSTOM },
{ .name = "GEN3", .value = 0x0100, .dpll_type = DPLL_TYPE_CUSTOM },
{ .name = "GEN4", .value = 0x0200, .dpll_type = DPLL_TYPE_CUSTOM },
{ .name = "GND", .value = 0x2000, .dpll_type = DPLL_TYPE_CUSTOM },
{ .name = "VCC", .value = 0x4000, .dpll_type = DPLL_TYPE_CUSTOM },
{ }
};

Expand Down Expand Up @@ -3707,6 +3711,90 @@ ptp_ocp_detach(struct ptp_ocp *bp)
device_unregister(&bp->dev);
}

static int ptp_ocp_dpll_get_status(struct dpll_device *dpll)
{
struct ptp_ocp *bp = (struct ptp_ocp *)dpll_priv(dpll);
int sync;

sync = ioread32(&bp->reg->status) & OCP_STATUS_IN_SYNC;
return sync;
}

static int ptp_ocp_dpll_get_lock_status(struct dpll_device *dpll)
{
struct ptp_ocp *bp = (struct ptp_ocp *)dpll_priv(dpll);
int sync;

sync = ioread32(&bp->reg->status) & OCP_STATUS_IN_SYNC;
return sync;
}

static int ptp_ocp_sma_get_dpll_type(struct ptp_ocp *bp, int sma_nr)
{
const struct ocp_selector *tbl;
u32 val;

if (bp->sma[sma_nr].mode == SMA_MODE_IN)
tbl = bp->sma_op->tbl[0];
else
tbl = bp->sma_op->tbl[1];

val = ptp_ocp_sma_get(bp, sma_nr);
return tbl[val].dpll_type;
}

static int ptp_ocp_dpll_type_supported(struct dpll_device *dpll, int sma, int type, int dir)
{
struct ptp_ocp *bp = (struct ptp_ocp *)dpll_priv(dpll);
const struct ocp_selector *tbl = bp->sma_op->tbl[dir];
int i;

for (i = 0; i < sizeof(*tbl); i++) {
if (tbl[i].dpll_type == type)
return 1;
}
return 0;
}

static int ptp_ocp_dpll_get_source_type(struct dpll_device *dpll, int sma)
{
struct ptp_ocp *bp = (struct ptp_ocp *)dpll_priv(dpll);

if (bp->sma[sma].mode != SMA_MODE_IN)
return -1;

return ptp_ocp_sma_get_dpll_type(bp, sma);
}

static int ptp_ocp_dpll_get_source_supported(struct dpll_device *dpll, int sma, int type)
{
return ptp_ocp_dpll_type_supported(dpll, sma, type, 0);
}

static int ptp_ocp_dpll_get_output_type(struct dpll_device *dpll, int sma)
{
struct ptp_ocp *bp = (struct ptp_ocp *)dpll_priv(dpll);

if (bp->sma[sma].mode != SMA_MODE_OUT)
return -1;

return ptp_ocp_sma_get_dpll_type(bp, sma);
}

static int ptp_ocp_dpll_get_output_supported(struct dpll_device *dpll, int sma, int type)
{
return ptp_ocp_dpll_type_supported(dpll, sma, type, 1);
}

static struct dpll_device_ops dpll_ops = {
.get_status = ptp_ocp_dpll_get_status,
.get_lock_status = ptp_ocp_dpll_get_lock_status,
.get_source_type = ptp_ocp_dpll_get_source_type,
.get_source_supported = ptp_ocp_dpll_get_source_supported,
.get_output_type = ptp_ocp_dpll_get_output_type,
.get_output_supported = ptp_ocp_dpll_get_output_supported,
};

static int
ptp_ocp_probe(struct pci_dev *pdev, const struct pci_device_id *id)
{
Expand Down Expand Up @@ -3762,6 +3850,14 @@ ptp_ocp_probe(struct pci_dev *pdev, const struct pci_device_id *id)

ptp_ocp_info(bp);
devlink_register(devlink);

bp->dpll = dpll_device_alloc(&dpll_ops, "ocp", ARRAY_SIZE(bp->sma), ARRAY_SIZE(bp->sma), bp);
if (!bp->dpll) {
dev_err(&pdev->dev, "dpll_device_alloc failed\n");
return 0;
}
dpll_device_register(bp->dpll);

return 0;

out:
Expand All @@ -3779,6 +3875,8 @@ ptp_ocp_remove(struct pci_dev *pdev)
struct ptp_ocp *bp = pci_get_drvdata(pdev);
struct devlink *devlink = priv_to_devlink(bp);

dpll_device_unregister(bp->dpll);
dpll_device_free(bp->dpll);
devlink_unregister(devlink);
ptp_ocp_detach(bp);
pci_disable_device(pdev);
Expand Down
2 changes: 2 additions & 0 deletions include/uapi/linux/dpll.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,13 @@ enum dpll_genl_status {

/* DPLL signal types used as source or as output */
enum dpll_genl_signal_type {
DPLL_TYPE_NONE,
DPLL_TYPE_EXT_1PPS,
DPLL_TYPE_EXT_10MHZ,
DPLL_TYPE_SYNCE_ETH_PORT,
DPLL_TYPE_INT_OSCILLATOR,
DPLL_TYPE_GNSS,
DPLL_TYPE_CUSTOM,

__DPLL_TYPE_MAX,
};
Expand Down

0 comments on commit b2144aa

Please sign in to comment.