Received: by 2002:a05:7412:1e0b:b0:fc:a2b0:25d7 with SMTP id kr11csp741818rdb; Thu, 15 Feb 2024 14:10:57 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXJYlzQ0NSn4eFkXCkfTOfoqx5H5nZGejqFk2UeYGtjXEhLqYCly23qQQoTVuc92zVEdO9ovxjx2lWQ1OIjcmK/0EXWaw/tiAPdaRtEWA== X-Google-Smtp-Source: AGHT+IHehpj7cIf0WxK4xopIq/i42pQ7eDesP+svyCB7fdhrH5Q2V3VcBK8N+qI1vkmNbJFx5P4g X-Received: by 2002:a05:6214:4886:b0:68f:17d:45bf with SMTP id pc6-20020a056214488600b0068f017d45bfmr9654564qvb.26.1708035057653; Thu, 15 Feb 2024 14:10:57 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708035057; cv=pass; d=google.com; s=arc-20160816; b=zPCBQrLcFkUWjcjUlUs2JzriQ7r+56Ja1HzW3ifQIWFq9Vp3cj4eX+5zNd/eX+0N5B Lm5jDRmoGr2uAjr+K2ZW5Q0yXPYlDOmxw0ivwYikqAgdvoGEUnzclsa7OQZh+WseYVyZ Zu1dySj8QD7YS8L/adHp4Rmxx3lSYYT9ZhEE7Qk5+CKcxu+6iMg20uofEcFjLhR/loha 6ABkDgWEzSqWOfFwsybofjL0IwZ2qQtpd3TIVEySlsKsHrqi2gvCp/Gd6GU7ULJHW+Nd t0Ah1HeczMkIfRQaN9137mnQ89Zdri9kvQZBldk4B4fGZpXuNo+fy7cdHoHIBkQuVO/J /9bw== 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=5LerAFfyndDwaim6ezZwBkxBwQM30xrAj4RWbdAGWGI=; fh=Usz7XAB1EI7Q/DdLEXd449E1MLGpSzqdCCNe5XKh9R0=; b=pmvKdg04b6du24mTth7OuKXHOXnDlRZq5lgOnxn3K+h2PP7VvIRIYEHulRmi3DouWk aGuOFOO1/V68CneRAOOLGrTHbcG+qRNpvdR7Sx4a3Op7EH0gdiRrWQ8BDbH9vEfbiZUb 613xogqL9i7aYciYBl3ySqr2+TgWCmeIBNL5KVqzJQ98gBWoT3U9t0MLJlbr2VlVisUA kJ6lSrxmuXMIXBTojmn3MEO/QSZu8pohEsNVjHKldaEy0yEt7Jpz7M4bOwMp0PK8mesD Jd25FsRVjMWrVYb/+8HR/OwlNakK/8HGxYl3xKI7BzAyKprrtUs6f3eKbI6526wl+J/Q TBkA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=rvbylwj3; arc=pass (i=1 spf=pass spfdomain=linux.ibm.com dkim=pass dkdomain=ibm.com dmarc=pass fromdomain=linux.ibm.com); spf=pass (google.com: domain of linux-kernel+bounces-67744-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-67744-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id fo10-20020ad45f0a000000b0068c4ff28befsi2404746qvb.202.2024.02.15.14.10.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Feb 2024 14:10:57 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-67744-linux.lists.archive=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=@ibm.com header.s=pp1 header.b=rvbylwj3; arc=pass (i=1 spf=pass spfdomain=linux.ibm.com dkim=pass dkdomain=ibm.com dmarc=pass fromdomain=linux.ibm.com); spf=pass (google.com: domain of linux-kernel+bounces-67744-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-67744-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=NONE dis=NONE) header.from=ibm.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 69C2E1C21633 for ; Thu, 15 Feb 2024 22:10:57 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C06091487F3; Thu, 15 Feb 2024 22:08:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="rvbylwj3" Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 769FA1468E0; Thu, 15 Feb 2024 22:08:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.158.5 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708034908; cv=none; b=W5RGhVfWKWEnePnox6y72ELRQhueBahYjP3RrEXl2K4TJhXcdtLuMlJvk3Dz8hY8/+9BWLu93rq84vMeoP/PLsSmWd38kh0OLmYu2ypISYcRJ1Ve7uPkeso01goYzPZChNu7DguKu/j1Q3gIcj8p5krgH7sTJEWmkZ519GNa51g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708034908; c=relaxed/simple; bh=kx+oOcwZGizk7pnn1u+NW+Z8JFTuM9vEKXNINaOBa4U=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=iqzQvCVZi8OKdKzGhX9IYKWLPBBHl5BiPkcbRZ4+1YX+cLL8o6ZFeKWVMn8LYtOdmP1ZkENq0d8ssueI+fJy5LecueR40e8/vsWOzboGxSUhP7nb1svHup6uCOHYDT3aSINlfJ9BgQauUkfNQcNSn5LCM7yJsvD1p68Ef5jvrsE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=rvbylwj3; arc=none smtp.client-ip=148.163.158.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 41FKYRVt017474; Thu, 15 Feb 2024 22:08:13 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=5LerAFfyndDwaim6ezZwBkxBwQM30xrAj4RWbdAGWGI=; b=rvbylwj3uNm84Yg8IZ8AmEC9KW+ip/yxe3F8Xxk9QwOJffA0cFQ+zXkN9FbFHaCOGRaP 6qeFiEtlAMRdXWuShuzG5XFOPolm4P3zZhagWiz+rUpdfvMoETtiE+VuoLm09RleG/VD Xbz0O3sPHl2q02zFH6EkkYjLi3xWX6bm1prJoHelFjtf+NR9biYZ5o966gmGgEgfS7V0 zg/4DjcOaXNsTTbbK2hngtWsnrVMvmmH4HGFoDyJJzrOu+vz1zdnkyvbI3kAVIqal7km 6un2AOF9ZFhXCfXO8L4cIr/BeF3KYpLtQoFR457x9TYmgtPN4OKybtGKPVL/NTE/Ewqk 7w== Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3w9q0v5yea-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 15 Feb 2024 22:08:13 +0000 Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 41FJBGLp004329; Thu, 15 Feb 2024 22:08:12 GMT Received: from smtprelay01.wdc07v.mail.ibm.com ([172.16.1.68]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3w6kv0qtn2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 15 Feb 2024 22:08:12 +0000 Received: from smtpav03.dal12v.mail.ibm.com (smtpav03.dal12v.mail.ibm.com [10.241.53.102]) by smtprelay01.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 41FM89Rw21365500 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 15 Feb 2024 22:08:11 GMT Received: from smtpav03.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6DE1F58060; Thu, 15 Feb 2024 22:08:09 +0000 (GMT) Received: from smtpav03.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 190D45806E; Thu, 15 Feb 2024 22:08:09 +0000 (GMT) Received: from slate16.aus.stglabs.ibm.com (unknown [9.61.14.18]) by smtpav03.dal12v.mail.ibm.com (Postfix) with ESMTP; Thu, 15 Feb 2024 22:08:09 +0000 (GMT) From: Eddie James To: linux-fsi@lists.ozlabs.org Cc: linux-kernel@vger.kernel.org, linux-i2c@vger.kernel.org, linux-clk@vger.kernel.org, devicetree@vger.kernel.org, andi.shyti@kernel.org, eajames@linux.ibm.com, alistair@popple.id.au, joel@jms.id.au, jk@ozlabs.org, sboyd@kernel.org, mturquette@baylibre.com, robh@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org Subject: [PATCH 21/33] fsi: aspeed: Disable relative addressing and IPOLL for cfam reset Date: Thu, 15 Feb 2024 16:07:47 -0600 Message-Id: <20240215220759.976998-22-eajames@linux.ibm.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20240215220759.976998-1-eajames@linux.ibm.com> References: <20240215220759.976998-1-eajames@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: DLTbBjd4rEoyNcRpFr0bLTlWQFAo-f3e X-Proofpoint-GUID: DLTbBjd4rEoyNcRpFr0bLTlWQFAo-f3e X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-15_20,2024-02-14_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 adultscore=0 suspectscore=0 phishscore=0 mlxlogscore=781 clxscore=1015 impostorscore=0 malwarescore=0 lowpriorityscore=0 spamscore=0 bulkscore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2402150171 Need to disable these for the master reset after cfam reset. Signed-off-by: Eddie James --- drivers/fsi/fsi-master-aspeed.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/fsi/fsi-master-aspeed.c b/drivers/fsi/fsi-master-aspeed.c index 1cb5bf6c05d2..92b47bc9917a 100644 --- a/drivers/fsi/fsi-master-aspeed.c +++ b/drivers/fsi/fsi-master-aspeed.c @@ -375,11 +375,18 @@ static ssize_t cfam_reset_store(struct device *dev, struct device_attribute *att trace_fsi_master_aspeed_cfam_reset(true); spin_lock_irqsave(&aspeed->lock, flags); + + opb_writel(aspeed, ctrl_base + FSI_MMODE, + cpu_to_be32(aspeed->master.mmode & ~(FSI_MMODE_EIP | FSI_MMODE_RELA))); + gpiod_set_value(aspeed->cfam_reset_gpio, 1); udelay(900); gpiod_set_value(aspeed->cfam_reset_gpio, 0); udelay(900); + opb_writel(aspeed, ctrl_base + FSI_MRESP0, cpu_to_be32(FSI_MRESP_RST_ALL_MASTER)); + opb_writel(aspeed, ctrl_base + FSI_MMODE, cpu_to_be32(aspeed->master.mmode)); + spin_unlock_irqrestore(&aspeed->lock, flags); trace_fsi_master_aspeed_cfam_reset(false); -- 2.39.3