From patchwork Wed Jan 24 02:59:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Erico Nunes X-Patchwork-Id: 191316 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2553:b0:103:945f:af90 with SMTP id p19csp743259dyi; Tue, 23 Jan 2024 19:01:02 -0800 (PST) X-Google-Smtp-Source: AGHT+IERmZJSbsjKtD4GzW2wd1h0P+GiJBfXkY7jR19c0yH4t5Bqpr87i1FkTn89QIcHOxEqYjmP X-Received: by 2002:a05:622a:1310:b0:42a:38ea:c69e with SMTP id v16-20020a05622a131000b0042a38eac69emr2219892qtk.64.1706065262450; Tue, 23 Jan 2024 19:01:02 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706065262; cv=pass; d=google.com; s=arc-20160816; b=o5/m3ySR7q86Lk6z8mvMUoN66NWVxs25cbVpX3cM9TUgrtstY4NaW3x4FWL8Am8KQd rlXhOJ5GstKJ4EtyogLsupQpPPZ5w7V9uqMcDooQXvx2hKZ7BS1o3+ZeirkFg81aUyB6 hBx0Q/VyjqjIGQG3HBtJWkwMLcgTqGQ0JMjEzYvaAyG3We88PP2J3iSjrMz8cfZ1ql2g YyDPHiLWDUgkb2bmPyWGt6aljNNywzeT86cDKotSw/LUbn2FtNlgyQ4x+Bz2NgueOMQ0 aCGAEYLVE0HR0LHSXeRYF1mUCAv6j+jD7f5Ld89D+yo79LzEiKV8xrstUVJeVD5V9YUt c/4Q== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=2lKvsANFUcNVxLXJxZjgiBTj8Zdtr64bBDmNrQ/dGYc=; fh=ZATWbw1ckX/b/NMeD3w5zBmTW7Tllx597BFkkpq0f/4=; b=j6WhGwbnPyrOFh4+ApMPlGVVslL0LEPY5QsZHhKg4UhCaq375+jbcBRPzetFSuEfGF JQEM97/s5B9itc/7jEqiCRFk2IDtiAWWRMynNyxu+QEmgbVuKr+Wu1FnmL7HoZgx9y+p rCYie+ahOtu1FJkRRrTBge7Efvc8/9aPNXTni7y5wkiD1NiQ78xfSzTLYeBB8Qf7z2sk OsPRAsKarFUCLN341kBUktzBcc4SZiQivWIp6uMDeEbeycQN/j38lHkJBQ8e5J91F08f rLAYFS0uwGz80pCbOdmNGKh9f4lRZU5snqFg7qvMBAMK2nBq//ICY++lKVTM1+OKIzcV fQbQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=DkIFnIGN; arc=pass (i=1 spf=pass spfdomain=gmail.com dkim=pass dkdomain=gmail.com dmarc=pass fromdomain=gmail.com); spf=pass (google.com: domain of linux-kernel+bounces-36370-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-36370-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id u13-20020a05622a14cd00b0042a2569c019si9286507qtx.368.2024.01.23.19.01.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jan 2024 19:01:02 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-36370-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=DkIFnIGN; arc=pass (i=1 spf=pass spfdomain=gmail.com dkim=pass dkdomain=gmail.com dmarc=pass fromdomain=gmail.com); spf=pass (google.com: domain of linux-kernel+bounces-36370-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-36370-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id B50611C25739 for ; Wed, 24 Jan 2024 03:00:49 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 85C02C8D2; Wed, 24 Jan 2024 03:00:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="DkIFnIGN" Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 26A1A524C for ; Wed, 24 Jan 2024 03:00:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706065212; cv=none; b=N2IzPlEsDfkHKlH9ZcRxmIaeHgoljUVCUoc2USWiJukfibkpb6M3pZu1DgU26gEK5zzCGGI7+ExI9iuM6+otgbcbgKiCW2UX/d8dBzb6bSeLkI9aKRCiwHmog4zBjcVVZhChKs/gJnIv7niBaEnGo0vsTEWoSfdrJa3h9JWl1U4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706065212; c=relaxed/simple; bh=WBAYWOzQrbynmcMq5FlSAIF+vKVyihci8yxoGQ6j4w4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dsE4DAMry/peMyitQTGKg7cjoTP58KZTgZQZEFD+cdjsMyBCQYfhBibTrtUVWnKrP3CUFs6YWpAljkwTSaX8GIVGEaVpB3qJGFoQToC7jK/in0VrFFmNwvkPceuUOueEpicGccuZar7rjFPwRREmwI9l8WkqHUOH4WoXkZR2edk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=DkIFnIGN; arc=none smtp.client-ip=209.85.221.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-337cc8e72f5so4567033f8f.1 for ; Tue, 23 Jan 2024 19:00:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706065209; x=1706670009; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2lKvsANFUcNVxLXJxZjgiBTj8Zdtr64bBDmNrQ/dGYc=; b=DkIFnIGNQDtfNae+yjEMkg7iZZtj7u2TmhVHPZWJAwHA8SpJZD4FvhhjRnOyvsMG/Y lONFa96d1POwZD9IypxrjK4d3aiMP4m07E1KIfCsmF8iEI2nVAJW0r4TlOK6THfqAldJ zSmz6RGIkz3BKRuHWu35izLVeEleQrSAA5T7eorQ8380FORBqnf/zoi4fVetydQrsSK2 s9VclITpziQ7/HpWTJjZVH0515gO0x9vcgDy49S5jZogvOEa2u1EvUNQbERJGbqa4PdQ rbM0Ta5O/zWUAhjU9HlHVexKQbj7N5yasAQUM8Yd6hb15++gaOQ3+G8TIStouI8JeQsa r+SA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706065209; x=1706670009; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2lKvsANFUcNVxLXJxZjgiBTj8Zdtr64bBDmNrQ/dGYc=; b=o9QTAeZOtHwSjLjbbbCBn0cn0x7T3XMB8XWsmqCI2rkt/8z+cViUyzbZUxsaoXDlbm QIM0sRDL4doNVyFTPoB/MjRhhl23YkX2TW29/+jEfE0BibxbDq+vNZvXofKBnkmcND2Z By+rWX5uuZCX2WMwkFMgsWigE13OVngWym7gLp2IjRsU5ABOwQ0SjvPK6cQZQvpcMLm2 N/9e3bD2zvztOJxJCBh0dhsrH0dmFKldQOL6VCXrLQ269scB7WoVE0JUQkE9uCl68Xde khZ22E4ydH1u2UoEQ0i7Dkhk1fOHFVTzC+50ndaKYmIyrCbPkIikLzzCTcL9QSM+Q9wm MEYw== X-Gm-Message-State: AOJu0YxM0MvuxBk/G0tua7hJtTaCAkmyroKR4RiDINm1dcLZwNK5rrZt N5XIA9Oc6dq4wlJSTFqBB72VL9tOhlD6TDw1crjx7NUAMgk58wyg X-Received: by 2002:a05:600c:5399:b0:40e:9675:8416 with SMTP id hg25-20020a05600c539900b0040e96758416mr721099wmb.169.1706065209410; Tue, 23 Jan 2024 19:00:09 -0800 (PST) Received: from mosaic.enunes.eu (ip-78-45-66-209.bb.vodafone.cz. [78.45.66.209]) by smtp.gmail.com with ESMTPSA id dj17-20020a05640231b100b00559bb146ecbsm9637914edb.6.2024.01.23.19.00.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jan 2024 19:00:08 -0800 (PST) From: Erico Nunes To: Qiang Yu , anarsoul@gmail.com, christian.koenig@amd.com, dri-devel@lists.freedesktop.org, lima@lists.freedesktop.org Cc: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Sumit Semwal , linux-kernel@vger.kernel.org, Erico Nunes Subject: [PATCH v2 1/8] drm/lima: reset async_reset on pp hard reset Date: Wed, 24 Jan 2024 03:59:40 +0100 Message-ID: <20240124025947.2110659-2-nunes.erico@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240124025947.2110659-1-nunes.erico@gmail.com> References: <20240124025947.2110659-1-nunes.erico@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788939088250985462 X-GMAIL-MSGID: 1788939088250985462 Lima pp jobs use an async reset to avoid having to wait for the soft reset right after a job. The soft reset is done at the end of a job and a reset_complete flag is expected to be set at the next job. However, in case the user runs into a job timeout from any application, a hard reset is issued to the hardware. This hard reset clears the reset_complete flag, which causes an error message to show up before the next job. This is probably harmless for the execution but can be very confusing to debug, as it blames a reset timeout on the next application to submit a job. Reset the async_reset flag when doing the hard reset so that we don't get that message. Signed-off-by: Erico Nunes Reviewed-by: Vasily Khoruzhick --- drivers/gpu/drm/lima/lima_pp.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/gpu/drm/lima/lima_pp.c b/drivers/gpu/drm/lima/lima_pp.c index a5c95bed08c0..a8f8f63b8295 100644 --- a/drivers/gpu/drm/lima/lima_pp.c +++ b/drivers/gpu/drm/lima/lima_pp.c @@ -191,6 +191,13 @@ static int lima_pp_hard_reset(struct lima_ip *ip) pp_write(LIMA_PP_PERF_CNT_0_LIMIT, 0); pp_write(LIMA_PP_INT_CLEAR, LIMA_PP_IRQ_MASK_ALL); pp_write(LIMA_PP_INT_MASK, LIMA_PP_IRQ_MASK_USED); + + /* + * if there was an async soft reset queued, + * don't wait for it in the next job + */ + ip->data.async_reset = false; + return 0; } From patchwork Wed Jan 24 02:59:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Erico Nunes X-Patchwork-Id: 191318 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2553:b0:103:945f:af90 with SMTP id p19csp743341dyi; Tue, 23 Jan 2024 19:01:10 -0800 (PST) X-Google-Smtp-Source: AGHT+IHt8Ts0shtbi7ick9I9jqJz+0B+H1DxJ35fGT1FjC5xJ4uJFniBsSqZub3qa8IkoWOVE9qB X-Received: by 2002:a05:620a:1004:b0:783:9e70:34e1 with SMTP id z4-20020a05620a100400b007839e7034e1mr3712311qkj.46.1706065270705; Tue, 23 Jan 2024 19:01:10 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706065270; cv=pass; d=google.com; s=arc-20160816; b=Dr9D1kf8Y6Xglr6b3pVjEzWQ/8RDSOXE7XddgxbQ2VdVMjqGxqKVzzPZTCcV+7/hiz lewG5wwfARZd7GhpeX/taJHWjXiK+6/ZBskjWI+QHtYQpzT1qTUIDotxlW7GlxZ0e8mi EFuGNzb/oznRQhOg1K0OtbliLaZTnQoNiOTWEU1YQkBqIdVyC6E+Z8ywGPz3Zt5d9+gY w/pkCq5gdP57Dlt3HezTYYr6mXv5vuyLXhYZDUEGh5uBMXEc8rpBPzUh2UGba33cv3lR EwaEsMn6iv1Oo8AOfG/It9nvkaA9v7aHM5n7TKtko8eRFwjEKBGaKODxEKXQmmwP+sdo y5Gg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=BaTJtCWzAa42d+m/EougaGDz2r//03gZrDKzLfNv26E=; fh=ZATWbw1ckX/b/NMeD3w5zBmTW7Tllx597BFkkpq0f/4=; b=WaoXtuCdWO82cwWkCgYJBa4Otc31NovMIfQRF1VP7uRlKdHa6uCLXp0+JnMrHApmek PDapZaosy2HFDSGiplIzYZ6xVwtVv+oIl3MaYyAAflssCJ+h4aacRTr9gXxORs0sUWB/ p3mLeDBTxiSBHvDQEJfH7xwpNqqQ47CmMxRw26ZeeXAUWxMVVr+s9Y1f/5co14+3+FOP ElP+L4LBskz8h07fRSTXTuOCaFO/hU8qLlzLjnu+quEzCGSAXnDPc5n1RsXV5r1jALAG 62AP2txIRQu+21vL2vd0StyeLap34rj4nhFm2p5MMg3aXJk/4WpViE4iD2V0mLoZBJ2P oM+A== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=K6OApORt; arc=pass (i=1 spf=pass spfdomain=gmail.com dkim=pass dkdomain=gmail.com dmarc=pass fromdomain=gmail.com); spf=pass (google.com: domain of linux-kernel+bounces-36371-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-36371-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id w10-20020a05620a094a00b0078394c072d0si8438986qkw.573.2024.01.23.19.01.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jan 2024 19:01:10 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-36371-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=K6OApORt; arc=pass (i=1 spf=pass spfdomain=gmail.com dkim=pass dkdomain=gmail.com dmarc=pass fromdomain=gmail.com); spf=pass (google.com: domain of linux-kernel+bounces-36371-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-36371-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 40D8D1C22165 for ; Wed, 24 Jan 2024 03:01:04 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A0293E568; Wed, 24 Jan 2024 03:00:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="K6OApORt" Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 49421290A for ; Wed, 24 Jan 2024 03:00:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706065213; cv=none; b=Fap8sMjWxzSvlcvTHOlCu3gh577AmYFsaWcje0Y0Nd7B2JoSQC3lWMQwZu2A0voVGEwT5DpcGslJC649k9iHqcHyOIU6aAlvNd9694GW8bS9HvTbsgNBTUWv4T+qbhJIxA54v9lB6Jj6QaQr0TwBect8VKDTHI0zQV+0+SvBp9A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706065213; c=relaxed/simple; bh=J2Ku4zUqtPoQnOkUOB5TlnuoIop2sLljbl7vXV1zRx0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VVfN5LZoYpQ1iUKIAoE5PszSB4nuj2SCwRqUKWbzme4qSLj/9Z9FY80/dXt2WGDlNGBh5KKwFM8Pbch/rQEPnbbahSbpz6kGCz1KkLVmCps+Ezwl74wVjdFdOfA8XOLN4A6vmOkR9AKp7oSFELO5eNHpigLLBq1EaH8RkK+tstM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=K6OApORt; arc=none smtp.client-ip=209.85.128.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-40e60e137aaso55015285e9.0 for ; Tue, 23 Jan 2024 19:00:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706065210; x=1706670010; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BaTJtCWzAa42d+m/EougaGDz2r//03gZrDKzLfNv26E=; b=K6OApORtQ+gK/JgcDY3vT2q2mS0q7L8/imp0FF5pLsrYYGVoeByCy8OOrFWtIfgTQR X2hNFhvw94nh9KguHwovLF9GgjfDgKnU43QmtAaf559nkqFABu60z6bnaWdisfiRDyPh f+zp4k2R3ao10PJzsEfcBXKZQSyuYRjzdudpqK8uC5XE73Fx5hsfz3kJRNME6x3k4TQN 4MwXkJ1vi/Ng6iSHKfbdIEYi0sL1aHGdwyDnOvcSMHeGakzXiQfGmDpYtA2NbSY4tdJb 9PgDAUH5QPg2WXtrn5kAwAB1sc08vc3vUJE6Qv/T0Z9IDwCgHyrVIWlojRH8pvSl4W2f S1PQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706065210; x=1706670010; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BaTJtCWzAa42d+m/EougaGDz2r//03gZrDKzLfNv26E=; b=jVgp4n8A/sM+0QEOoOSxHwXYb2xEmvdgOn53C5HXdSW2zOj3ZTeXP94Q46bl3Tf7lz s2ksJWNBX/vpRMiPhTFTBcXWUtliAGhoHKWP7BoZXXarmHQBpfRzur9jfHdvRC5Vf/IR PTaIeRNAqAR0ZeFXATfyxDEC3/htTLG/OgVBHlhOMr9OqRmffQBEDt0ZcGuSmKTdCcKz UcHncGkWdNm/oJmyF+fAUfZH9mEIswpFKGf+IcwBijcVLz4M3VC8tZNHa8paJ1tgSUWR pg3PttDqLIrpuvKcu5FrQSxMvTIfXWEzZLD/xvti9Tm4eKogLDq+8TNhc789UA/DrwgT AZow== X-Gm-Message-State: AOJu0YwuBXpWV7qLolaYG2GduprkZq8o3m1G4PjcJMJ2s8i1pTVDk62e LKE4rtacpvz+aI6QNmBmCozRW//s+39lGcbn/J+mpzZ1X3Zh1HDp X-Received: by 2002:a05:600c:5115:b0:40e:b6d0:82d8 with SMTP id o21-20020a05600c511500b0040eb6d082d8mr1030534wms.88.1706065210383; Tue, 23 Jan 2024 19:00:10 -0800 (PST) Received: from mosaic.enunes.eu (ip-78-45-66-209.bb.vodafone.cz. [78.45.66.209]) by smtp.gmail.com with ESMTPSA id dj17-20020a05640231b100b00559bb146ecbsm9637914edb.6.2024.01.23.19.00.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jan 2024 19:00:09 -0800 (PST) From: Erico Nunes To: Qiang Yu , anarsoul@gmail.com, christian.koenig@amd.com, dri-devel@lists.freedesktop.org, lima@lists.freedesktop.org Cc: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Sumit Semwal , linux-kernel@vger.kernel.org, Erico Nunes Subject: [PATCH v2 2/8] drm/lima: reset async_reset on gp hard reset Date: Wed, 24 Jan 2024 03:59:41 +0100 Message-ID: <20240124025947.2110659-3-nunes.erico@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240124025947.2110659-1-nunes.erico@gmail.com> References: <20240124025947.2110659-1-nunes.erico@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788939097256832282 X-GMAIL-MSGID: 1788939097256832282 Lima gp jobs use an async reset to avoid having to wait for the soft reset right after a job. The soft reset is done at the end of a job and a reset_complete flag is expected to be set at the next job. However, in case the user runs into a job timeout from any application, a hard reset is issued to the hardware. This hard reset clears the reset_complete flag, which causes an error message to show up before the next job. This is probably harmless for the execution but can be very confusing to debug, as it blames a reset timeout on the next application to submit a job. Reset the async_reset flag when doing the hard reset so that we don't get that message. Signed-off-by: Erico Nunes --- drivers/gpu/drm/lima/lima_gp.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/gpu/drm/lima/lima_gp.c b/drivers/gpu/drm/lima/lima_gp.c index 8dd501b7a3d0..b9a06e701a33 100644 --- a/drivers/gpu/drm/lima/lima_gp.c +++ b/drivers/gpu/drm/lima/lima_gp.c @@ -189,6 +189,13 @@ static int lima_gp_hard_reset(struct lima_ip *ip) gp_write(LIMA_GP_PERF_CNT_0_LIMIT, 0); gp_write(LIMA_GP_INT_CLEAR, LIMA_GP_IRQ_MASK_ALL); gp_write(LIMA_GP_INT_MASK, LIMA_GP_IRQ_MASK_USED); + + /* + * if there was an async soft reset queued, + * don't wait for it in the next job + */ + ip->data.async_reset = false; + return 0; } From patchwork Wed Jan 24 02:59:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Erico Nunes X-Patchwork-Id: 191323 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2553:b0:103:945f:af90 with SMTP id p19csp744466dyi; Tue, 23 Jan 2024 19:03:25 -0800 (PST) X-Google-Smtp-Source: AGHT+IGVADOyuuC0dMQjZwBCighG/gpdaJ8XX/SfDdz159MfjowhTpotRKLKxO43btIfYvx0L6o/ X-Received: by 2002:a17:907:9157:b0:a29:32bf:9c8 with SMTP id l23-20020a170907915700b00a2932bf09c8mr417426ejs.39.1706065404918; Tue, 23 Jan 2024 19:03:24 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706065404; cv=pass; d=google.com; s=arc-20160816; b=EzQuZSB6BloULqSyQn9xpiBuAkxD7JffKkLgHKj7jo/dmdtxgrnKjMejdWMnnufjxA 68+zhWGm/ODs7RaLCqv8na1jNhpUI2tiujtqF99pcUiqg0oAMuzjlAkctdUZVmOr4nUM xy82Lm44DQ8+J9g2txj7QRp0LE+BNlv0wW4gL8RmDc7AQFfenJO925EUEBd5lrsgc3H6 4mOV2CrM/6iSiy81dPxZ7AmTONWDQ6YJIXuQ8rhiSkXdH2Qc3j/eGO+hSeWGZUMpnEDe eCIVatoX8fxlFpwtAZApXzKzr0aWKUL4d86HpickX7Av8ck7UVt6WPWflBxdkhir2xbm 3G8w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=7t4g0dsSRdpeLCYs8MxmtMoFxRmps4SUlUHmKsZELwE=; fh=ZATWbw1ckX/b/NMeD3w5zBmTW7Tllx597BFkkpq0f/4=; b=lzfAice97uYEEJH+MGSDz7FlTrBvz/9y1Fz4fA/58BsjahX4pgR4YwV7sUn/uiQWV5 4VYjhBwm79dKCMixKIXrMQHtOrFB47Bmuf0EIOTnPn5wBUpaIQ3zixmCXWBT1q2DeAJ3 DRS0NsP9YNvZUYDdLjDCM/AiI8icwn/rZfYUhDXaGIH7e6eamwaFkKh4BBK+zKsmlDGZ Wa0979t1hK9gp2tzbfYxGXiQILmc5P7NaMvgnPloCblBtVU49Gf+dYVNBmHCwQWwq6uN Ik2fBwuL5R4jlDrc/EkSayeeEtLKlVgttJVCdayvyGQxTiqQUfBoH484taIey8VgifGF WaGg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=IMveMR92; arc=pass (i=1 spf=pass spfdomain=gmail.com dkim=pass dkdomain=gmail.com dmarc=pass fromdomain=gmail.com); spf=pass (google.com: domain of linux-kernel+bounces-36377-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-36377-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id k9-20020a17090666c900b00a2f1bc99283si6268329ejp.625.2024.01.23.19.03.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jan 2024 19:03:24 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-36377-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=IMveMR92; arc=pass (i=1 spf=pass spfdomain=gmail.com dkim=pass dkdomain=gmail.com dmarc=pass fromdomain=gmail.com); spf=pass (google.com: domain of linux-kernel+bounces-36377-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-36377-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 5CF3B1F2B8DA for ; Wed, 24 Jan 2024 03:02:18 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 49812171B6; Wed, 24 Jan 2024 03:00:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="IMveMR92" Received: from mail-ed1-f45.google.com (mail-ed1-f45.google.com [209.85.208.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 44E9EF9EB for ; Wed, 24 Jan 2024 03:00:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706065220; cv=none; b=p/RNHESHW0XluYiMO3yaVQQmIA9sj51qiEjcqNBfPQ1VRMT9wIbCVKFrJddDJzn5gZLUZtHaaL7QTv0eylogbK+BnzHQydF+HT37KaBkMdUwBDsKWLTOyI5aPKJzLmmUaNBeCfr7nNHiqq5A0HYRnVnZeANqJLgmKy2JZSQ7/RI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706065220; c=relaxed/simple; bh=3BC2F6xZE6oGPR5HTxu2FCWMFh6XofuXNdXWJ+WqSHE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TojDI0F3mzmOpVeqJnPak3Rbgy1AQlewkYmicNboyYK6HmYaa0HbwZEyorPK3UyeOvIX9sK+Tp74ei04pNDxOqMSS5Mq9Loa95y9P4eB+4fLJ/0cDaJyxJ/D0H4L2xfKxJwIH72Aqu8OB2rR3zGxrIaEjxtfWz8+PFJnP1KkCcs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=IMveMR92; arc=none smtp.client-ip=209.85.208.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ed1-f45.google.com with SMTP id 4fb4d7f45d1cf-559cef15db5so10611550a12.0 for ; Tue, 23 Jan 2024 19:00:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706065216; x=1706670016; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7t4g0dsSRdpeLCYs8MxmtMoFxRmps4SUlUHmKsZELwE=; b=IMveMR9239WW6q/MG9tQbZoyf1DRUPJQVE00StLK0+vi7ZVOGLDZg4ewyVEF3AB+mA 3nL+0FHPq6NhqaE+/yZwvtmnw/rGztZm9Jh0NXCr2ehppre9D4HAzQYggaclJR6BOon9 teq8aX6QaiszGsE729mH0Da1j0Aw1uD68gicok+EOM7m+A0bnFknVON9Kg6T6mIAppWr xmKJidXp4JJ3u+EmJdaYdrBRk/kQ5FI4xfC8zAvh8MDL5WItfN2NO0/mk3pwGgNM/Fij 5jrI2kqrbSogCA4pV8OrS+bk4OrSLzPhnhGxyWYplAkVDdAsT5eNXkql/TLKKTI80OFt srAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706065216; x=1706670016; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7t4g0dsSRdpeLCYs8MxmtMoFxRmps4SUlUHmKsZELwE=; b=EyWoSsx7U1rPA61uc8vC5jlNIj+vKrXumgAfwldtLGEsB6dSwEM8B1sfYzVXJCZgaA 8KFaDT14OR5uxDKk0EuZO3SLOI6LDmPzZFu64Bl+oVxjFGQAcw6P+uKDsUsM+awUiv9L rIfHBjPF/bk6bY11kpbhN61Huy2LaF1RIQvpAjn3tcBN287IABmytbajw9TdbNkB1TY/ JF3oXTzj+Ww9AVEqwEgV1zpfB6jb41BNyQvVV6dicy+FD6mYvwjmlqGzDPC3XY0VpdTm kHgnCFtPT2s1/Z00cFDFFnH6/r1yx7ZyD2ifm/9s1wsgZWW2TUjY5dR3UFv0RBeNxa4N 6YwQ== X-Gm-Message-State: AOJu0Yx5y4fZIBqaBZyyXU6mDpy31dBc/A2/0DmV1golgQdV/CklueVJ RDV1JI4vLKLsgYGKjf5WpWF8w2Ed0NkPb5Qqysy7fW65P6k9/taO X-Received: by 2002:a50:fc04:0:b0:55c:7d37:7d9d with SMTP id i4-20020a50fc04000000b0055c7d377d9dmr481849edr.2.1706065216428; Tue, 23 Jan 2024 19:00:16 -0800 (PST) Received: from mosaic.enunes.eu (ip-78-45-66-209.bb.vodafone.cz. [78.45.66.209]) by smtp.gmail.com with ESMTPSA id dj17-20020a05640231b100b00559bb146ecbsm9637914edb.6.2024.01.23.19.00.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jan 2024 19:00:15 -0800 (PST) From: Erico Nunes To: Qiang Yu , anarsoul@gmail.com, christian.koenig@amd.com, dri-devel@lists.freedesktop.org, lima@lists.freedesktop.org Cc: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Sumit Semwal , linux-kernel@vger.kernel.org, Erico Nunes Subject: [PATCH v2 8/8] drm/lima: standardize debug messages by ip name Date: Wed, 24 Jan 2024 03:59:47 +0100 Message-ID: <20240124025947.2110659-9-nunes.erico@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240124025947.2110659-1-nunes.erico@gmail.com> References: <20240124025947.2110659-1-nunes.erico@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788939237834759602 X-GMAIL-MSGID: 1788939237834759602 Some debug messages carried the ip name, or included "lima", or included both the ip name and then the numbered ip name again. Make the messages more consistent by always looking up and showing the ip name first. Signed-off-by: Erico Nunes --- drivers/gpu/drm/lima/lima_gp.c | 20 +++++++++++--------- drivers/gpu/drm/lima/lima_l2_cache.c | 6 ++++-- drivers/gpu/drm/lima/lima_mmu.c | 18 +++++++++--------- drivers/gpu/drm/lima/lima_pmu.c | 3 ++- drivers/gpu/drm/lima/lima_pp.c | 19 ++++++++++--------- 5 files changed, 36 insertions(+), 30 deletions(-) diff --git a/drivers/gpu/drm/lima/lima_gp.c b/drivers/gpu/drm/lima/lima_gp.c index 4355fa7b17f4..6b354e2fb61d 100644 --- a/drivers/gpu/drm/lima/lima_gp.c +++ b/drivers/gpu/drm/lima/lima_gp.c @@ -34,11 +34,11 @@ static irqreturn_t lima_gp_irq_handler(int irq, void *data) if (state & LIMA_GP_IRQ_MASK_ERROR) { if ((state & LIMA_GP_IRQ_MASK_ERROR) == LIMA_GP_IRQ_PLBU_OUT_OF_MEM) { - dev_dbg(dev->dev, "gp out of heap irq status=%x\n", - status); + dev_dbg(dev->dev, "%s out of heap irq status=%x\n", + lima_ip_name(ip), status); } else { - dev_err(dev->dev, "gp error irq state=%x status=%x\n", - state, status); + dev_err(dev->dev, "%s error irq state=%x status=%x\n", + lima_ip_name(ip), state, status); if (task) task->recoverable = false; } @@ -89,7 +89,8 @@ static int lima_gp_soft_reset_async_wait(struct lima_ip *ip) v & LIMA_GP_IRQ_RESET_COMPLETED, 0, 100); if (err) { - dev_err(dev->dev, "gp soft reset time out\n"); + dev_err(dev->dev, "%s soft reset time out\n", + lima_ip_name(ip)); return err; } @@ -194,7 +195,7 @@ static int lima_gp_hard_reset(struct lima_ip *ip) gp_write(LIMA_GP_CMD, LIMA_GP_CMD_RESET); ret = lima_poll_timeout(ip, lima_gp_hard_reset_poll, 10, 100); if (ret) { - dev_err(dev->dev, "gp hard reset timeout\n"); + dev_err(dev->dev, "%s hard reset timeout\n", lima_ip_name(ip)); return ret; } @@ -220,8 +221,9 @@ static void lima_gp_task_error(struct lima_sched_pipe *pipe) { struct lima_ip *ip = pipe->processor[0]; - dev_err(ip->dev->dev, "gp task error int_state=%x status=%x\n", - gp_read(LIMA_GP_INT_STAT), gp_read(LIMA_GP_STATUS)); + dev_err(ip->dev->dev, "%s task error int_state=%x status=%x\n", + lima_ip_name(ip), gp_read(LIMA_GP_INT_STAT), + gp_read(LIMA_GP_STATUS)); lima_gp_hard_reset(ip); } @@ -324,7 +326,7 @@ int lima_gp_init(struct lima_ip *ip) err = devm_request_irq(dev->dev, ip->irq, lima_gp_irq_handler, IRQF_SHARED, lima_ip_name(ip), ip); if (err) { - dev_err(dev->dev, "gp %s fail to request irq\n", + dev_err(dev->dev, "%s fail to request irq\n", lima_ip_name(ip)); return err; } diff --git a/drivers/gpu/drm/lima/lima_l2_cache.c b/drivers/gpu/drm/lima/lima_l2_cache.c index c4080a02957b..184106ce55f8 100644 --- a/drivers/gpu/drm/lima/lima_l2_cache.c +++ b/drivers/gpu/drm/lima/lima_l2_cache.c @@ -21,7 +21,8 @@ static int lima_l2_cache_wait_idle(struct lima_ip *ip) !(v & LIMA_L2_CACHE_STATUS_COMMAND_BUSY), 0, 1000); if (err) { - dev_err(dev->dev, "l2 cache wait command timeout\n"); + dev_err(dev->dev, "%s wait command timeout\n", + lima_ip_name(ip)); return err; } return 0; @@ -83,7 +84,8 @@ int lima_l2_cache_init(struct lima_ip *ip) spin_lock_init(&ip->data.lock); size = l2_cache_read(LIMA_L2_CACHE_SIZE); - dev_info(dev->dev, "l2 cache %uK, %u-way, %ubyte cache line, %ubit external bus\n", + dev_info(dev->dev, "%s %uK, %u-way, %ubyte cache line, %ubit external bus\n", + lima_ip_name(ip), 1 << (((size >> 16) & 0xff) - 10), 1 << ((size >> 8) & 0xff), 1 << (size & 0xff), diff --git a/drivers/gpu/drm/lima/lima_mmu.c b/drivers/gpu/drm/lima/lima_mmu.c index a1ae6c252dc2..e18317c5ca8c 100644 --- a/drivers/gpu/drm/lima/lima_mmu.c +++ b/drivers/gpu/drm/lima/lima_mmu.c @@ -22,7 +22,8 @@ cond, 0, 100); \ if (__ret) \ dev_err(dev->dev, \ - "mmu command %x timeout\n", cmd); \ + "%s command %x timeout\n", \ + lima_ip_name(ip), cmd); \ __ret; \ }) @@ -40,14 +41,13 @@ static irqreturn_t lima_mmu_irq_handler(int irq, void *data) if (status & LIMA_MMU_INT_PAGE_FAULT) { u32 fault = mmu_read(LIMA_MMU_PAGE_FAULT_ADDR); - dev_err(dev->dev, "mmu page fault at 0x%x from bus id %d of type %s on %s\n", - fault, LIMA_MMU_STATUS_BUS_ID(status), - status & LIMA_MMU_STATUS_PAGE_FAULT_IS_WRITE ? "write" : "read", - lima_ip_name(ip)); + dev_err(dev->dev, "%s page fault at 0x%x from bus id %d of type %s\n", + lima_ip_name(ip), fault, LIMA_MMU_STATUS_BUS_ID(status), + status & LIMA_MMU_STATUS_PAGE_FAULT_IS_WRITE ? "write" : "read"); } if (status & LIMA_MMU_INT_READ_BUS_ERROR) - dev_err(dev->dev, "mmu %s irq bus error\n", lima_ip_name(ip)); + dev_err(dev->dev, "%s irq bus error\n", lima_ip_name(ip)); /* mask all interrupts before resume */ mmu_write(LIMA_MMU_INT_MASK, 0); @@ -102,14 +102,14 @@ int lima_mmu_init(struct lima_ip *ip) mmu_write(LIMA_MMU_DTE_ADDR, 0xCAFEBABE); if (mmu_read(LIMA_MMU_DTE_ADDR) != 0xCAFEB000) { - dev_err(dev->dev, "mmu %s dte write test fail\n", lima_ip_name(ip)); + dev_err(dev->dev, "%s dte write test fail\n", lima_ip_name(ip)); return -EIO; } err = devm_request_irq(dev->dev, ip->irq, lima_mmu_irq_handler, IRQF_SHARED, lima_ip_name(ip), ip); if (err) { - dev_err(dev->dev, "mmu %s fail to request irq\n", lima_ip_name(ip)); + dev_err(dev->dev, "%s fail to request irq\n", lima_ip_name(ip)); return err; } @@ -152,7 +152,7 @@ void lima_mmu_page_fault_resume(struct lima_ip *ip) u32 v; if (status & LIMA_MMU_STATUS_PAGE_FAULT_ACTIVE) { - dev_info(dev->dev, "mmu resume\n"); + dev_info(dev->dev, "%s resume\n", lima_ip_name(ip)); mmu_write(LIMA_MMU_INT_MASK, 0); mmu_write(LIMA_MMU_DTE_ADDR, 0xCAFEBABE); diff --git a/drivers/gpu/drm/lima/lima_pmu.c b/drivers/gpu/drm/lima/lima_pmu.c index e397e1146e96..113cb9b215cd 100644 --- a/drivers/gpu/drm/lima/lima_pmu.c +++ b/drivers/gpu/drm/lima/lima_pmu.c @@ -21,7 +21,8 @@ static int lima_pmu_wait_cmd(struct lima_ip *ip) v, v & LIMA_PMU_INT_CMD_MASK, 100, 100000); if (err) { - dev_err(dev->dev, "timeout wait pmu cmd\n"); + dev_err(dev->dev, "%s timeout wait pmu cmd\n", + lima_ip_name(ip)); return err; } diff --git a/drivers/gpu/drm/lima/lima_pp.c b/drivers/gpu/drm/lima/lima_pp.c index ac097dd75072..d0d2db0ef1ce 100644 --- a/drivers/gpu/drm/lima/lima_pp.c +++ b/drivers/gpu/drm/lima/lima_pp.c @@ -26,8 +26,8 @@ static void lima_pp_handle_irq(struct lima_ip *ip, u32 state) if (state & LIMA_PP_IRQ_MASK_ERROR) { u32 status = pp_read(LIMA_PP_STATUS); - dev_err(dev->dev, "pp error irq state=%x status=%x\n", - state, status); + dev_err(dev->dev, "%s error irq state=%x status=%x\n", + lima_ip_name(ip), state, status); pipe->error = true; @@ -125,7 +125,7 @@ static int lima_pp_soft_reset_async_wait_one(struct lima_ip *ip) ret = lima_poll_timeout(ip, lima_pp_soft_reset_poll, 0, 100); if (ret) { - dev_err(dev->dev, "pp %s reset time out\n", lima_ip_name(ip)); + dev_err(dev->dev, "%s reset time out\n", lima_ip_name(ip)); return ret; } @@ -190,14 +190,14 @@ static int lima_pp_hard_reset(struct lima_ip *ip) pp_write(LIMA_PP_CTRL, LIMA_PP_CTRL_STOP_BUS); ret = lima_poll_timeout(ip, lima_pp_bus_stop_poll, 10, 100); if (ret) { - dev_err(dev->dev, "pp %s bus stop timeout\n", lima_ip_name(ip)); + dev_err(dev->dev, "%s bus stop timeout\n", lima_ip_name(ip)); return ret; } pp_write(LIMA_PP_CTRL, LIMA_PP_CTRL_FORCE_RESET); ret = lima_poll_timeout(ip, lima_pp_hard_reset_poll, 10, 100); if (ret) { - dev_err(dev->dev, "pp hard reset timeout\n"); + dev_err(dev->dev, "%s hard reset timeout\n", lima_ip_name(ip)); return ret; } @@ -274,7 +274,7 @@ int lima_pp_init(struct lima_ip *ip) err = devm_request_irq(dev->dev, ip->irq, lima_pp_irq_handler, IRQF_SHARED, lima_ip_name(ip), ip); if (err) { - dev_err(dev->dev, "pp %s fail to request irq\n", + dev_err(dev->dev, "%s fail to request irq\n", lima_ip_name(ip)); return err; } @@ -309,7 +309,7 @@ int lima_pp_bcast_init(struct lima_ip *ip) err = devm_request_irq(dev->dev, ip->irq, lima_pp_bcast_irq_handler, IRQF_SHARED, lima_ip_name(ip), ip); if (err) { - dev_err(dev->dev, "pp %s fail to request irq\n", + dev_err(dev->dev, "%s fail to request irq\n", lima_ip_name(ip)); return err; } @@ -423,8 +423,9 @@ static void lima_pp_task_error(struct lima_sched_pipe *pipe) for (i = 0; i < pipe->num_processor; i++) { struct lima_ip *ip = pipe->processor[i]; - dev_err(ip->dev->dev, "pp task error %d int_state=%x status=%x\n", - i, pp_read(LIMA_PP_INT_STATUS), pp_read(LIMA_PP_STATUS)); + dev_err(ip->dev->dev, "%s task error %d int_state=%x status=%x\n", + lima_ip_name(ip), i, pp_read(LIMA_PP_INT_STATUS), + pp_read(LIMA_PP_STATUS)); lima_pp_hard_reset(ip); }