From patchwork Mon Mar 21 12:10:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolai Stange X-Patchwork-Id: 8632631 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 841F4C0553 for ; Mon, 21 Mar 2016 13:08:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7B82E202E5 for ; Mon, 21 Mar 2016 13:08:15 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 5C16A202BE for ; Mon, 21 Mar 2016 13:08:14 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1F6456E5AF; Mon, 21 Mar 2016 13:08:05 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id CBAF06E586 for ; Mon, 21 Mar 2016 12:11:02 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id l68so21433597wml.3 for ; Mon, 21 Mar 2016 05:11:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=vZ2kzEYCEXfZJ3fv8mGRtrmn+ahMf57fZKx/HT/cwpA=; b=DQxdbnJ/PZ1bZY4Eq4HEPksv9rMt1PV5CLSFVNeSRi31np3IuEG8ERiwLHXRd0hb89 iblpPUVUQhh8yS2PS0CksZ6JSMvtwoVZU0QylPprdtF5wDJ0RzO9npnQPP+nOB8VfHLo RY4bMmGqDEsHHrOe/uJ6pmab6cGt1DyppGhVjgvkxwJwz6a+8Il3WAeFDpot2UjQHU/X YvNTZK/LlNSaHCf1rSFY+aO1UUnfoukSPU7TZ/fCE2QPLGkc+K/UbnbJrzGEm7QlvVjz axGOVvRJnICw+OaPQeFXK5gIivbnq1rV93wBc7Kq/yoOJzzKu7hITb3rk+5E+BXYR78z ivvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=vZ2kzEYCEXfZJ3fv8mGRtrmn+ahMf57fZKx/HT/cwpA=; b=Lj1Wl8mIf91YSa5pMjvxwsW2SNqiM1ErV3WqgdRKFYzz8COIXKMcfgXoP8evMbFgHo hhn2EqBatzcbq3pptMvfHd31Z92SKkeuzCFeQP8nGeNht8XCBZzxR+uV9XHvZlNoomwe pDLzYdg61SoPodEax0zvnCmxQdoMdNo4CjV+yus+zHazITaf9aVQQhIhzpkTlJjl6m9t sGxTGItyRoU0CwXtpTwK/tYehMG1ys1sxzhMvvXQ3nyCaZii3gk8jwQRoQGu/AvQQwx5 lnFFFI7GoHH6kYvJdj9FwgIUWvaJhurpCqrVT5c/jgm6r0v66aLcZL2cia4R3b4xWjpz 8bnQ== X-Gm-Message-State: AD7BkJKHP+HJ1eD9X5R266Ury/fK28lGMklOaGK4OBZr1wVFEQb3tVv8ztXtvVhq5wjfow== X-Received: by 10.28.229.132 with SMTP id c126mr12861877wmh.72.1458562260590; Mon, 21 Mar 2016 05:11:00 -0700 (PDT) Received: from localhost (f054185001.adsl.alicedsl.de. [78.54.185.1]) by smtp.gmail.com with ESMTPSA id bg1sm25107306wjc.27.2016.03.21.05.10.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Mar 2016 05:11:00 -0700 (PDT) From: Nicolai Stange To: David Airlie , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= Subject: [PATCH v2] drm/radeon: evergreen_hpd_init()/_fini(): fix HPD IRQ bitset Date: Mon, 21 Mar 2016 13:10:56 +0100 Message-Id: <1458562256-2882-1-git-send-email-nicstange@gmail.com> X-Mailer: git-send-email 2.7.3 X-Mailman-Approved-At: Mon, 21 Mar 2016 13:08:02 +0000 Cc: Nicolai Stange , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The values of all but the RADEON_HPD_NONE members of the radeon_hpd_id enum transform 1:1 into bit positions within the 'enabled' bitset as assembled by evergreen_hpd_init(): enabled |= 1 << radeon_connector->hpd.hpd; However, if ->hpd.hpd happens to equal RADEON_HPD_NONE == 0xff, UBSAN reports UBSAN: Undefined behaviour in drivers/gpu/drm/radeon/evergreen.c:1867:16 shift exponent 255 is too large for 32-bit type 'int' [...] Call Trace: [] dump_stack+0xbc/0x117 [] ? _atomic_dec_and_lock+0x169/0x169 [] ubsan_epilogue+0xd/0x4e [] __ubsan_handle_shift_out_of_bounds+0x1fb/0x254 [] ? atom_execute_table+0x3e/0x50 [radeon] [] ? __ubsan_handle_load_invalid_value+0x158/0x158 [] ? radeon_get_pll_use_mask+0x130/0x130 [radeon] [] ? wake_up_klogd_work_func+0x60/0x60 [] ? vprintk_default+0x3e/0x60 [] evergreen_hpd_init+0x274/0x2d0 [radeon] [] ? evergreen_hpd_init+0x274/0x2d0 [radeon] [] radeon_modeset_init+0x8ce/0x18d0 [radeon] [] radeon_driver_load_kms+0x186/0x350 [radeon] [] drm_dev_register+0xc6/0x100 [drm] [] drm_get_pci_dev+0xe4/0x490 [drm] [] ? kfree+0x220/0x370 [] radeon_pci_probe+0x112/0x140 [radeon] [...] ===================================================================== radeon 0000:01:00.0: No connectors reported connected with modes At least on x86, there should be no user-visible impact as there 1 << 0xff == 1 << (0xff & 31) == 1 << 31 holds and 31 > RADEON_MAX_HPD_PINS. Thus, this patch is a cosmetic one. All of the above applies analogously to evergreen_hpd_fini(). Silence UBSAN by checking ->hpd.hpd for RADEON_HPD_NONE before oring it into the 'enabled' bitset in evergreen_hpd_init() or the 'disabled' bitset in evergreen_hpd_fini() respectively. Signed-off-by: Nicolai Stange --- Applicable to linux-next-20160321. Changes to v1: - Turn commit message's impact part into a non-impact part. drivers/gpu/drm/radeon/evergreen.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 76c4bdf..6360717 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -1864,7 +1864,8 @@ void evergreen_hpd_init(struct radeon_device *rdev) break; } radeon_hpd_set_polarity(rdev, radeon_connector->hpd.hpd); - enabled |= 1 << radeon_connector->hpd.hpd; + if (radeon_connector->hpd.hpd != RADEON_HPD_NONE) + enabled |= 1 << radeon_connector->hpd.hpd; } radeon_irq_kms_enable_hpd(rdev, enabled); } @@ -1907,7 +1908,8 @@ void evergreen_hpd_fini(struct radeon_device *rdev) default: break; } - disabled |= 1 << radeon_connector->hpd.hpd; + if (radeon_connector->hpd.hpd != RADEON_HPD_NONE) + disabled |= 1 << radeon_connector->hpd.hpd; } radeon_irq_kms_disable_hpd(rdev, disabled); }