mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Evan Quan <evan.quan@amd.com>,
	Alex Deucher <alexander.deucher@amd.com>,
	Sasha Levin <sashal@kernel.org>,
	amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Subject: [PATCH AUTOSEL 5.8 48/64] drm/amd/powerplay: suppress compile error around BUG_ON
Date: Mon, 10 Aug 2020 15:08:43 -0400	[thread overview]
Message-ID: <20200810190859.3793319-48-sashal@kernel.org> (raw)
In-Reply-To: <20200810190859.3793319-1-sashal@kernel.org>

From: Evan Quan <evan.quan@amd.com>

[ Upstream commit 75bc07e2403caea9ecac69f766dfb7dc33547594 ]

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':
>> 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);

Signed-off-by: Evan Quan <evan.quan@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c b/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c
index 27c5fc9572b27..e4630a76d7bf5 100644
--- a/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c
+++ b/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c
@@ -2042,8 +2042,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;
@@ -2081,6 +2079,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);
 
@@ -2117,6 +2121,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.25.1


  parent reply	other threads:[~2020-08-10 19:31 UTC|newest]

Thread overview: 64+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-10 19:07 [PATCH AUTOSEL 5.8 01/64] drm/tilcdc: fix leak & null ref in panel_connector_get_modes Sasha Levin
2020-08-10 19:07 ` [PATCH AUTOSEL 5.8 02/64] soc: qcom: rpmh-rsc: Set suppress_bind_attrs flag Sasha Levin
2020-08-10 19:07 ` [PATCH AUTOSEL 5.8 03/64] net: mscc: ocelot: fix encoding destination ports into multicast IPv4 address Sasha Levin
2020-08-10 19:07 ` [PATCH AUTOSEL 5.8 04/64] ARM: exynos: clear L310_AUX_CTRL_FULL_LINE_ZERO in default l2c_aux_val Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 05/64] Bluetooth: add a mutex lock to avoid UAF in do_enale_set Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 06/64] loop: be paranoid on exit and prevent new additions / removals Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 07/64] io_uring: fix req->work corruption Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 08/64] fs/btrfs: Add cond_resched() for try_release_extent_mapping() stalls Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 09/64] drm/amdgpu: avoid dereferencing a NULL pointer Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 10/64] drm/radeon: Fix reference count leaks caused by pm_runtime_get_sync Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 11/64] crypto: aesni - Fix build with LLVM_IAS=1 Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 12/64] video: fbdev: savage: fix memory leak on error handling path in probe Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 13/64] video: fbdev: neofb: fix memory leak in neo_scan_monitor() Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 14/64] bus: ti-sysc: Add missing quirk flags for usb_host_hs Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 15/64] md-cluster: fix wild pointer of unlock_all_bitmaps() Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 16/64] rtw88: 8822ce: add support for device ID 0xc82f Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 17/64] drm/nouveau/kms/nv50-: Fix disabling dithering Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 18/64] arm64: dts: hisilicon: hikey: fixes to comply with adi, adv7533 DT binding Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 19/64] drm/etnaviv: fix ref count leak via pm_runtime_get_sync Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 20/64] ionic: rearrange reset and bus-master control Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 21/64] memory: samsung: exynos5422-dmc: Do not ignore return code of regmap_read() Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 22/64] drm/nouveau: fix reference count leak in nouveau_debugfs_strap_peek Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 23/64] drm/nouveau: fix multiple instances of reference count leaks Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 24/64] mmc: sdhci-cadence: do not use hardware tuning for SD mode Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 25/64] btrfs: fix lockdep splat from btrfs_dump_space_info Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 26/64] usb: mtu3: clear dual mode of u3port when disable device Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 27/64] drm: msm: a6xx: fix gpu failure after system resume Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 28/64] drm/msm: Fix a null pointer access in msm_gem_shrinker_count() Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 29/64] drm/debugfs: fix plain echo to connector "force" attribute Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 30/64] drm/radeon: disable AGP by default Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 31/64] net: phy: mscc: restore the base page in vsc8514/8584_config_init Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 32/64] irqchip/irq-mtk-sysirq: Replace spinlock with raw_spinlock Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 33/64] mm/mmap.c: Add cond_resched() for exit_mmap() CPU stalls Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 34/64] drm/amd/display: Improve DisplayPort monitor interop Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 35/64] drm/amdgpu/debugfs: fix ref count leak when pm_runtime_get_sync fails Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 36/64] drm/amdgpu/display bail early in dm_pp_get_static_clocks Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 37/64] drm/amdgpu/display: properly guard the calls to swSMU functions Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 38/64] drm/amd/display: allow query ddc data over aux to be read only operation Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 39/64] drm/amd/powerplay: fix compile error with ARCH=arc Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 40/64] bpf: Fix fds_example SIGSEGV error Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 41/64] Bluetooth: hci_qca: Bug fixes for SSR Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 42/64] brcmfmac: keep SDIO watchdog running when console_interval is non-zero Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 43/64] brcmfmac: To fix Bss Info flag definition Bug Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 44/64] brcmfmac: set state of hanger slot to FREE when flushing PSQ Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 45/64] platform/x86: asus-nb-wmi: add support for ASUS ROG Zephyrus G14 and G15 Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 46/64] iwlegacy: Check the return value of pcie_capability_read_*() Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 47/64] gpu: host1x: debug: Fix multiple channels emitting messages simultaneously Sasha Levin
2020-08-10 19:08 ` Sasha Levin [this message]
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 49/64] ionic: update eid test for overflow Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 50/64] x86/uaccess: Make __get_user_size() Clang compliant on 32-bit Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 51/64] mmc: sdhci-pci-o2micro: Bug fix for O2 host controller Seabird1 Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 52/64] usb: gadget: net2280: fix memory leak on probe error handling paths Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 53/64] bdc: Fix bug causing crash after multiple disconnects Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 54/64] usb: bdc: Halt controller on suspend Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 55/64] dyndbg: fix a BUG_ON in ddebug_describe_flags Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 56/64] dyndbg: prefer declarative init in caller, to memset in callee Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 57/64] bcache: fix super block seq numbers comparision in register_cache_set() Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 58/64] btrfs: allow btrfs_truncate_block() to fallback to nocow for data space reservation Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 59/64] btrfs: qgroup: free per-trans reserved space when a subvolume gets dropped Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 60/64] ACPICA: Do not increment operation_region reference counts for field units Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 61/64] io_uring: fix racy overflow count reporting Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 62/64] io_uring: fix stalled deferred requests Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 63/64] crypto: caam - silence .setkey in case of bad key length Sasha Levin
2020-08-10 19:08 ` [PATCH AUTOSEL 5.8 64/64] drm/msm: ratelimit crtc event overflow error Sasha Levin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200810190859.3793319-48-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=alexander.deucher@amd.com \
    --cc=amd-gfx@lists.freedesktop.org \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=evan.quan@amd.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®