Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp2254765pxb; Fri, 17 Sep 2021 05:59:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyvKVcmeNVd5PSRa5EHY0NsuyalTfzySiMiFnSoaPS+Q3HqJmsVb2FTavWTUgwpx8FEQLXt X-Received: by 2002:a05:6e02:1a67:: with SMTP id w7mr7882438ilv.24.1631883586719; Fri, 17 Sep 2021 05:59:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631883586; cv=none; d=google.com; s=arc-20160816; b=MVm3FqOq7kKcNUxwB0RRLk+2XME3yo2XuKSSUuGRAEfHrq4y6RUx51qGcP5aihJggF Z0Qwqgb/rpeMTqymjNV/nmaKaKjL/FjR2R8P4zJ9aFZeeVLia2x+b0gFXGPd8f96l/+4 MxGybnl1gJtuRiOk4UWIt7mMLCv0hzios68ppzBXPQQaVtG8KvDpPDbzOJc+IXt8+az5 1Vs1RlFc7xMIHGZ+G3AT7CNWb7vkwXyH1iWXVPRl8va3broL9pz2wdI9yvixTWkZFlUi wt3cp3z7C/tmS25K/KwtEDAa1UnHh0EoG1y5azNdSSQktJJGz9Uhoj91g9ZI+879fISo hGQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:date:subject:cc:to:from; bh=IWzUrhPIiqXO9uIJPVbUmY9LnR9QEzIOmSiVK9+wZDM=; b=HRbiZzN556o++ryzDWL++6wxWGJiFo2pftSOtJyTWnKfDLVSkPbPaCbVcGdlHjKl6D IygZR0VTD38XSnBc1SIKuaCsXRVfNQiU9+Z3T13DKpQ7Mn1NeKXkaSmtAvxt3ikIEhBs 8MjatbDy12ODW5ql3jRjNB+qnvSl3tx3dF4f6yEtvqk2Aj0dN4zfPFKM1F8WieLal9I0 WRMk6KDm1hSvOa7NZ9CyQJu7VLn6UbD2CIhNB51XvfJS2vs54aUY/qFv9Tn9o+ul1ZHl u6ukGmgLQoNqMLdIvHrP6XmUNXT1pt7Fb3ZQ2yhwtQMyv/O1f7X2riduRQB5EFCJ5Zvk GbEw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s9si6040552jaj.98.2021.09.17.05.59.33; Fri, 17 Sep 2021 05:59:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231534AbhIQHYb (ORCPT + 99 others); Fri, 17 Sep 2021 03:24:31 -0400 Received: from twspam01.aspeedtech.com ([211.20.114.71]:37437 "EHLO twspam01.aspeedtech.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229471AbhIQHYa (ORCPT ); Fri, 17 Sep 2021 03:24:30 -0400 Received: from mail.aspeedtech.com ([192.168.0.24]) by twspam01.aspeedtech.com with ESMTP id 18H72ZTG030518; Fri, 17 Sep 2021 15:02:35 +0800 (GMT-8) (envelope-from kuohsiang_chou@aspeedtech.com) Received: from localhost.localdomain.com (192.168.2.142) by TWMBX02.aspeed.com (192.168.0.24) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 17 Sep 2021 15:22:34 +0800 From: KuoHsiang Chou To: , , CC: , , , , , Subject: [PATCH] drm/ast: Atomic CR/SR reg R/W Date: Fri, 17 Sep 2021 15:22:26 +0800 Message-ID: <20210917072226.17357-1-kuohsiang_chou@aspeedtech.com> X-Mailer: git-send-email 2.18.4 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [192.168.2.142] X-ClientProxiedBy: TWMBX02.aspeed.com (192.168.0.24) To TWMBX02.aspeed.com (192.168.0.24) X-DNSRBL: X-MAIL: twspam01.aspeedtech.com 18H72ZTG030518 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 1. Avoid IO-index racing 2. IO-index racing happened on resolustion switching and mouse moving at the same time 3. System hung while IO-index racing occurred. Signed-off-by: KuoHsiang Chou --- drivers/gpu/drm/ast/ast_main.c | 48 +++++++++++++++++++++++++--------- 1 file changed, 36 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/ast/ast_main.c b/drivers/gpu/drm/ast/ast_main.c index 79a361867..1d8fa70c5 100644 --- a/drivers/gpu/drm/ast/ast_main.c +++ b/drivers/gpu/drm/ast/ast_main.c @@ -41,28 +41,52 @@ void ast_set_index_reg_mask(struct ast_private *ast, uint32_t base, uint8_t index, uint8_t mask, uint8_t val) { - u8 tmp; - ast_io_write8(ast, base, index); - tmp = (ast_io_read8(ast, base + 1) & mask) | val; - ast_set_index_reg(ast, base, index, tmp); + uint16_t volatile usData; + uint8_t volatile jData; + + do { + ast_io_write8(ast, base, index); + usData = ast_io_read16(ast, base); + } while ((uint8_t)(usData) != index); + + jData = (uint8_t)(usData >> 8); + jData &= mask; + jData |= val; + usData = ((uint16_t) jData << 8) | (uint16_t) index; + ast_io_write16(ast, base, usData); } uint8_t ast_get_index_reg(struct ast_private *ast, uint32_t base, uint8_t index) { - uint8_t ret; - ast_io_write8(ast, base, index); - ret = ast_io_read8(ast, base + 1); - return ret; + uint16_t volatile usData; + uint8_t volatile jData; + + do { + ast_io_write8(ast, base, index); + usData = ast_io_read16(ast, base); + } while ((uint8_t)(usData) != index); + + jData = (uint8_t)(usData >> 8); + + return jData; } uint8_t ast_get_index_reg_mask(struct ast_private *ast, uint32_t base, uint8_t index, uint8_t mask) { - uint8_t ret; - ast_io_write8(ast, base, index); - ret = ast_io_read8(ast, base + 1) & mask; - return ret; + uint16_t volatile usData; + uint8_t volatile jData; + + do { + ast_io_write8(ast, base, index); + usData = ast_io_read16(ast, base); + } while ((uint8_t)(usData) != index); + + jData = (uint8_t)(usData >> 8); + jData &= mask; + + return jData; } static void ast_detect_config_mode(struct drm_device *dev, u32 *scu_rev) -- 2.18.4