[PATCH 31/40] drm/amdgpu: Fix width of I2C address

[Alex Deucher]

On Tue, Jun 8, 2021 at 5:41 PM Luben Tuikov <luben.tuikov at amd.com> wrote:
>
> The I2C address is kept as a 16-bit quantity in
> the kernel. The I2C_TAR::I2C_TAR field is 10-bit
> wide.
>
> Fix the width of the I2C address for Vega20 from 8
> bits to 16 bits to accommodate the full spectrum
> of I2C address space.
>
> Cc: Jean Delvare <jdelvare at suse.de>
> Cc: Alexander Deucher <Alexander.Deucher at amd.com>
> Cc: Andrey Grodzovsky <Andrey.Grodzovsky at amd.com>
> Cc: Lijo Lazar <Lijo.Lazar at amd.com>
> Cc: Stanley Yang <Stanley.Yang at amd.com>
> Cc: Hawking Zhang <Hawking.Zhang at amd.com>
> Signed-off-by: Luben Tuikov <luben.tuikov at amd.com>

Acked-by: Alex Deucher <alexander.deucher at amd.com>

> ---
>  drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c | 19 +++++++++++--------
>  1 file changed, 11 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c b/drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c
> index e403ba556e5590..65035256756679 100644
> --- a/drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c
> +++ b/drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c
> @@ -111,12 +111,15 @@ static void smu_v11_0_i2c_set_clock(struct i2c_adapter *control)
>         WREG32_SOC15(SMUIO, 0, mmCKSVII2C_IC_SDA_HOLD, 20);
>  }
>
> -static void smu_v11_0_i2c_set_address(struct i2c_adapter *control, uint8_t address)
> +static void smu_v11_0_i2c_set_address(struct i2c_adapter *control, u16 address)
>  {
>         struct amdgpu_device *adev = to_amdgpu_device(control);
>
> -       /* We take 7-bit addresses raw */
> -       WREG32_SOC15(SMUIO, 0, mmCKSVII2C_IC_TAR, (address & 0xFF));
> +       /* The IC_TAR::IC_TAR field is 10-bits wide.
> +        * It takes a 7-bit or 10-bit addresses as an address,
> +        * i.e. no read/write bit--no wire format, just the address.
> +        */
> +       WREG32_SOC15(SMUIO, 0, mmCKSVII2C_IC_TAR, address & 0x3FF);
>  }
>
>  static uint32_t smu_v11_0_i2c_poll_tx_status(struct i2c_adapter *control)
> @@ -215,8 +218,8 @@ static uint32_t smu_v11_0_i2c_poll_rx_status(struct i2c_adapter *control)
>   * Returns 0 on success or error.
>   */
>  static uint32_t smu_v11_0_i2c_transmit(struct i2c_adapter *control,
> -                                 uint8_t address, uint8_t *data,
> -                                 uint32_t numbytes, uint32_t i2c_flag)
> +                                      u16 address, u8 *data,
> +                                      u32 numbytes, u32 i2c_flag)
>  {
>         struct amdgpu_device *adev = to_amdgpu_device(control);
>         uint32_t bytes_sent, reg, ret = 0;
> @@ -225,7 +228,7 @@ static uint32_t smu_v11_0_i2c_transmit(struct i2c_adapter *control,
>         bytes_sent = 0;
>
>         DRM_DEBUG_DRIVER("I2C_Transmit(), address = %x, bytes = %d , data: ",
> -                (uint16_t)address, numbytes);
> +                        address, numbytes);
>
>         if (drm_debug_enabled(DRM_UT_DRIVER)) {
>                 print_hex_dump(KERN_INFO, "data: ", DUMP_PREFIX_NONE,
> @@ -318,8 +321,8 @@ static uint32_t smu_v11_0_i2c_transmit(struct i2c_adapter *control,
>   * Returns 0 on success or error.
>   */
>  static uint32_t smu_v11_0_i2c_receive(struct i2c_adapter *control,
> -                                uint8_t address, uint8_t *data,
> -                                uint32_t numbytes, uint8_t i2c_flag)
> +                                     u16 address, u8 *data,
> +                                     u32 numbytes, u32 i2c_flag)
>  {
>         struct amdgpu_device *adev = to_amdgpu_device(control);
>         uint32_t bytes_received, ret = I2C_OK;
> --
> 2.32.0
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx