From patchwork Fri Oct 16 06:26:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Billy Tsai X-Patchwork-Id: 11841813 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4DEC2C433E7 for ; Fri, 16 Oct 2020 14:31:46 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DB72B2084C for ; Fri, 16 Oct 2020 14:31:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="ljHbTZ9V"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="VCz320zj" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DB72B2084C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=aspeedtech.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-ID: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=/BbnjFZ6Y4IAlcQuuDPY168N1OaI2xveHreYjW6oCus=; b=ljHbTZ9VCpV4ZITkBw7tDB/kr 8cQxYj7QXUY56d49XArs2opU3gItk2e8cxI4nIZCxvjdyW6oNls4gdFVCpOzgNu6k/L4YDBEy+jn4 3oFK8L198PF7ApOfEjEBFxYMVhicqzaxr3yG4T6Rsh8LxglvoxinhGUFUnHBb7yiJ81VMJS0jgYZf IcDRTJ6T1IW94x6jmdxU42lDFN+ne4oBZ9zozwJ593jzsi/9sjhnRbFBF63vlUZRDln28bf4IYniA WrMHXmtlB/eaZNtjX8pBwoVTQt0jCUn4xc10USdMwE/FF8wEZcGR5NQG4dzZT7eAsZBRycjmDaKKY Xd14DmZQQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kTQkL-00070u-8X; Fri, 16 Oct 2020 14:30:17 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kTQkI-0006zx-Kl for linux-arm-kernel@merlin.infradead.org; Fri, 16 Oct 2020 14:30:14 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Type:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:CC:To:From:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=aCDrh+K878cmVJqEeE2c7UOR+zA3fE5+f/fi8EmTkPI=; b=VCz320zjOemZVEplxvYXkHq4U9 uzTLguM5qKBU+bpBTaZTPrtVxzOIYNqWyBYHAW2P+lvY4uL6vTNnNMd8/5yLPMOgyWeWrz03YMlai 9DyPCLVd9FYEBJbiDRM9LducXgf1LZVGO/H3IM3Ldi6TWVMaGNrWavyYXuZcdPww27sIeRa6C9JCj 8UjkF83CANsc2+sQ4fPUXhdy87SeEWQtAvO0fv9tOLuOavGF/ouyuSUTovG2vmFhkaZfgCGp28JZV JR7GptcDdUHY2bzkpRL3Abq/u36VH7KEFz7V6dypRsBvRoj71OF+PcbcgniMmtTK9FHOVAoQQtAQ4 LNO6sZTA==; Received: from twspam01.aspeedtech.com ([211.20.114.71]) by casper.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kTJCN-0000q2-Ln for linux-arm-kernel@lists.infradead.org; Fri, 16 Oct 2020 06:26:46 +0000 Received: from mail.aspeedtech.com ([192.168.0.24]) by twspam01.aspeedtech.com with ESMTP id 09G6NjHu073155; Fri, 16 Oct 2020 14:23:45 +0800 (GMT-8) (envelope-from billy_tsai@aspeedtech.com) Received: from localhost.localdomain (192.168.10.9) by TWMBX02.aspeed.com (192.168.0.24) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 16 Oct 2020 14:26:08 +0800 From: Billy Tsai To: , , , , , , , , , , Subject: [PATCH 1/3] peci: aspeed: make the driver support 64byte mode Date: Fri, 16 Oct 2020 14:26:00 +0800 Message-ID: <20201016062602.20014-2-billy_tsai@aspeedtech.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201016062602.20014-1-billy_tsai@aspeedtech.com> References: <20201016062602.20014-1-billy_tsai@aspeedtech.com> MIME-Version: 1.0 X-Originating-IP: [192.168.10.9] X-ClientProxiedBy: TWMBX02.aspeed.com (192.168.0.24) To TWMBX02.aspeed.com (192.168.0.24) X-DNSRBL: X-MAIL: twspam01.aspeedtech.com 09G6NjHu073155 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201016_072644_607550_41089A8C X-CRM114-Status: GOOD ( 15.40 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: BMC-SW@aspeedtech.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org At ast2600 peci add the new feature can support the transfer size up to 64 bytes. We can use the dts property "64byte-mode" to enable it. Signed-off-by: Billy Tsai --- drivers/peci/busses/peci-aspeed.c | 67 +++++++++++++++++++++++++------ 1 file changed, 55 insertions(+), 12 deletions(-) diff --git a/drivers/peci/busses/peci-aspeed.c b/drivers/peci/busses/peci-aspeed.c index 2673d4c4dcf9..d6039b1c4494 100644 --- a/drivers/peci/busses/peci-aspeed.c +++ b/drivers/peci/busses/peci-aspeed.c @@ -28,6 +28,9 @@ #define ASPEED_PECI_CTRL_INVERT_IN BIT(6) #define ASPEED_PECI_CTRL_BUS_CONTENT_EN BIT(5) #define ASPEED_PECI_CTRL_PECI_EN BIT(4) +#define ASPEED_PECI_CTRL_64BYTE_MODE_EN BIT(1) +#define ASPEED_PECI_32BYTE_MODE 0 +#define ASPEED_PECI_64BYTE_MODE 1 #define ASPEED_PECI_CTRL_PECI_CLK_EN BIT(0) /* Timing Negotiation Register */ @@ -79,7 +82,7 @@ #define ASPEED_PECI_INT_TIMING_RESULT_MASK GENMASK(29, 16) /* bits[4..0]: Same bit fields in the 'Interrupt Register' */ -/* Rx/Tx Data Buffer Registers */ +/* 32Bytes mode: Rx/Tx Data Buffer Registers */ #define ASPEED_PECI_W_DATA0 0x20 #define ASPEED_PECI_W_DATA1 0x24 #define ASPEED_PECI_W_DATA2 0x28 @@ -96,7 +99,39 @@ #define ASPEED_PECI_R_DATA5 0x54 #define ASPEED_PECI_R_DATA6 0x58 #define ASPEED_PECI_R_DATA7 0x5c -#define ASPEED_PECI_DATA_BUF_SIZE_MAX 32 +/* 64Bytes mode: Rx/Tx Data Buffer Registers */ +#define ASPEED_PECI_64B_W_DATA0 0x80 +#define ASPEED_PECI_64B_W_DATA1 0x84 +#define ASPEED_PECI_64B_W_DATA2 0x88 +#define ASPEED_PECI_64B_W_DATA3 0x8C +#define ASPEED_PECI_64B_W_DATA4 0x90 +#define ASPEED_PECI_64B_W_DATA5 0x94 +#define ASPEED_PECI_64B_W_DATA6 0x98 +#define ASPEED_PECI_64B_W_DATA7 0x9C +#define ASPEED_PECI_64B_W_DATA8 0xA0 +#define ASPEED_PECI_64B_W_DATA9 0xA4 +#define ASPEED_PECI_64B_W_DATAA 0xA8 +#define ASPEED_PECI_64B_W_DATAB 0xAC +#define ASPEED_PECI_64B_W_DATAC 0xB0 +#define ASPEED_PECI_64B_W_DATAD 0xB4 +#define ASPEED_PECI_64B_W_DATAE 0xB8 +#define ASPEED_PECI_64B_W_DATAF 0xBC +#define ASPEED_PECI_64B_R_DATA0 0xC0 +#define ASPEED_PECI_64B_R_DATA1 0xC4 +#define ASPEED_PECI_64B_R_DATA2 0xC8 +#define ASPEED_PECI_64B_R_DATA3 0xCC +#define ASPEED_PECI_64B_R_DATA4 0xD0 +#define ASPEED_PECI_64B_R_DATA5 0xD4 +#define ASPEED_PECI_64B_R_DATA6 0xD8 +#define ASPEED_PECI_64B_R_DATA7 0xDC +#define ASPEED_PECI_64B_R_DATA8 0xE0 +#define ASPEED_PECI_64B_R_DATA9 0xE4 +#define ASPEED_PECI_64B_R_DATAA 0xE8 +#define ASPEED_PECI_64B_R_DATAB 0xEC +#define ASPEED_PECI_64B_R_DATAC 0xF0 +#define ASPEED_PECI_64B_R_DATAD 0xF4 +#define ASPEED_PECI_64B_R_DATAE 0xF8 +#define ASPEED_PECI_64B_R_DATAF 0xFC /* Timing Negotiation */ #define ASPEED_PECI_RD_SAMPLING_POINT_DEFAULT 8 @@ -125,6 +160,8 @@ struct aspeed_peci { struct completion xfer_complete; u32 status; u32 cmd_timeout_ms; + /* 0: older 32 bytes, 1 : 64bytes mode */ + int xfer_mode; }; static inline int aspeed_peci_check_idle(struct aspeed_peci *priv) @@ -144,12 +181,13 @@ static int aspeed_peci_xfer(struct peci_adapter *adapter, struct aspeed_peci *priv = peci_get_adapdata(adapter); long err, timeout = msecs_to_jiffies(priv->cmd_timeout_ms); u32 peci_head, peci_state, rx_data = 0; + u32 max_buffer_size = (priv->xfer_mode) ? 64 : 32; ulong flags; int i, ret; uint reg; - if (msg->tx_len > ASPEED_PECI_DATA_BUF_SIZE_MAX || - msg->rx_len > ASPEED_PECI_DATA_BUF_SIZE_MAX) + if (msg->tx_len > max_buffer_size || + msg->rx_len > max_buffer_size) return -EINVAL; /* Check command sts and bus idle state */ @@ -167,8 +205,11 @@ static int aspeed_peci_xfer(struct peci_adapter *adapter, writel(peci_head, priv->base + ASPEED_PECI_RW_LENGTH); for (i = 0; i < msg->tx_len; i += 4) { - reg = i < 16 ? ASPEED_PECI_W_DATA0 + i % 16 : - ASPEED_PECI_W_DATA4 + i % 16; + if (priv->xfer_mode) + reg = ASPEED_PECI_64B_W_DATA0 + i % 16; + else + reg = i < 16 ? ASPEED_PECI_W_DATA0 + i % 16 : + ASPEED_PECI_W_DATA4 + i % 16; writel(le32_to_cpup((__le32 *)&msg->tx_buf[i]), priv->base + reg); } @@ -215,8 +256,11 @@ static int aspeed_peci_xfer(struct peci_adapter *adapter, u8 byte_offset = i % 4; if (byte_offset == 0) { - reg = i < 16 ? ASPEED_PECI_R_DATA0 + i % 16 : - ASPEED_PECI_R_DATA4 + i % 16; + if (priv->xfer_mode) + reg = ASPEED_PECI_64B_R_DATA0 + i % 16; + else + reg = i < 16 ? ASPEED_PECI_R_DATA0 + i % 16 : + ASPEED_PECI_R_DATA4 + i % 16; rx_data = readl(priv->base + reg); } @@ -349,10 +393,8 @@ static int aspeed_peci_init_ctrl(struct aspeed_peci *priv) priv->cmd_timeout_ms = ASPEED_PECI_CMD_TIMEOUT_MS_DEFAULT; } - writel(FIELD_PREP(ASPEED_PECI_CTRL_CLK_DIV_MASK, - ASPEED_PECI_CLK_DIV_DEFAULT) | - ASPEED_PECI_CTRL_PECI_CLK_EN, priv->base + ASPEED_PECI_CTRL); - + if (of_property_read_bool(priv->dev->of_node, "64byte-mode")) + priv->xfer_mode = 1; /* * Timing negotiation period setting. * The unit of the programmed value is 4 times of PECI clock period. @@ -373,6 +415,7 @@ static int aspeed_peci_init_ctrl(struct aspeed_peci *priv) /* Read sampling point and clock speed setting */ writel(FIELD_PREP(ASPEED_PECI_CTRL_SAMPLING_MASK, rd_sampling_point) | FIELD_PREP(ASPEED_PECI_CTRL_CLK_DIV_MASK, clk_div_val) | + (priv->xfer_mode ? ASPEED_PECI_CTRL_64BYTE_MODE_EN : 0) | ASPEED_PECI_CTRL_PECI_EN | ASPEED_PECI_CTRL_PECI_CLK_EN, priv->base + ASPEED_PECI_CTRL);