[38/40] drm/amd/pm/swsmu/smu11/navi10_ppt: Remove unused 'struct i2c_algorithm navi10_i2c_algo'
diff mbox series

Message ID 20201124193824.1118741-39-lee.jones@linaro.org
State New, archived
Headers show
Series
  • Rid W=1 warnings from GPU
Related show

Commit Message

Lee Jones Nov. 24, 2020, 7:38 p.m. UTC
Fixes the following W=1 kernel build warning(s):

Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Evan Quan <evan.quan@amd.com>
Cc: amd-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c   | 204 ------------------
 1 file changed, 204 deletions(-)

Comments

Alex Deucher Nov. 30, 2020, 11:01 p.m. UTC | #1
On Tue, Nov 24, 2020 at 2:45 PM Lee Jones <lee.jones@linaro.org> wrote:
>
> Fixes the following W=1 kernel build warning(s):
>
> Cc: Alex Deucher <alexander.deucher@amd.com>
> Cc: "Christian König" <christian.koenig@amd.com>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: Evan Quan <evan.quan@amd.com>
> Cc: amd-gfx@lists.freedesktop.org
> Cc: dri-devel@lists.freedesktop.org
> Signed-off-by: Lee Jones <lee.jones@linaro.org>

Applied.  Thanks!

Alex

> ---
>  .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c   | 204 ------------------
>  1 file changed, 204 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
> index ef1a62e86a0ee..59bd7cd3ca8df 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
> +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
> @@ -2325,210 +2325,6 @@ static int navi10_run_umc_cdr_workaround(struct smu_context *smu)
>         return 0;
>  }
>
> -static void navi10_fill_i2c_req(SwI2cRequest_t  *req, bool write,
> -                                 uint8_t address, uint32_t numbytes,
> -                                 uint8_t *data)
> -{
> -       int i;
> -
> -       req->I2CcontrollerPort = 0;
> -       req->I2CSpeed = 2;
> -       req->SlaveAddress = address;
> -       req->NumCmds = numbytes;
> -
> -       for (i = 0; i < numbytes; i++) {
> -               SwI2cCmd_t *cmd =  &req->SwI2cCmds[i];
> -
> -               /* First 2 bytes are always write for lower 2b EEPROM address */
> -               if (i < 2)
> -                       cmd->Cmd = 1;
> -               else
> -                       cmd->Cmd = write;
> -
> -
> -               /* Add RESTART for read  after address filled */
> -               cmd->CmdConfig |= (i == 2 && !write) ? CMDCONFIG_RESTART_MASK : 0;
> -
> -               /* Add STOP in the end */
> -               cmd->CmdConfig |= (i == (numbytes - 1)) ? CMDCONFIG_STOP_MASK : 0;
> -
> -               /* Fill with data regardless if read or write to simplify code */
> -               cmd->RegisterAddr = data[i];
> -       }
> -}
> -
> -static int navi10_i2c_read_data(struct i2c_adapter *control,
> -                                              uint8_t address,
> -                                              uint8_t *data,
> -                                              uint32_t numbytes)
> -{
> -       uint32_t  i, ret = 0;
> -       SwI2cRequest_t req;
> -       struct amdgpu_device *adev = to_amdgpu_device(control);
> -       struct smu_table_context *smu_table = &adev->smu.smu_table;
> -       struct smu_table *table = &smu_table->driver_table;
> -
> -       if (numbytes > MAX_SW_I2C_COMMANDS) {
> -               dev_err(adev->dev, "numbytes requested %d is over max allowed %d\n",
> -                       numbytes, MAX_SW_I2C_COMMANDS);
> -               return -EINVAL;
> -       }
> -
> -       memset(&req, 0, sizeof(req));
> -       navi10_fill_i2c_req(&req, false, address, numbytes, data);
> -
> -       mutex_lock(&adev->smu.mutex);
> -       /* Now read data starting with that address */
> -       ret = smu_cmn_update_table(&adev->smu, SMU_TABLE_I2C_COMMANDS, 0, &req,
> -                                  true);
> -       mutex_unlock(&adev->smu.mutex);
> -
> -       if (!ret) {
> -               SwI2cRequest_t *res = (SwI2cRequest_t *)table->cpu_addr;
> -
> -               /* Assume SMU  fills res.SwI2cCmds[i].Data with read bytes */
> -               for (i = 0; i < numbytes; i++)
> -                       data[i] = res->SwI2cCmds[i].Data;
> -
> -               dev_dbg(adev->dev, "navi10_i2c_read_data, address = %x, bytes = %d, data :",
> -                                 (uint16_t)address, numbytes);
> -
> -               print_hex_dump(KERN_DEBUG, "data: ", DUMP_PREFIX_NONE,
> -                              8, 1, data, numbytes, false);
> -       } else
> -               dev_err(adev->dev, "navi10_i2c_read_data - error occurred :%x", ret);
> -
> -       return ret;
> -}
> -
> -static int navi10_i2c_write_data(struct i2c_adapter *control,
> -                                               uint8_t address,
> -                                               uint8_t *data,
> -                                               uint32_t numbytes)
> -{
> -       uint32_t ret;
> -       SwI2cRequest_t req;
> -       struct amdgpu_device *adev = to_amdgpu_device(control);
> -
> -       if (numbytes > MAX_SW_I2C_COMMANDS) {
> -               dev_err(adev->dev, "numbytes requested %d is over max allowed %d\n",
> -                       numbytes, MAX_SW_I2C_COMMANDS);
> -               return -EINVAL;
> -       }
> -
> -       memset(&req, 0, sizeof(req));
> -       navi10_fill_i2c_req(&req, true, address, numbytes, data);
> -
> -       mutex_lock(&adev->smu.mutex);
> -       ret = smu_cmn_update_table(&adev->smu, SMU_TABLE_I2C_COMMANDS, 0, &req, true);
> -       mutex_unlock(&adev->smu.mutex);
> -
> -       if (!ret) {
> -               dev_dbg(adev->dev, "navi10_i2c_write(), address = %x, bytes = %d , data: ",
> -                                        (uint16_t)address, numbytes);
> -
> -               print_hex_dump(KERN_DEBUG, "data: ", DUMP_PREFIX_NONE,
> -                              8, 1, data, numbytes, false);
> -               /*
> -                * According to EEPROM spec there is a MAX of 10 ms required for
> -                * EEPROM to flush internal RX buffer after STOP was issued at the
> -                * end of write transaction. During this time the EEPROM will not be
> -                * responsive to any more commands - so wait a bit more.
> -                */
> -               msleep(10);
> -
> -       } else
> -               dev_err(adev->dev, "navi10_i2c_write- error occurred :%x", ret);
> -
> -       return ret;
> -}
> -
> -static int navi10_i2c_xfer(struct i2c_adapter *i2c_adap,
> -                             struct i2c_msg *msgs, int num)
> -{
> -       uint32_t  i, j, ret, data_size, data_chunk_size, next_eeprom_addr = 0;
> -       uint8_t *data_ptr, data_chunk[MAX_SW_I2C_COMMANDS] = { 0 };
> -
> -       for (i = 0; i < num; i++) {
> -               /*
> -                * SMU interface allows at most MAX_SW_I2C_COMMANDS bytes of data at
> -                * once and hence the data needs to be spliced into chunks and sent each
> -                * chunk separately
> -                */
> -               data_size = msgs[i].len - 2;
> -               data_chunk_size = MAX_SW_I2C_COMMANDS - 2;
> -               next_eeprom_addr = (msgs[i].buf[0] << 8 & 0xff00) | (msgs[i].buf[1] & 0xff);
> -               data_ptr = msgs[i].buf + 2;
> -
> -               for (j = 0; j < data_size / data_chunk_size; j++) {
> -                       /* Insert the EEPROM dest addess, bits 0-15 */
> -                       data_chunk[0] = ((next_eeprom_addr >> 8) & 0xff);
> -                       data_chunk[1] = (next_eeprom_addr & 0xff);
> -
> -                       if (msgs[i].flags & I2C_M_RD) {
> -                               ret = navi10_i2c_read_data(i2c_adap,
> -                                                            (uint8_t)msgs[i].addr,
> -                                                            data_chunk, MAX_SW_I2C_COMMANDS);
> -
> -                               memcpy(data_ptr, data_chunk + 2, data_chunk_size);
> -                       } else {
> -
> -                               memcpy(data_chunk + 2, data_ptr, data_chunk_size);
> -
> -                               ret = navi10_i2c_write_data(i2c_adap,
> -                                                             (uint8_t)msgs[i].addr,
> -                                                             data_chunk, MAX_SW_I2C_COMMANDS);
> -                       }
> -
> -                       if (ret) {
> -                               num = -EIO;
> -                               goto fail;
> -                       }
> -
> -                       next_eeprom_addr += data_chunk_size;
> -                       data_ptr += data_chunk_size;
> -               }
> -
> -               if (data_size % data_chunk_size) {
> -                       data_chunk[0] = ((next_eeprom_addr >> 8) & 0xff);
> -                       data_chunk[1] = (next_eeprom_addr & 0xff);
> -
> -                       if (msgs[i].flags & I2C_M_RD) {
> -                               ret = navi10_i2c_read_data(i2c_adap,
> -                                                            (uint8_t)msgs[i].addr,
> -                                                            data_chunk, (data_size % data_chunk_size) + 2);
> -
> -                               memcpy(data_ptr, data_chunk + 2, data_size % data_chunk_size);
> -                       } else {
> -                               memcpy(data_chunk + 2, data_ptr, data_size % data_chunk_size);
> -
> -                               ret = navi10_i2c_write_data(i2c_adap,
> -                                                             (uint8_t)msgs[i].addr,
> -                                                             data_chunk, (data_size % data_chunk_size) + 2);
> -                       }
> -
> -                       if (ret) {
> -                               num = -EIO;
> -                               goto fail;
> -                       }
> -               }
> -       }
> -
> -fail:
> -       return num;
> -}
> -
> -static u32 navi10_i2c_func(struct i2c_adapter *adap)
> -{
> -       return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
> -}
> -
> -
> -static const struct i2c_algorithm navi10_i2c_algo = {
> -       .master_xfer = navi10_i2c_xfer,
> -       .functionality = navi10_i2c_func,
> -};
> -
>  static ssize_t navi10_get_gpu_metrics(struct smu_context *smu,
>                                       void **table)
>  {
> --
> 2.25.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

Patch
diff mbox series

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
index ef1a62e86a0ee..59bd7cd3ca8df 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
@@ -2325,210 +2325,6 @@  static int navi10_run_umc_cdr_workaround(struct smu_context *smu)
 	return 0;
 }
 
-static void navi10_fill_i2c_req(SwI2cRequest_t  *req, bool write,
-				  uint8_t address, uint32_t numbytes,
-				  uint8_t *data)
-{
-	int i;
-
-	req->I2CcontrollerPort = 0;
-	req->I2CSpeed = 2;
-	req->SlaveAddress = address;
-	req->NumCmds = numbytes;
-
-	for (i = 0; i < numbytes; i++) {
-		SwI2cCmd_t *cmd =  &req->SwI2cCmds[i];
-
-		/* First 2 bytes are always write for lower 2b EEPROM address */
-		if (i < 2)
-			cmd->Cmd = 1;
-		else
-			cmd->Cmd = write;
-
-
-		/* Add RESTART for read  after address filled */
-		cmd->CmdConfig |= (i == 2 && !write) ? CMDCONFIG_RESTART_MASK : 0;
-
-		/* Add STOP in the end */
-		cmd->CmdConfig |= (i == (numbytes - 1)) ? CMDCONFIG_STOP_MASK : 0;
-
-		/* Fill with data regardless if read or write to simplify code */
-		cmd->RegisterAddr = data[i];
-	}
-}
-
-static int navi10_i2c_read_data(struct i2c_adapter *control,
-					       uint8_t address,
-					       uint8_t *data,
-					       uint32_t numbytes)
-{
-	uint32_t  i, ret = 0;
-	SwI2cRequest_t req;
-	struct amdgpu_device *adev = to_amdgpu_device(control);
-	struct smu_table_context *smu_table = &adev->smu.smu_table;
-	struct smu_table *table = &smu_table->driver_table;
-
-	if (numbytes > MAX_SW_I2C_COMMANDS) {
-		dev_err(adev->dev, "numbytes requested %d is over max allowed %d\n",
-			numbytes, MAX_SW_I2C_COMMANDS);
-		return -EINVAL;
-	}
-
-	memset(&req, 0, sizeof(req));
-	navi10_fill_i2c_req(&req, false, address, numbytes, data);
-
-	mutex_lock(&adev->smu.mutex);
-	/* Now read data starting with that address */
-	ret = smu_cmn_update_table(&adev->smu, SMU_TABLE_I2C_COMMANDS, 0, &req,
-				   true);
-	mutex_unlock(&adev->smu.mutex);
-
-	if (!ret) {
-		SwI2cRequest_t *res = (SwI2cRequest_t *)table->cpu_addr;
-
-		/* Assume SMU  fills res.SwI2cCmds[i].Data with read bytes */
-		for (i = 0; i < numbytes; i++)
-			data[i] = res->SwI2cCmds[i].Data;
-
-		dev_dbg(adev->dev, "navi10_i2c_read_data, address = %x, bytes = %d, data :",
-				  (uint16_t)address, numbytes);
-
-		print_hex_dump(KERN_DEBUG, "data: ", DUMP_PREFIX_NONE,
-			       8, 1, data, numbytes, false);
-	} else
-		dev_err(adev->dev, "navi10_i2c_read_data - error occurred :%x", ret);
-
-	return ret;
-}
-
-static int navi10_i2c_write_data(struct i2c_adapter *control,
-						uint8_t address,
-						uint8_t *data,
-						uint32_t numbytes)
-{
-	uint32_t ret;
-	SwI2cRequest_t req;
-	struct amdgpu_device *adev = to_amdgpu_device(control);
-
-	if (numbytes > MAX_SW_I2C_COMMANDS) {
-		dev_err(adev->dev, "numbytes requested %d is over max allowed %d\n",
-			numbytes, MAX_SW_I2C_COMMANDS);
-		return -EINVAL;
-	}
-
-	memset(&req, 0, sizeof(req));
-	navi10_fill_i2c_req(&req, true, address, numbytes, data);
-
-	mutex_lock(&adev->smu.mutex);
-	ret = smu_cmn_update_table(&adev->smu, SMU_TABLE_I2C_COMMANDS, 0, &req, true);
-	mutex_unlock(&adev->smu.mutex);
-
-	if (!ret) {
-		dev_dbg(adev->dev, "navi10_i2c_write(), address = %x, bytes = %d , data: ",
-					 (uint16_t)address, numbytes);
-
-		print_hex_dump(KERN_DEBUG, "data: ", DUMP_PREFIX_NONE,
-			       8, 1, data, numbytes, false);
-		/*
-		 * According to EEPROM spec there is a MAX of 10 ms required for
-		 * EEPROM to flush internal RX buffer after STOP was issued at the
-		 * end of write transaction. During this time the EEPROM will not be
-		 * responsive to any more commands - so wait a bit more.
-		 */
-		msleep(10);
-
-	} else
-		dev_err(adev->dev, "navi10_i2c_write- error occurred :%x", ret);
-
-	return ret;
-}
-
-static int navi10_i2c_xfer(struct i2c_adapter *i2c_adap,
-			      struct i2c_msg *msgs, int num)
-{
-	uint32_t  i, j, ret, data_size, data_chunk_size, next_eeprom_addr = 0;
-	uint8_t *data_ptr, data_chunk[MAX_SW_I2C_COMMANDS] = { 0 };
-
-	for (i = 0; i < num; i++) {
-		/*
-		 * SMU interface allows at most MAX_SW_I2C_COMMANDS bytes of data at
-		 * once and hence the data needs to be spliced into chunks and sent each
-		 * chunk separately
-		 */
-		data_size = msgs[i].len - 2;
-		data_chunk_size = MAX_SW_I2C_COMMANDS - 2;
-		next_eeprom_addr = (msgs[i].buf[0] << 8 & 0xff00) | (msgs[i].buf[1] & 0xff);
-		data_ptr = msgs[i].buf + 2;
-
-		for (j = 0; j < data_size / data_chunk_size; j++) {
-			/* Insert the EEPROM dest addess, bits 0-15 */
-			data_chunk[0] = ((next_eeprom_addr >> 8) & 0xff);
-			data_chunk[1] = (next_eeprom_addr & 0xff);
-
-			if (msgs[i].flags & I2C_M_RD) {
-				ret = navi10_i2c_read_data(i2c_adap,
-							     (uint8_t)msgs[i].addr,
-							     data_chunk, MAX_SW_I2C_COMMANDS);
-
-				memcpy(data_ptr, data_chunk + 2, data_chunk_size);
-			} else {
-
-				memcpy(data_chunk + 2, data_ptr, data_chunk_size);
-
-				ret = navi10_i2c_write_data(i2c_adap,
-							      (uint8_t)msgs[i].addr,
-							      data_chunk, MAX_SW_I2C_COMMANDS);
-			}
-
-			if (ret) {
-				num = -EIO;
-				goto fail;
-			}
-
-			next_eeprom_addr += data_chunk_size;
-			data_ptr += data_chunk_size;
-		}
-
-		if (data_size % data_chunk_size) {
-			data_chunk[0] = ((next_eeprom_addr >> 8) & 0xff);
-			data_chunk[1] = (next_eeprom_addr & 0xff);
-
-			if (msgs[i].flags & I2C_M_RD) {
-				ret = navi10_i2c_read_data(i2c_adap,
-							     (uint8_t)msgs[i].addr,
-							     data_chunk, (data_size % data_chunk_size) + 2);
-
-				memcpy(data_ptr, data_chunk + 2, data_size % data_chunk_size);
-			} else {
-				memcpy(data_chunk + 2, data_ptr, data_size % data_chunk_size);
-
-				ret = navi10_i2c_write_data(i2c_adap,
-							      (uint8_t)msgs[i].addr,
-							      data_chunk, (data_size % data_chunk_size) + 2);
-			}
-
-			if (ret) {
-				num = -EIO;
-				goto fail;
-			}
-		}
-	}
-
-fail:
-	return num;
-}
-
-static u32 navi10_i2c_func(struct i2c_adapter *adap)
-{
-	return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
-}
-
-
-static const struct i2c_algorithm navi10_i2c_algo = {
-	.master_xfer = navi10_i2c_xfer,
-	.functionality = navi10_i2c_func,
-};
-
 static ssize_t navi10_get_gpu_metrics(struct smu_context *smu,
 				      void **table)
 {