From 977a5d5d32f4797ace5ef65ee3f2232a1c88a274 Mon Sep 17 00:00:00 2001 From: Laurence Evans Date: Thu, 7 Mar 2013 11:46:58 +0000 Subject: sfc: Add a function pointer to abstract write of host time into NIC shared memory Signed-off-by: Ben Hutchings --- drivers/net/ethernet/sfc/net_driver.h | 1 + drivers/net/ethernet/sfc/ptp.c | 3 +-- drivers/net/ethernet/sfc/siena.c | 14 ++++++++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) (limited to 'drivers') diff --git a/drivers/net/ethernet/sfc/net_driver.h b/drivers/net/ethernet/sfc/net_driver.h index d33656bc4060..21b1c2a2a191 100644 --- a/drivers/net/ethernet/sfc/net_driver.h +++ b/drivers/net/ethernet/sfc/net_driver.h @@ -1117,6 +1117,7 @@ struct efx_nic_type { size_t *retlen, const u8 *buffer); int (*mtd_sync)(struct mtd_info *mtd); #endif + void (*ptp_write_host_time)(struct efx_nic *efx, u32 host_time); int revision; unsigned int txd_ptr_tbl_base; diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c index 4de2f8febd59..c60cabb6ff05 100644 --- a/drivers/net/ethernet/sfc/ptp.c +++ b/drivers/net/ethernet/sfc/ptp.c @@ -390,8 +390,7 @@ static void efx_ptp_send_times(struct efx_nic *efx, host_time = (now.ts_real.tv_sec << MC_NANOSECOND_BITS | now.ts_real.tv_nsec); /* Update host time in NIC memory */ - _efx_writed(efx, cpu_to_le32(host_time), - FR_CZ_MC_TREG_SMEM + MC_SMEM_P0_PTP_TIME_OFST); + efx->type->ptp_write_host_time(efx, host_time); } *last_time = now; } diff --git a/drivers/net/ethernet/sfc/siena.c b/drivers/net/ethernet/sfc/siena.c index a51d90c4c6cf..3c0a54400260 100644 --- a/drivers/net/ethernet/sfc/siena.c +++ b/drivers/net/ethernet/sfc/siena.c @@ -853,6 +853,19 @@ fail: #endif /* CONFIG_SFC_MTD */ +/************************************************************************** + * + * PTP + * + ************************************************************************** + */ + +static void siena_ptp_write_host_time(struct efx_nic *efx, u32 host_time) +{ + _efx_writed(efx, cpu_to_le32(host_time), + FR_CZ_MC_TREG_SMEM + MC_SMEM_P0_PTP_TIME_OFST); +} + /************************************************************************** * * Revision-dependent attributes used by efx.c and nic.c @@ -943,6 +956,7 @@ const struct efx_nic_type siena_a0_nic_type = { .mtd_write = efx_mcdi_mtd_write, .mtd_sync = efx_mcdi_mtd_sync, #endif + .ptp_write_host_time = siena_ptp_write_host_time, .revision = EFX_REV_SIENA_A0, .txd_ptr_tbl_base = FR_BZ_TX_DESC_PTR_TBL, -- cgit v1.2.3-59-g8ed1b