drm/amd/powerplay: suppress compile error around BUG_ON
Subsystems (2)
PATCH 1/1 drm/amd/powerplay: suppress compile error around BUG_ON
To suppress the compile error below for "ARCH=arc".
drivers/gpu/drm/amd/amdgpu/../powerplay/arcturus_ppt.c: In function 'arcturus_fill_eeprom_i2c_req':
Quoted 1 line
Quoted 1 line
arch/arc/include/asm/bug.h:22:2: error: implicit declaration of function 'pr_warn'; did you mean 'pci_warn'? [-Werror=implicit-function-declaration]
22 | pr_warn("BUG: failure at %s:%d/%s()!\n", __FILE__, __LINE__, __func__); \
| ^~~~~~~
include/asm-generic/bug.h:62:57: note: in expansion of macro 'BUG'
62 | #define BUG_ON(condition) do { if (unlikely(condition)) BUG(); } while (0)
| ^~~
drivers/gpu/drm/amd/amdgpu/../powerplay/arcturus_ppt.c:2157:2: note: in expansion of macro 'BUG_ON'
2157 | BUG_ON(numbytes > MAX_SW_I2C_COMMANDS);--- drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +12 -2
@@ -1881,8 +1881,6 @@ static void arcturus_fill_eeprom_i2c_req(SwI2cRequest_t *req, bool write, {int i; -BUG_ON (numbytes >MAX_SW_I2C_COMMANDS ); - req->I2CcontrollerPort =0 ; req->I2CSpeed =2 ; req->SlaveAddress = address;
@@ -1920,6 +1918,12 @@ static int arcturus_i2c_eeprom_read_data(struct i2c_adapter *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));arcturus_fill_eeprom_i2c_req (&req, false, address, numbytes, data);
@@ -1956,6 +1960,12 @@ static int arcturus_i2c_eeprom_write_data(struct i2c_adapter *control,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));arcturus_fill_eeprom_i2c_req (&req, true, address, numbytes, data);
Signature · 6 lines
2.27.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[AMD Public Use]
________________________________
From: Quan, Evan <[email protected]>
Sent: Wednesday, July 15, 2020 2:52 AM
To: [email protected] <[email protected]>
Cc: Deucher, Alexander <[email protected]>; Quan, Evan <[email protected]>
Subject: [PATCH] drm/amd/powerplay: suppress compile error around BUG_ON
To suppress the compile error below for "ARCH=arc".
drivers/gpu/drm/amd/amdgpu/../powerplay/arcturus_ppt.c: In function 'arcturus_fill_eeprom_i2c_req':
Quoted 1 line
Quoted 1 line
arch/arc/include/asm/bug.h:22:2: error: implicit declaration of function 'pr_warn'; did you mean 'pci_warn'? [-Werror=implicit-function-declaration]
22 | pr_warn("BUG: failure at %s:%d/%s()!\n", __FILE__, __LINE__, __func__); \
| ^~~~~~~
include/asm-generic/bug.h:62:57: note: in expansion of macro 'BUG'
62 | #define BUG_ON(condition) do { if (unlikely(condition)) BUG(); } while (0)
| ^~~
drivers/gpu/drm/amd/amdgpu/../powerplay/arcturus_ppt.c:2157:2: note: in expansion of macro 'BUG_ON'
2157 | BUG_ON(numbytes > MAX_SW_I2C_COMMANDS);--- drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +12 -2
@@ -1881,8 +1881,6 @@ static void arcturus_fill_eeprom_i2c_req(SwI2cRequest_t *req, bool write, {int i; -BUG_ON (numbytes >MAX_SW_I2C_COMMANDS ); - req->I2CcontrollerPort =0 ; req->I2CSpeed =2 ; req->SlaveAddress = address;
@@ -1920,6 +1918,12 @@ static int arcturus_i2c_eeprom_read_data(struct i2c_adapter *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));arcturus_fill_eeprom_i2c_req (&req, false, address, numbytes, data);
@@ -1956,6 +1960,12 @@ static int arcturus_i2c_eeprom_write_data(struct i2c_adapter *control,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));arcturus_fill_eeprom_i2c_req (&req, true, address, numbytes, data);
--
2.27.0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx