From patchwork Wed Apr 5 02:06:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Bostic X-Patchwork-Id: 9663153 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BA22260353 for ; Wed, 5 Apr 2017 07:30:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A9E25284D5 for ; Wed, 5 Apr 2017 07:30:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9E3A128535; Wed, 5 Apr 2017 07:30:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 86CDE284D5 for ; Wed, 5 Apr 2017 07:30:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id: References:In-Reply-To:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=iDZVCH2U5G/0sNBiHJOoxfE0GoRG4VADPagVQyvooD0=; b=sVvf/auxCUtH7RLkzGlYKSIeR6 rtMqFvgB04my8fOa518exKZW8XRT23NqYnZhn6SHCXSDBIQgTe3hBmhUXmAD0lXJNH5YCIexpFsbI DJ4UzTs/Qh0FoTwc6zNRyrTrd/VyGkTjGrD1tcO92+fvBxuFYsm3u+iXOXh5Q2KjemiTcG/GtHh/q 7yMJOd+FKicGex4LZ3hlLuACIlTy/nRfTAHCULss10w2JQiroq3Oa5c0QEabrlIlF8wTUJn2fSF20 AwNWkbgvw5jJmqUO3zETZGJKcbE0WwL+5Ke7Mr5ubMnluRWcg1JzaTJ4WpX2Al3PUX/jx1LDtWG4h OPS4D1Sw==; Received: from [127.0.0.1] (helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cved8-0003C0-7J; Wed, 05 Apr 2017 06:41:34 +0000 Received: from [2001:4978:20e::2] (helo=merlin.infradead.org) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cvamd-0004UP-Ij for linux-arm-kernel@bombadil.infradead.org; Wed, 05 Apr 2017 02:35:00 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Message-Id:References:In-Reply-To:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=Nj6i1DepXFqVnJi9sWHzia2/YxT/BSlZon7++QKCzcw=; b=xTMpdOcXu0O02g1/fbuoQSOCP A2LumYXs7A2/f4Tar78db1A/buzwxANE5hSM2SlCFEqb3gwJ2nKLstG3afghiVQnoy1NwbG8GcBoi Jf6GiSFCOsPVPBN0LnSTm9zcQxoeluHzOfDWpNRKfNg1lJYlXXgF/3wA7BCYJvMHYv1V9r2M4eezw agM046gAp4Jf04geOvucrr9KbtTh6ZWwHYepOilK9DDsabgjULKOFVD++6VRQIsyQdL2MXiju8Vi2 qpCLth0dGN6UkeiJzyK9hjJlN8qOQjWwT0Mu4aXvb+NT+w91VCC/z9WF3rudOAfjq9b1sj+G8rmCV ERitM3P6Q==; Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]) by merlin.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cvaT2-0006lx-5w for linux-arm-kernel@lists.infradead.org; Wed, 05 Apr 2017 02:14:41 +0000 Received: from pps.filterd (m0098409.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v3528jcC018138 for ; Tue, 4 Apr 2017 22:10:43 -0400 Received: from e15.ny.us.ibm.com (e15.ny.us.ibm.com [129.33.205.205]) by mx0a-001b2d01.pphosted.com with ESMTP id 29m51nn5k0-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Tue, 04 Apr 2017 22:10:42 -0400 Received: from localhost by e15.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 4 Apr 2017 22:10:41 -0400 Received: from b01cxnp23033.gho.pok.ibm.com (9.57.198.28) by e15.ny.us.ibm.com (146.89.104.202) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 4 Apr 2017 22:10:36 -0400 Received: from b01ledav004.gho.pok.ibm.com (b01ledav004.gho.pok.ibm.com [9.57.199.109]) by b01cxnp23033.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v352Ac5a44957750; Wed, 5 Apr 2017 02:10:38 GMT Received: from b01ledav004.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2D569112047; Tue, 4 Apr 2017 22:10:36 -0400 (EDT) Received: from Christophers-MacBook-Pro.local.com (unknown [9.81.217.91]) by b01ledav004.gho.pok.ibm.com (Postfix) with ESMTP id 4A67C11205E; Tue, 4 Apr 2017 22:10:25 -0400 (EDT) From: Christopher Bostic To: robh+dt@kernel.org, mark.rutland@arm.com, linux@armlinux.org.uk, rostedt@goodmis.org, mingo@redhat.com, gregkh@linuxfoundation.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v5 23/23] drivers/fsi: Use asynchronous slave mode Date: Tue, 4 Apr 2017 21:06:07 -0500 X-Mailer: git-send-email 2.10.1 (Apple Git-78) In-Reply-To: <20170405020607.79939-1-cbostic@linux.vnet.ibm.com> References: <20170405020607.79939-1-cbostic@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 17040502-0036-0000-0000-000001CFF0A7 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00006884; HX=3.00000240; KW=3.00000007; PH=3.00000004; SC=3.00000208; SDB=6.00843220; UDB=6.00415443; IPR=6.00621396; BA=6.00005266; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00014914; XFM=3.00000013; UTC=2017-04-05 02:10:40 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17040502-0037-0000-0000-00003F72B523 Message-Id: <20170405020607.79939-24-cbostic@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-04-05_01:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1702020001 definitions=main-1704050018 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170404_221440_410527_52DABD6D X-CRM114-Status: GOOD ( 14.30 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Chris Bostic , andrew@aj.id.au, alistair@popple.id.au, linux-kernel@vger.kernel.org, Jeremy Kerr , benh@kernel.crashing.org, joel@jms.id.au MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jeremy Kerr For slaves that are behind a software-clocked master, we want FSI CFAMs to run asynchronously to the FSI clock, so set up our slaves to be in async mode. Signed-off-by: Jeremy Kerr Signed-off-by: Chris Bostic --- drivers/fsi/fsi-core.c | 22 +++++++++++++++++++++- drivers/fsi/fsi-master-gpio.c | 1 + drivers/fsi/fsi-master.h | 2 ++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/drivers/fsi/fsi-core.c b/drivers/fsi/fsi-core.c index 747d0e3..a6ed34f 100644 --- a/drivers/fsi/fsi-core.c +++ b/drivers/fsi/fsi-core.c @@ -47,6 +47,7 @@ #define FSI_SMODE 0x0 /* R/W: Mode register */ #define FSI_SISC 0x8 /* R/W: Interrupt condition */ #define FSI_SSTAT 0x14 /* R : Slave status */ +#define FSI_LLMODE 0x100 /* R/W: Link layer mode register */ /* * SMODE fields @@ -62,6 +63,11 @@ #define FSI_SMODE_LBCRR_SHIFT 8 /* Clk ratio shift */ #define FSI_SMODE_LBCRR_MASK 0xf /* Clk ratio mask */ +/* + * LLMODE fields + */ +#define FSI_LLMODE_ASYNC 0x1 + #define FSI_SLAVE_SIZE_23b 0x800000 static DEFINE_IDA(master_ida); @@ -560,8 +566,8 @@ static void fsi_slave_release(struct device *dev) static int fsi_slave_init(struct fsi_master *master, int link, uint8_t id) { + uint32_t chip_id, llmode; struct fsi_slave *slave; - uint32_t chip_id; uint8_t crc; int rc; @@ -597,6 +603,20 @@ static int fsi_slave_init(struct fsi_master *master, int link, uint8_t id) return -ENODEV; } + /* If we're behind a master that doesn't provide a self-running bus + * clock, put the slave into async mode + */ + if (master->flags & FSI_MASTER_FLAG_SWCLOCK) { + llmode = cpu_to_be32(FSI_LLMODE_ASYNC); + rc = fsi_master_write(master, link, id, + FSI_SLAVE_BASE + FSI_LLMODE, + &llmode, sizeof(llmode)); + if (rc) + dev_warn(&master->dev, + "can't set llmode on slave:%02x:%02x %d\n", + link, id, rc); + } + /* We can communicate with a slave; create the slave device and * register. */ diff --git a/drivers/fsi/fsi-master-gpio.c b/drivers/fsi/fsi-master-gpio.c index 5d9e0b0..d5cce88 100644 --- a/drivers/fsi/fsi-master-gpio.c +++ b/drivers/fsi/fsi-master-gpio.c @@ -569,6 +569,7 @@ static int fsi_master_gpio_probe(struct platform_device *pdev) master->gpio_mux = gpio; master->master.n_links = 1; + master->master.flags = FSI_MASTER_FLAG_SWCLOCK; master->master.read = fsi_master_gpio_read; master->master.write = fsi_master_gpio_write; master->master.term = fsi_master_gpio_term; diff --git a/drivers/fsi/fsi-master.h b/drivers/fsi/fsi-master.h index d6a4885..fd39924 100644 --- a/drivers/fsi/fsi-master.h +++ b/drivers/fsi/fsi-master.h @@ -19,6 +19,8 @@ #include +#define FSI_MASTER_FLAG_SWCLOCK 0x1 + struct fsi_master { struct device dev; int idx;