From 89772b03cb093b3556dd4803e5a8deee60046ac9 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Tue, 8 Aug 2017 10:53:25 -0700 Subject: gpu: nvgpu: Move XVE debugfs code to Linux module Move XVE debugfs initialization code to live under common/linux. JIRA NVGPU-62 Change-Id: Ic6677511d249bc0a2455dde01db5b230afc70bb1 Signed-off-by: Terje Bergstrom Reviewed-on: https://git-master.nvidia.com/r/1535133 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gp106/xve_gp106.h | 51 +------------------------------------ 1 file changed, 1 insertion(+), 50 deletions(-) (limited to 'drivers/gpu/nvgpu/gp106/xve_gp106.h') diff --git a/drivers/gpu/nvgpu/gp106/xve_gp106.h b/drivers/gpu/nvgpu/gp106/xve_gp106.h index 37ead910..55192fc8 100644 --- a/drivers/gpu/nvgpu/gp106/xve_gp106.h +++ b/drivers/gpu/nvgpu/gp106/xve_gp106.h @@ -28,55 +28,6 @@ int gp106_init_xve_ops(struct gpu_ops *gops); */ #define GPU_XVE_TIMEOUT_MS 500 -/* - * For the available speeds bitmap. - */ -#define GPU_XVE_SPEED_2P5 (1 << 0) -#define GPU_XVE_SPEED_5P0 (1 << 1) -#define GPU_XVE_SPEED_8P0 (1 << 2) -#define GPU_XVE_NR_SPEEDS 3 - -#define GPU_XVE_SPEED_MASK (GPU_XVE_SPEED_2P5 | \ - GPU_XVE_SPEED_5P0 | \ - GPU_XVE_SPEED_8P0) - -/* - * The HW uses a 2 bit field where speed is defined by a number: - * - * NV_XVE_LINK_CONTROL_STATUS_LINK_SPEED_2P5 = 1 - * NV_XVE_LINK_CONTROL_STATUS_LINK_SPEED_5P0 = 2 - * NV_XVE_LINK_CONTROL_STATUS_LINK_SPEED_8P0 = 3 - * - * This isn't ideal for a bitmap with available speeds. So the external - * APIs think about speeds as a bit in a bitmap and this function converts - * from those bits to the actual HW speed setting. - * - * @speed_bit must have only 1 bit set and must be one of the 3 available - * HW speeds. Not all chips support all speeds so use available_speeds() to - * determine what a given chip supports. - */ -static inline u32 xve_speed_to_hw_speed_setting(u32 speed_bit) -{ - if (!speed_bit || - !is_power_of_2(speed_bit) || - !(speed_bit & GPU_XVE_SPEED_MASK)) - return -EINVAL; - - return ilog2(speed_bit) + 1; -} - -static inline const char *xve_speed_to_str(u32 speed) -{ - if (!speed || !is_power_of_2(speed) || - !(speed & GPU_XVE_SPEED_MASK)) - return "Unknown ???"; - - return speed & GPU_XVE_SPEED_2P5 ? "Gen1" : - speed & GPU_XVE_SPEED_5P0 ? "Gen2" : - speed & GPU_XVE_SPEED_8P0 ? "Gen3" : - "Unknown ???"; -} - /* * Debugging for the speed change. */ @@ -104,7 +55,7 @@ int xve_get_speed_gp106(struct gk20a *g, u32 *xve_link_speed); void xve_disable_aspm_gp106(struct gk20a *g); int xve_set_speed_gp106(struct gk20a *g, u32 next_link_speed); void xve_available_speeds_gp106(struct gk20a *g, u32 *speed_mask); -int xve_sw_init_gp106(struct gk20a *g); +u32 xve_get_link_control_status(struct gk20a *g); #if defined(CONFIG_PCI_MSI) void xve_rearm_msi_gp106(struct gk20a *g); #endif -- cgit v1.2.2