From patchwork Fri Feb 23 12:57:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Piyush Malgujar X-Patchwork-Id: 205364 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp563331dyb; Fri, 23 Feb 2024 04:58:23 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWQAnTooHvU+gbND5X76LUJdMvhq3wP4E1clu9tqBbvOC1h+307gth35n52SjvgqxaxviY0gfFUtmd3ZeOEWRpyEMp9Tg== X-Google-Smtp-Source: AGHT+IHXtPNh34dS/BR7uPYpHocsCLuGCMHPibLCrkPxmUTKIwOv4jSla/+cmCBcZpQK0rqB8HO+ X-Received: by 2002:a05:6358:999e:b0:17a:d4ab:d94f with SMTP id j30-20020a056358999e00b0017ad4abd94fmr1569390rwb.15.1708693103143; Fri, 23 Feb 2024 04:58:23 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708693103; cv=pass; d=google.com; s=arc-20160816; b=da7x53n50tum/FybfZGlCvGd4ov/BG9QR+H/rR/OABPV2czf3pKRWFe71CJCle3cJR pUfYbODeIRggItIe0vN34YgmN35U5tbQWyiOEZLOGHd+DnIFSXz1J6lSIhm6d66BM4Ve o4G3vVnqKcG4Oo9l23j84i22acD4DgwC3XN1vGraoajgzrDHDFBVKADayAVoiUzGxE7h 5TQvw+eUbn4i3HsMpWakb3L9iMoGwzKjAjOqGhEErWNrX25zWbqNj+C8i4hCVWhHKgIM SHNevp76hgvt/J1wGPZFEDjH4imrlWRBih8ouxuOdM9Lx+9iaAYIJkRe3UjECne8tZ7v Gsjg== 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=GwvRYYZdi5O3wDBIPGDh5vFwFMLM3/N0QA1ur734xwM=; fh=muWlWwJ4vtusiFkSPO4ODu3uVC3omqD0R+HTzK+OqDs=; b=E09Ai6ziaGvjJascRaa2zol9k0E9E/45KSrKIW69xX4OSHMmOBJs6jeYRy7jqsaJkc 2tD3IHi62/j3asAF6en1tjqVjOYHhDKmmxGTEhYCxP9cce6u87/9WaEBNYddsbGx84RP 7IMWHYcpyRKnebVaXwqtYWdiYaQtdTPlCzAn7BdR4nOSLN64YheD2X8b2xDmOvGGPimQ XjGfAenx41S/8TFYgeHob4VNbkvGHN81eGidq5H59RzrX3rxtTnLaVMtjE89gNEI//7t 8pirQQf43rxPUelSDORdvZ3GrNUYs8xspDG8YL5p3giumKgeaS2OisTjlRZtvNu3vZ7f EvUg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@marvell.com header.s=pfpt0220 header.b=LXerqwCz; arc=pass (i=1 spf=pass spfdomain=marvell.com dkim=pass dkdomain=marvell.com dmarc=pass fromdomain=marvell.com); spf=pass (google.com: domain of linux-kernel+bounces-78335-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-78335-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=REJECT dis=NONE) header.from=marvell.com Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id le22-20020a056a004fd600b006e4d39b653fsi2559066pfb.243.2024.02.23.04.58.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Feb 2024 04:58:23 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-78335-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@marvell.com header.s=pfpt0220 header.b=LXerqwCz; arc=pass (i=1 spf=pass spfdomain=marvell.com dkim=pass dkdomain=marvell.com dmarc=pass fromdomain=marvell.com); spf=pass (google.com: domain of linux-kernel+bounces-78335-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-78335-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=REJECT dis=NONE) header.from=marvell.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 sv.mirrors.kernel.org (Postfix) with ESMTPS id E8710286094 for ; Fri, 23 Feb 2024 12:58:22 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id DD3AE7EEEC; Fri, 23 Feb 2024 12:57:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=marvell.com header.i=@marvell.com header.b="LXerqwCz" Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) (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 F22BC7E11F; Fri, 23 Feb 2024 12:57:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=67.231.148.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708693073; cv=none; b=D7iQL59jtfA5bUPiuw0Xm0TUY6fcNgJsWjb2LIvJsm1yU31DPvDe8znS9j1KnUYmZJf9dJRoVZsmraC7KI/N9AX6fc8VEqTPv5Bx0pFaC/m2IO4cobbXzS2tFFPQb2FStQdUPSTEUhClp3sThnw+DJLxDmOTubF6qaYAHBH9nhM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708693073; c=relaxed/simple; bh=fifXWDDp3PRP9IptU4B8W+G/9vNYUz8SwM1K6PMg+L4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=fivqM6Uhtm9ye/Ajn295B1Dy6grA3vtT6RNbQ4Yc++I2Svh14I2Goh6LfJvgci4LukLTDvRlJqpuWaN+eA7XLjaCyfqqPCY+IBt17i5oiKbt+h1WW+MFoFt00zVC4c8QsULmGpoK87gxBIXno8BJkyrW0RVfhRh+Vya558alZmQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=marvell.com; spf=pass smtp.mailfrom=marvell.com; dkim=pass (2048-bit key) header.d=marvell.com header.i=@marvell.com header.b=LXerqwCz; arc=none smtp.client-ip=67.231.148.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=marvell.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=marvell.com Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 41N1rEKh005070; Fri, 23 Feb 2024 04:57:49 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding:content-type; s= pfpt0220; bh=GwvRYYZdi5O3wDBIPGDh5vFwFMLM3/N0QA1ur734xwM=; b=LXe rqwCzs5gKAVDQ4t+y2xThlJOP37c7hzgr/MdlNEJfDqtaldIzNEsmKXCCjD8BEyw FPZfsiVn4f5Qs7jPy08jM1qXItTcWh4Z3S4MkLX85TuZKqFzEkEln0cvZymM0fBs KgwC/DQEg1ln8H5j2Izi1s9WlVU+oBwb+xybfMy19OjmYo0Yrl+gaY1KAmW/fxZn IzpfWf91cfvBPLL8vZ70l7LBjRXHeOOZOyvYH4JS+nlRxQP4GSVnoSmQE/dJjLek USCuUdOcLsDejQxXLeb4jHRqXOCzIohDtiYV8qBlatX3ELWq82hBM4hOvkkGOFJJ WhpcgH5Q+hjNdOWJ/HA== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3wej3j9ru2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Fri, 23 Feb 2024 04:57:49 -0800 (PST) Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.48; Fri, 23 Feb 2024 04:57:47 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.48 via Frontend Transport; Fri, 23 Feb 2024 04:57:47 -0800 Received: from Dell2s-9.sclab.marvell.com (unknown [10.110.150.250]) by maili.marvell.com (Postfix) with ESMTP id 26EEA3F70CA; Fri, 23 Feb 2024 04:57:47 -0800 (PST) From: Piyush Malgujar To: , , CC: , , , Piyush Malgujar Subject: [PATCH v4 2/4] i2c: thunderx: Add support for High speed mode Date: Fri, 23 Feb 2024 04:57:23 -0800 Message-ID: <20240223125725.1709624-3-pmalgujar@marvell.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240223125725.1709624-1-pmalgujar@marvell.com> References: <20240223125725.1709624-1-pmalgujar@marvell.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Proofpoint-GUID: 7HZHonmzPAtowD6_bD9CRkECbjsBx_Cg X-Proofpoint-ORIG-GUID: 7HZHonmzPAtowD6_bD9CRkECbjsBx_Cg 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-22_15,2024-02-23_01,2023-05-22_02 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791694579788903024 X-GMAIL-MSGID: 1791694579788903024 From: Suneel Garapati Support High speed mode clock setup for OcteonTX2 platforms. hs_mode bit in MODE register controls speed mode setup in controller and frequency is setup using set_clock function which sets up dividers for clock control register. Signed-off-by: Suneel Garapati Signed-off-by: Piyush Malgujar --- drivers/i2c/busses/i2c-octeon-core.c | 61 +++++++++++++++--------- drivers/i2c/busses/i2c-octeon-core.h | 6 +++ drivers/i2c/busses/i2c-thunderx-pcidrv.c | 3 +- 3 files changed, 47 insertions(+), 23 deletions(-) diff --git a/drivers/i2c/busses/i2c-octeon-core.c b/drivers/i2c/busses/i2c-octeon-core.c index 10330ed3203f9fd99d5c04dbaf29a9bd49ad0f4a..36e7beeab25c63c2341313d6aa3421049ad92990 100644 --- a/drivers/i2c/busses/i2c-octeon-core.c +++ b/drivers/i2c/busses/i2c-octeon-core.c @@ -612,25 +612,27 @@ int octeon_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) struct octeon_i2c *i2c = i2c_get_adapdata(adap); int i, ret = 0; - if (num == 1) { - if (msgs[0].len > 0 && msgs[0].len <= 8) { - if (msgs[0].flags & I2C_M_RD) - ret = octeon_i2c_hlc_read(i2c, msgs); - else - ret = octeon_i2c_hlc_write(i2c, msgs); - goto out; - } - } else if (num == 2) { - if ((msgs[0].flags & I2C_M_RD) == 0 && - (msgs[1].flags & I2C_M_RECV_LEN) == 0 && - msgs[0].len > 0 && msgs[0].len <= 2 && - msgs[1].len > 0 && msgs[1].len <= 8 && - msgs[0].addr == msgs[1].addr) { - if (msgs[1].flags & I2C_M_RD) - ret = octeon_i2c_hlc_comp_read(i2c, msgs); - else - ret = octeon_i2c_hlc_comp_write(i2c, msgs); - goto out; + if (IS_LS_FREQ(i2c->twsi_freq)) { + if (num == 1) { + if (msgs[0].len > 0 && msgs[0].len <= 8) { + if (msgs[0].flags & I2C_M_RD) + ret = octeon_i2c_hlc_read(i2c, msgs); + else + ret = octeon_i2c_hlc_write(i2c, msgs); + goto out; + } + } else if (num == 2) { + if ((msgs[0].flags & I2C_M_RD) == 0 && + (msgs[1].flags & I2C_M_RECV_LEN) == 0 && + msgs[0].len > 0 && msgs[0].len <= 2 && + msgs[1].len > 0 && msgs[1].len <= 8 && + msgs[0].addr == msgs[1].addr) { + if (msgs[1].flags & I2C_M_RD) + ret = octeon_i2c_hlc_comp_read(i2c, msgs); + else + ret = octeon_i2c_hlc_comp_write(i2c, msgs); + goto out; + } } } @@ -668,7 +670,7 @@ void octeon_i2c_set_clock(struct octeon_i2c *i2c) * Find divisors to produce target frequency, start with large delta * to cover wider range of divisors, note thp = TCLK half period. */ - unsigned int thp = TWSI_MASTER_CLK_REG_DEF_VAL, mdiv = 2, ndiv = 0; + unsigned int ds = 10, thp = TWSI_MASTER_CLK_REG_DEF_VAL, mdiv = 2, ndiv = 0; unsigned int delta_hz = INITIAL_DELTA_HZ; bool is_plat_otx2 = octeon_i2c_is_otx2(to_pci_dev(i2c->dev)); @@ -676,6 +678,8 @@ void octeon_i2c_set_clock(struct octeon_i2c *i2c) if (is_plat_otx2) { thp = TWSI_MASTER_CLK_REG_OTX2_VAL; mdiv_min = 0; + if (!IS_LS_FREQ(i2c->twsi_freq)) + ds = 15; } for (ndiv_idx = 0; ndiv_idx < 8 && delta_hz != 0; ndiv_idx++) { @@ -688,7 +692,7 @@ void octeon_i2c_set_clock(struct octeon_i2c *i2c) * For given ndiv and mdiv values check the * two closest thp values. */ - tclk = i2c->twsi_freq * (mdiv_idx + 1) * 10; + tclk = i2c->twsi_freq * (mdiv_idx + 1) * ds; tclk *= (1 << ndiv_idx); if (is_plat_otx2) thp_base = (i2c->sys_freq / tclk) - 2; @@ -706,7 +710,9 @@ void octeon_i2c_set_clock(struct octeon_i2c *i2c) foscl = i2c->sys_freq / (2 * (thp_idx + 1)); foscl = foscl / (1 << ndiv_idx); - foscl = foscl / (mdiv_idx + 1) / 10; + foscl = foscl / (mdiv_idx + 1) / ds; + if (foscl > i2c->twsi_freq) + continue; diff = abs(foscl - i2c->twsi_freq); /* * Diff holds difference between calculated frequency @@ -724,6 +730,17 @@ void octeon_i2c_set_clock(struct octeon_i2c *i2c) } octeon_i2c_reg_write(i2c, SW_TWSI_OP_TWSI_CLK, thp); octeon_i2c_reg_write(i2c, SW_TWSI_EOP_TWSI_CLKCTL, (mdiv << 3) | ndiv); + if (is_plat_otx2) { + u64 mode; + + mode = __raw_readq(i2c->twsi_base + MODE(i2c)); + /* Set REFCLK_SRC and HS_MODE in TWSX_MODE register */ + if (!IS_LS_FREQ(i2c->twsi_freq)) + mode |= TWSX_MODE_HS_MASK; + else + mode &= ~TWSX_MODE_HS_MASK; + octeon_i2c_writeq_flush(mode, i2c->twsi_base + MODE(i2c)); + } } int octeon_i2c_init_lowlevel(struct octeon_i2c *i2c) diff --git a/drivers/i2c/busses/i2c-octeon-core.h b/drivers/i2c/busses/i2c-octeon-core.h index 8a0033c94a8a291fb255b0da03858274035c46f4..5927d24926ce898efbee111046092960e48ce3ff 100644 --- a/drivers/i2c/busses/i2c-octeon-core.h +++ b/drivers/i2c/busses/i2c-octeon-core.h @@ -93,11 +93,16 @@ struct octeon_i2c_reg_offset { unsigned int sw_twsi; unsigned int twsi_int; unsigned int sw_twsi_ext; + unsigned int mode; }; #define SW_TWSI(x) (x->roff.sw_twsi) #define TWSI_INT(x) (x->roff.twsi_int) #define SW_TWSI_EXT(x) (x->roff.sw_twsi_ext) +#define MODE(x) (x->roff.mode) + +/* Set REFCLK_SRC and HS_MODE in TWSX_MODE register */ +#define TWSX_MODE_HS_MASK (BIT(4) | BIT(0)) struct octeon_i2c { wait_queue_head_t queue; @@ -212,6 +217,7 @@ static inline void octeon_i2c_write_int(struct octeon_i2c *i2c, u64 data) octeon_i2c_writeq_flush(data, i2c->twsi_base + TWSI_INT(i2c)); } +#define IS_LS_FREQ(twsi_freq) ((twsi_freq) <= 400000) #define PCI_SUBSYS_DEVID_9XXX 0xB /** * octeon_i2c_is_otx2 - check for chip ID diff --git a/drivers/i2c/busses/i2c-thunderx-pcidrv.c b/drivers/i2c/busses/i2c-thunderx-pcidrv.c index 75569774003857dc984e8540ef8f4d1bb084cfb0..31f11b77ab663626967c86086a03213876bf4a07 100644 --- a/drivers/i2c/busses/i2c-thunderx-pcidrv.c +++ b/drivers/i2c/busses/i2c-thunderx-pcidrv.c @@ -166,6 +166,7 @@ static int thunder_i2c_probe_pci(struct pci_dev *pdev, i2c->roff.sw_twsi = 0x1000; i2c->roff.twsi_int = 0x1010; i2c->roff.sw_twsi_ext = 0x1018; + i2c->roff.mode = 0x1038; i2c->dev = dev; pci_set_drvdata(pdev, i2c); @@ -210,7 +211,7 @@ static int thunder_i2c_probe_pci(struct pci_dev *pdev, * For OcteonTX2 chips, set reference frequency to 100MHz * as refclk_src in TWSI_MODE register defaults to 100MHz. */ - if (octeon_i2c_is_otx2(pdev)) + if (octeon_i2c_is_otx2(pdev) && IS_LS_FREQ(i2c->twsi_freq)) i2c->sys_freq = OTX2_REF_FREQ_DEFAULT; octeon_i2c_set_clock(i2c);