From patchwork Mon Apr 15 01:14:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rashmica Gupta X-Patchwork-Id: 1085423 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44j9Wz6CQTz9s5c for ; Mon, 15 Apr 2019 11:14:39 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Q7ZZOXqu"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 44j9Wz4V2ZzDqK9 for ; Mon, 15 Apr 2019 11:14:39 +1000 (AEST) X-Original-To: pdbg@lists.ozlabs.org Delivered-To: pdbg@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::443; helo=mail-pf1-x443.google.com; envelope-from=rashmica.g@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Q7ZZOXqu"; dkim-atps=neutral Received: from mail-pf1-x443.google.com (mail-pf1-x443.google.com [IPv6:2607:f8b0:4864:20::443]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 44j9Wm4wbNzDqJs for ; Mon, 15 Apr 2019 11:14:28 +1000 (AEST) Received: by mail-pf1-x443.google.com with SMTP id c207so7731647pfc.7 for ; Sun, 14 Apr 2019 18:14:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=01R/ZR6VBa91wfCepcHE7iwEZoE4CkH0DWnEhHeiMZg=; b=Q7ZZOXqu+lp0TZSkU+Lfs0x+hDNca4sZnMt3lrfoFwVl15hVBc/1e/SzWqxmqurpwQ JWfXi3Tz8W25FBi+QomPdm25HFXf6KLDq3GkS69eKULh63VMH+JzEQmwwPLy125tm+RF RW6ELzDVr5UuKoafzdREP7Lt2TexuTF9DWhdl5wYdbt07AtKmGDeIvw0A/7Uu5UfidoZ EnmTJWEpmL+wKt0W6CPs6R/dP9WygcDTxcusUFkLG2ACBg1zzrljRgI0IN5t60UsEf6y pMJVb5m6cT9aA04VbnJT7jrnQseR+si3J+tB56usEFhl4xMqTJrGhnGxi61MQaSFYzAm JVHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=01R/ZR6VBa91wfCepcHE7iwEZoE4CkH0DWnEhHeiMZg=; b=ryggq+5k54vFEqHhfBTvkv+w1OihaGSNUerdZWYlY1osyxxrom1iR5H1hRBx9E0RuO hAc/gA1Vz4qKQuA8xHz7TqjZTklveOHx+UWRNTQuMVLpz3dPq9HjFvPUlG432y+RAzqO HacTT8Ee9M2agAl1+gIEtHV8aYS7rzckBs1Ch2KPPxT2NUVQoBAho4X+1XRDNAYiImip 6327GVEXjLR0n7BEIeQOXTadtRSn9RBhNJGIQQ0dCLxZeEaisrLS9FubRFKhpFzFr+sQ S1F8RLfs8c2OWj4H3rnY3zoVhdPwJ3AEAC+d5Pt74t3Q5hnvS1wjr0AU3UqpaRJtgL4H Y2jg== X-Gm-Message-State: APjAAAVdXZd8mzY9XnjdcdvQuuBDanclzPU+M1ONnGs67LOyfxzuezG6 qxFyoGBxNCnxSHGTRTbTL8PeSjeV X-Google-Smtp-Source: APXvYqxqbOXVZrNJ+G3/cWZV4mpmes5lGh1ixzeCi+3S6W6oysQgOWddEt8JCKH+kqxS9+rv5FV+Dw== X-Received: by 2002:aa7:8092:: with SMTP id v18mr70615260pff.35.1555290866080; Sun, 14 Apr 2019 18:14:26 -0700 (PDT) Received: from rashmica.ozlabs.ibm.com ([122.99.82.10]) by smtp.gmail.com with ESMTPSA id m7sm64205162pgg.62.2019.04.14.18.14.23 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 14 Apr 2019 18:14:25 -0700 (PDT) From: Rashmica Gupta To: pdbg@lists.ozlabs.org, alistair@popple.id.au, joel@jms.id.au Date: Mon, 15 Apr 2019 11:14:12 +1000 Message-Id: <20190415011414.22315-2-rashmica.g@gmail.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190415011414.22315-1-rashmica.g@gmail.com> References: <20190415011414.22315-1-rashmica.g@gmail.com> Subject: [Pdbg] [PATCH 1/3] libpdbg: use i2ctools lib X-BeenThere: pdbg@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "mailing list for https://github.com/open-power/pdbg development" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: pdbg-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Pdbg" This should do the same thing as the i2ctools i2cget cmd. Signed-off-by: Rashmica Gupta --- Makefile.am | 7 ++++ configure.ac | 5 +++ libpdbg/i2cm.c | 87 +++++++++++++++++++++++++++++++++++++++++++++++ libpdbg/libpdbg.h | 3 ++ libpdbg/target.c | 11 ++++++ libpdbg/target.h | 9 +++++ p9-i2c.dts.m4 | 21 ++++++++++++ p9-kernel.dts.m4 | 8 +++++ src/i2c.c | 48 ++++++++++++++++++++++++++ src/main.c | 5 +-- src/parsers.c | 18 ++++++++++ src/parsers.h | 2 ++ 12 files changed, 222 insertions(+), 2 deletions(-) create mode 100644 libpdbg/i2cm.c create mode 100644 p9-i2c.dts.m4 create mode 100644 src/i2c.c diff --git a/Makefile.am b/Makefile.am index d34cf20..25a6edb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -75,6 +75,7 @@ pdbg_SOURCES = \ src/cfam.c \ src/htm.c \ src/htm.h \ + src/i2c.c \ src/main.c \ src/main.h \ src/mem.c \ @@ -132,6 +133,11 @@ lib_LTLIBRARIES = libfdt.la libpdbg.la libfdt_la_CFLAGS = -I$(top_srcdir)/libfdt libpdbg_la_CFLAGS = -I$(top_srcdir)/libfdt -Wall -Werror +if I2CLIB +pdbg_LDADD += -li2c +else +libpdbg_la_CFLAGS += -DDISABLE_I2CLIB +endif libfdt_la_SOURCES = \ libfdt/fdt_addresses.c \ @@ -164,6 +170,7 @@ libpdbg_la_SOURCES = \ libpdbg/host.c \ libpdbg/htm.c \ libpdbg/i2c.c \ + libpdbg/i2cm.c \ libpdbg/kernel.c \ libpdbg/libpdbg.c \ libpdbg/libpdbg.h \ diff --git a/configure.ac b/configure.ac index a52e1ed..962be3a 100644 --- a/configure.ac +++ b/configure.ac @@ -42,4 +42,9 @@ want_gdbserver=false, want_gdbserver=true) AM_CONDITIONAL([GDBSERVER], [test x$want_gdbserver = xtrue]) +AC_ARG_ENABLE(i2clib, +AC_HELP_STRING([--disable-i2clib], [disables looking for the i2c lib]), +want_i2clib=false, +want_i2clib=true) +AM_CONDITIONAL([I2CLIB], [test x$want_i2clib = xtrue]) AC_OUTPUT diff --git a/libpdbg/i2cm.c b/libpdbg/i2cm.c new file mode 100644 index 0000000..0c8129b --- /dev/null +++ b/libpdbg/i2cm.c @@ -0,0 +1,87 @@ +/* Copyright 2019 IBM Corp. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "bitutils.h" +#include "operations.h" +#include "debug.h" + + +#include +#include +#include + +#ifndef DISABLE_I2CLIB +#include + +static int kernel_i2c_get(struct i2cm *i2cm, uint32_t addr, uint16_t size, uint8_t *data) +{ + int res = 0; + //fix this is smbus not i2cget + uint32_t offset = 0; + + if (ioctl(i2cm->i2c_fd, I2C_SLAVE, addr) < 0) + return -1; + + res = i2c_smbus_read_byte_data(i2cm->i2c_fd, offset); + if (res >= 0) { + PR_DEBUG("read %x from device %x\n", res, addr); + *data = (uint64_t)res; + return res; + } + return -1; +} + +static int i2cbus_probe(struct pdbg_target *target) +{ + int i2c_fd = 0; + int len; + char i2c_path[NAME_MAX]; + + if (!target->index) + return -1; + struct i2cm *i2cm = target_to_i2cm(target); + + len = snprintf(i2c_path, NAME_MAX, "/dev/i2c-%i", target->index); + if (len >= NAME_MAX) + return -1; + i2c_fd = open(i2c_path, O_RDWR); + if (!i2c_fd) + return -1; + i2cm->i2c_fd = i2c_fd; + return 0; +} + +static struct i2cm i2c_bus = { + .target = { + .name = "I2C Bus", + .compatible = "ibm,power9-i2c-port", + .class = "i2cm", + .probe = i2cbus_probe, + }, + .read = kernel_i2c_get, +}; +DECLARE_HW_UNIT(i2c_bus); +#endif diff --git a/libpdbg/libpdbg.h b/libpdbg/libpdbg.h index 4fad158..9baab0e 100644 --- a/libpdbg/libpdbg.h +++ b/libpdbg/libpdbg.h @@ -123,6 +123,9 @@ struct pdbg_target *pdbg_address_absolute(struct pdbg_target *target, uint64_t * int fsi_read(struct pdbg_target *target, uint32_t addr, uint32_t *val); int fsi_write(struct pdbg_target *target, uint32_t addr, uint32_t val); +int i2c_read(struct pdbg_target *target, uint16_t port, uint32_t addr, + uint16_t size, uint8_t *data); + int pib_read(struct pdbg_target *target, uint64_t addr, uint64_t *val); int pib_write(struct pdbg_target *target, uint64_t addr, uint64_t val); int pib_wait(struct pdbg_target *pib_dt, uint64_t addr, uint64_t mask, uint64_t data); diff --git a/libpdbg/target.c b/libpdbg/target.c index e678470..f577bb3 100644 --- a/libpdbg/target.c +++ b/libpdbg/target.c @@ -195,6 +195,17 @@ int opb_write(struct pdbg_target *opb_dt, uint32_t addr, uint32_t data) return opb->write(opb, addr64, data); } +int i2c_read(struct pdbg_target *i2cm_dt, uint16_t port, uint32_t addr, uint16_t size, uint8_t *data) +{ + struct i2cm *i2cm; + uint64_t addr64 = addr; + + i2cm_dt = get_class_target_addr(i2cm_dt, "i2cm", &addr64); + i2cm = target_to_i2cm(i2cm_dt); + + return i2cm->read(i2cm, addr, size, data); +} + int fsi_read(struct pdbg_target *fsi_dt, uint32_t addr, uint32_t *data) { struct fsi *fsi; diff --git a/libpdbg/target.h b/libpdbg/target.h index 04897ed..14f2b79 100644 --- a/libpdbg/target.h +++ b/libpdbg/target.h @@ -138,6 +138,15 @@ struct fsi { }; #define target_to_fsi(x) container_of(x, struct fsi, target) +struct i2cm { + struct pdbg_target target; + int (*read)(struct i2cm *, uint32_t, uint16_t, uint8_t *); + int (*write)(struct i2cm *, uint32_t, uint16_t, uint8_t*); + int i2c_fd; +}; +#define target_to_i2cm(x) container_of(x, struct i2cm, target) + + struct core { struct pdbg_target target; bool release_spwkup; diff --git a/p9-i2c.dts.m4 b/p9-i2c.dts.m4 new file mode 100644 index 0000000..8e8270f --- /dev/null +++ b/p9-i2c.dts.m4 @@ -0,0 +1,21 @@ +define(`I2CBUS', `i2c-bus@$1 { +bus-frequency = <0x61a80>; +compatible = "ibm,opal-i2c", "ibm,power8-i2c-port", "ibm,power9-i2c-port"; +index = <$1>; +reg = <0x0 0x0 $1>; +}')dnl + +I2CBUS(0); +I2CBUS(1); +I2CBUS(2); +I2CBUS(3); +I2CBUS(4); +I2CBUS(5); +I2CBUS(6); +I2CBUS(7); +I2CBUS(8); +I2CBUS(9); +I2CBUS(10); +I2CBUS(11); +I2CBUS(12); +I2CBUS(13); diff --git a/p9-kernel.dts.m4 b/p9-kernel.dts.m4 index 195be59..474beca 100644 --- a/p9-kernel.dts.m4 +++ b/p9-kernel.dts.m4 @@ -22,6 +22,14 @@ include(p9-pib.dts.m4)dnl }; + i2cm@1800 { + #address-cells = <0x2>; + #size-cells = <0x1>; + reg = <0x0 0x1800 0x400>; + compatible = "ibm,kernel-i2c-master"; + include(p9-i2c.dts.m4)dnl + }; + hmfsi@100000 { #address-cells = <0x2>; #size-cells = <0x1>; diff --git a/src/i2c.c b/src/i2c.c new file mode 100644 index 0000000..9ac3d53 --- /dev/null +++ b/src/i2c.c @@ -0,0 +1,48 @@ +/* Copyright 2019 IBM Corp. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include +#include + +#include "main.h" +#include "optcmd.h" +#include "path.h" +#include "target.h" + +static int geti2c(uint16_t port, uint32_t addr, uint16_t size) +{ + uint8_t *data = NULL; + struct pdbg_target *target, *selected = NULL; + + data = malloc(size); + assert(data); + + for_each_path_target_class("i2cbus", target) { + if (pdbg_target_probe(target) != PDBG_TARGET_ENABLED) + continue; + selected = target; + if (i2c_read(target, port, addr, size, data) == 0) + break; + break; + } + + if (selected == NULL) + return -1; + printf("data read: 0x%016" PRIx64 "\n", (uint64_t)*data); + return 0; +} +OPTCMD_DEFINE_CMD_WITH_ARGS(geti2c, geti2c, (DATA16, ADDRESS32, DATA16)); diff --git a/src/main.c b/src/main.c index d5f9385..1702efa 100644 --- a/src/main.c +++ b/src/main.c @@ -93,7 +93,7 @@ extern struct optcmd_cmd optcmd_threadstatus, optcmd_sreset, optcmd_regs, optcmd_probe, optcmd_getmem, optcmd_putmem, optcmd_getmemio, optcmd_putmemio, optcmd_getxer, optcmd_putxer, optcmd_getcr, optcmd_putcr, - optcmd_gdbserver; + optcmd_gdbserver, optcmd_geti2c; static struct optcmd_cmd *cmds[] = { &optcmd_getscom, &optcmd_putscom, &optcmd_getcfam, &optcmd_putcfam, @@ -103,7 +103,7 @@ static struct optcmd_cmd *cmds[] = { &optcmd_threadstatus, &optcmd_sreset, &optcmd_regs, &optcmd_probe, &optcmd_getmem, &optcmd_putmem, &optcmd_getmemio, &optcmd_putmemio, &optcmd_getxer, &optcmd_putxer, &optcmd_getcr, &optcmd_putcr, - &optcmd_gdbserver, + &optcmd_gdbserver, &optcmd_geti2c, }; /* Purely for printing usage text. We could integrate printing argument and flag @@ -145,6 +145,7 @@ static struct action actions[] = { { "sreset", "", "Reset" }, { "regs", "[--backtrace]", "State (optionally display backtrace)" }, { "gdbserver", "", "Start a gdb server" }, + { "geti2c", " ", "Read size bytes from the offset of specified device" }, }; static void print_usage(void) diff --git a/src/parsers.c b/src/parsers.c index 8575784..4c03db9 100644 --- a/src/parsers.c +++ b/src/parsers.c @@ -56,6 +56,24 @@ uint16_t *parse_number16(const char *argv) return n; } +uint8_t *parse_number8(const char *argv) +{ + unsigned long long tmp; + uint8_t *n = malloc(sizeof(*n)); + char *endptr; + + if (!argv) + return NULL; + + errno = 0; + tmp = strtoul(argv, &endptr, 0); + if (errno || *endptr != '\0' || tmp > UINT8_MAX) + return NULL; + + *n = tmp; + return n; +} + /* Parse an 8-bit number that is a power of 2 */ uint8_t *parse_number8_pow2(const char *argv) { diff --git a/src/parsers.h b/src/parsers.h index ba52178..27ada1f 100644 --- a/src/parsers.h +++ b/src/parsers.h @@ -9,6 +9,7 @@ #define DATA (parse_number64, NULL) #define DATA32 (parse_number32, NULL) #define DATA16 (parse_number16, NULL) +#define DATA8 (parse_number8, NULL) #define DEFAULT_DATA(default) (parse_number64, default) #define GPR (parse_gpr, NULL) #define SPR (parse_spr, NULL) @@ -16,6 +17,7 @@ uint64_t *parse_number64(const char *argv); uint32_t *parse_number32(const char *argv); uint16_t *parse_number16(const char *argv); +uint8_t *parse_number8(const char *argv); uint8_t *parse_number8_pow2(const char *argv); int *parse_gpr(const char *argv); int *parse_spr(const char *argv); From patchwork Mon Apr 15 01:14:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rashmica Gupta X-Patchwork-Id: 1085424 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44j9X15jM0z9s8m for ; Mon, 15 Apr 2019 11:14:41 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="QK6UEx28"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 44j9X12qBpzDqJt for ; Mon, 15 Apr 2019 11:14:41 +1000 (AEST) X-Original-To: pdbg@lists.ozlabs.org Delivered-To: pdbg@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::444; helo=mail-pf1-x444.google.com; envelope-from=rashmica.g@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="QK6UEx28"; dkim-atps=neutral Received: from mail-pf1-x444.google.com (mail-pf1-x444.google.com [IPv6:2607:f8b0:4864:20::444]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 44j9Wq2TL9zDqJq for ; Mon, 15 Apr 2019 11:14:31 +1000 (AEST) Received: by mail-pf1-x444.google.com with SMTP id z5so7739578pfn.3 for ; Sun, 14 Apr 2019 18:14:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=vSCyLzT8QigQ6ZVc3MefxmbZo5kIScYF2C9VSjvTrPk=; b=QK6UEx28VAcRBHLZG12fAwtrlT1AZ4O9SA9qc4weokDi3fkKd+N3eCCVIf24dic1/M HxUa4+bcilH3Tqotg8rx0OV7l3TvGVQ9NCHe0y0kkeHR0fIj1OyluuwNQdAppCcWOkCE jAaIVb3rsKySklPHWHQKe1d8GzzrRayPc7ZaFr/C1hkv9m11Ws8MttNGL9LOdw4n+XHd cPma/ElSQPcY6zkMFOZ7xcJob9GnpPI+Aagj/AP9IoNxH/s6H8VLJIYIQuB+T8iFQrvS MLskDrMVzUkp1Pqcu4LgUtynYbXaVoxRvkpy4NHjd1A5foq8lMu4RyMRc7qyz3Gv7wpH 14xQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=vSCyLzT8QigQ6ZVc3MefxmbZo5kIScYF2C9VSjvTrPk=; b=Pq9qiXdgeMHRvoDRuc5/VMmLgBUOb0zQDpm6Z6JxAdor7pIeqHsYQS0ClLBE+WLE5Y kBfZwCYfvQ2A8fVDlObdvu30rQ4mOZ4htBVNLTVHRmYoG3jysISfKVq2IGk4BKxndkNL KjityWu7uQ0ma1zpxVNGL2+XooEEPCNp462yA0+a+AWO8OM33c43G0wwRyvfmJYbvOvZ l0QM1/19WYTtt1QzfPdS5Hp+x9EcfWrasKpar0TyFKWnfxnNGAd5N2aRt/zs/KExCWFh tCaFXJiLuAdnsYnMq7QgtVnqdvyGCoGwUPXLKLDAmQ24jvzJjkb58Pjg/YmF4inAK89I J88g== X-Gm-Message-State: APjAAAVyctPcq88Wc/ulW00fKrAlyfXi7j9IBE1Gn5cuSKJwE5sX3jtp i/Jn2Qp34qYK95BstO+ZsTNYenYQ X-Google-Smtp-Source: APXvYqzAWQM5sOPedAaHha1Oc158S5r3ANwozDaPhsV4TrJEbXIM2H9RMXQ7I+0CR6GwGaXJ6Cz5oA== X-Received: by 2002:a65:5106:: with SMTP id f6mr66091945pgq.253.1555290868780; Sun, 14 Apr 2019 18:14:28 -0700 (PDT) Received: from rashmica.ozlabs.ibm.com ([122.99.82.10]) by smtp.gmail.com with ESMTPSA id m7sm64205162pgg.62.2019.04.14.18.14.26 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 14 Apr 2019 18:14:28 -0700 (PDT) From: Rashmica Gupta To: pdbg@lists.ozlabs.org, alistair@popple.id.au, joel@jms.id.au Date: Mon, 15 Apr 2019 11:14:13 +1000 Message-Id: <20190415011414.22315-3-rashmica.g@gmail.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190415011414.22315-1-rashmica.g@gmail.com> References: <20190415011414.22315-1-rashmica.g@gmail.com> Subject: [Pdbg] [PATCH 2/3] libpdbg: Add i2c get and put functions for i2c master on CFAM X-BeenThere: pdbg@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "mailing list for https://github.com/open-power/pdbg development" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: pdbg-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Pdbg" This enables the two basic i2c functions from the BMC. Signed-off-by: Rashmica Gupta --- libpdbg/i2cm.c | 411 +++++++++++++++++++++++++++++++++++++++++++++- libpdbg/libpdbg.h | 2 + libpdbg/target.c | 13 ++ libpdbg/target.h | 3 +- p9-fsi.dtsi.m4 | 7 + p9-kernel.dts.m4 | 2 +- src/i2c.c | 38 ++++- src/main.c | 5 +- 8 files changed, 473 insertions(+), 8 deletions(-) diff --git a/libpdbg/i2cm.c b/libpdbg/i2cm.c index 0c8129b..2022122 100644 --- a/libpdbg/i2cm.c +++ b/libpdbg/i2cm.c @@ -24,15 +24,422 @@ #include #include -#include "bitutils.h" #include "operations.h" #include "debug.h" - +#include "bitutils.h" #include #include #include + +/* I2C common registers */ +#define I2C_FIFO_REG 0x0 +#define I2C_CMD_REG 0x1 +#define I2C_MODE_REG 0x2 +#define I2C_WATERMARK_REG 0x3 +#define I2C_INT_MASK_REG 0x4 +#define I2C_INT_COND_REG 0x5 +#define I2C_STATUS_REG 0x7 +#define I2C_IMD_RESET_REG 0x7 +#define I2C_IMD_RESET_ERR_REG 0x8 +#define I2C_ESTAT_REG 0x8 +#define I2C_RESIDUAL_REG 0x9 +#define I2C_PORT_BUSY_REG 0xA + +#define I2C_PIB_OFFSET 0x4 +#define I2C_PIB_ENGINE_0 0x0000 +#define I2C_PIB_ENGINE_1 0x1000 +#define I2C_PIB_ENGINE_2 0x2000 +#define I2C_PIB_ENGINE_3 0x3000 + +/* I2C command register bits */ +#define I2C_CMD_WITH_START PPC_BIT32(0) +#define I2C_CMD_WITH_ADDR PPC_BIT32(1) +#define I2C_CMD_READ_CONTINUE PPC_BIT32(2) +#define I2C_CMD_WITH_STOP PPC_BIT32(3) +#define I2C_CMD_INT_STEER PPC_BITMASK32(6, 7) +#define I2C_CMD_DEV_ADDR PPC_BITMASK32(8, 14) +#define I2C_CMD_READ_NOT_WRITE PPC_BIT32(15) +#define I2C_CMD_LENGTH PPC_BITMASK32(16, 31) + +/* I2C mode register bits */ +#define I2C_MODE_BIT_RATE_DIV PPC_BITMASK32(0, 15) +#define I2C_MODE_PORT_NUM PPC_BITMASK32(16, 21) +#define I2C_ENHANCED_MODE PPC_BIT32(28) +#define I2C_MODE_PACING PPC_BIT32(30) + +/* watermark */ +#define I2C_WATERMARK_HIGH PPC_BITMASK32(16,19) +#define I2C_WATERMARK_LOW PPC_BITMASK32(24,27) + +/* I2C status register */ +#define I2C_STAT_INV_CMD PPC_BIT32(0) +#define I2C_STAT_PARITY PPC_BIT32(1) +#define I2C_STAT_BE_OVERRUN PPC_BIT32(2) +#define I2C_STAT_BE_ACCESS PPC_BIT32(3) +#define I2C_STAT_LOST_ARB PPC_BIT32(4) +#define I2C_STAT_NACK PPC_BIT32(5) +#define I2C_STAT_DAT_REQ PPC_BIT32(6) +#define I2C_STAT_CMD_COMP PPC_BIT32(7) +#define I2C_STAT_STOP_ERR PPC_BIT32(8) +#define I2C_STAT_MAX_PORT PPC_BITMASK32(9, 15) +#define I2C_STAT_ANY_INT PPC_BIT32(16) +#define I2C_STAT_WAIT_BUSY PPC_BIT32(17) +#define I2C_STAT_ERR_IN PPC_BIT32(18) +#define I2C_STAT_PORT_HIST_BUSY PPC_BIT32(19) +#define I2C_STAT_SCL_IN PPC_BIT32(20) +#define I2C_STAT_SDA_IN PPC_BIT32(21) +#define I2C_STAT_PORT_BUSY PPC_BIT32(22) +#define I2C_STAT_SELF_BUSY PPC_BIT32(23) +#define I2C_STAT_FIFO_COUNT PPC_BITMASK32(24, 31) + +#define I2C_STAT_ERR (I2C_STAT_INV_CMD | \ + I2C_STAT_PARITY | \ + I2C_STAT_BE_OVERRUN | \ + I2C_STAT_BE_ACCESS | \ + I2C_STAT_LOST_ARB | \ + I2C_STAT_NACK | \ + I2C_STAT_STOP_ERR) + +#define I2C_STAT_ANY_RESP (I2C_STAT_ERR | \ + I2C_STAT_DAT_REQ | \ + I2C_STAT_CMD_COMP) + +/* I2C extended status register */ +#define I2C_ESTAT_FIFO_SIZE PPC_BITMASK32(0,7) +#define I2C_ESTAT_MSM_STATE PPC_BITMASK32(11,15) +#define I2C_ESTAT_HIGH_WATER PPC_BIT32(22) +#define I2C_ESTAT_LOW_WATER PPC_BIT32(23) + +/* I2C interrupt mask register */ +#define I2C_INT_INV_CMD PPC_BIT32(16) +#define I2C_INT_PARITY PPC_BIT32(17) +#define I2C_INT_BE_OVERRUN PPC_BIT32(18) +#define I2C_INT_BE_ACCESS PPC_BIT32(19) +#define I2C_INT_LOST_ARB PPC_BIT32(20) +#define I2C_INT_NACK PPC_BIT32(21) +#define I2C_INT_DAT_REQ PPC_BIT32(22) +#define I2C_INT_CMD_COMP PPC_BIT32(23) +#define I2C_INT_STOP_ERR PPC_BIT32(24) +#define I2C_INT_BUSY PPC_BIT32(25) +#define I2C_INT_IDLE PPC_BIT32(26) + +/* I2C residual register */ +#define I2C_RESID_FRONT PPC_BITMASK32(0,15) +#define I2C_RESID_BACK PPC_BITMASK32(16,31) + +static int _i2cm_reg_write(struct i2cm *i2cm, uint32_t addr, uint32_t data) +{ + CHECK_ERR(fsi_write(&i2cm->target, addr, data)); + return 0; +} + +static int _i2cm_reg_read(struct i2cm *i2cm, uint32_t addr, uint32_t *data) +{ + CHECK_ERR(fsi_read(&i2cm->target, addr, data)); + return 0; +} + +static void debug_print_reg(struct i2cm *i2cm) +{ + uint32_t fsidata = 0; + + PR_INFO("\t --------\n"); + _i2cm_reg_read(i2cm, I2C_STATUS_REG, &fsidata); + PR_INFO("\t status reg \t has value 0x%x \n", fsidata); + if (fsidata & I2C_STAT_INV_CMD) + PR_INFO("\t\tinvalid cmd\n"); + if (fsidata & I2C_STAT_PARITY) + PR_INFO("\t\tparity\n"); + if (fsidata & I2C_STAT_BE_OVERRUN) + PR_INFO("\t\tback endoverrun\n"); + if (fsidata & I2C_STAT_BE_ACCESS) + PR_INFO("\t\tback end access error\n"); + if (fsidata & I2C_STAT_LOST_ARB) + PR_INFO("\t\tarbitration lost\n"); + if (fsidata & I2C_STAT_NACK) + PR_INFO("\t\tnack\n"); + if (fsidata & I2C_STAT_DAT_REQ) + PR_INFO("\t\tdata request\n"); + if (fsidata & I2C_STAT_STOP_ERR) + PR_INFO("\t\tstop error\n"); + if (fsidata & I2C_STAT_PORT_BUSY) + PR_INFO("\t\ti2c busy\n"); + PR_INFO("\t\tfifo entry count: %li \n",fsidata&I2C_STAT_FIFO_COUNT); + + _i2cm_reg_read(i2cm, I2C_ESTAT_REG, &fsidata); + PR_INFO("\t extended status reg has value 0x%x \n", fsidata); + if (fsidata & I2C_ESTAT_HIGH_WATER) + PR_INFO("\t\thigh water mark reached\n"); + if (fsidata & I2C_ESTAT_LOW_WATER) + PR_INFO("\t\tlow water mark reached\n"); + + + _i2cm_reg_read(i2cm, I2C_WATERMARK_REG, &fsidata); + PR_INFO("\t watermark reg has value 0x%x \n", fsidata); + PR_INFO("\t\twatermark high: %li \n",fsidata&I2C_WATERMARK_HIGH); + PR_INFO("\t\twatermark low: %li \n",fsidata&I2C_WATERMARK_LOW); + + _i2cm_reg_read(i2cm, I2C_RESIDUAL_REG, &fsidata); + PR_INFO("\t residual reg has value 0x%x \n", fsidata); + PR_INFO("\t\tfrontend_len: %li \n",fsidata&I2C_RESID_FRONT); + PR_INFO("\t\tbackend_len: %li \n",fsidata&I2C_RESID_BACK); + + _i2cm_reg_read(i2cm, I2C_PORT_BUSY_REG, &fsidata); + PR_INFO("\t port busy reg has value 0x%x \n", fsidata); + PR_INFO("\t -------\n"); + +} + +static void i2c_mode_write(struct i2cm *i2cm) +{ + uint32_t data = I2C_MODE_PACING; + + // hardcoding bit rate divisor because not too important + data = SETFIELD(I2C_MODE_BIT_RATE_DIV, data, 28); + data = SETFIELD(I2C_MODE_PORT_NUM, data, i2cm->port); + PR_INFO("setting mode to %x\n", data); + _i2cm_reg_write(i2cm, I2C_MODE_REG, data); +} + +static void i2c_watermark_write(struct i2cm *i2cm) +{ + uint32_t data = 0; + + data = SETFIELD(I2C_WATERMARK_HIGH, data, 4); + data = SETFIELD(I2C_WATERMARK_LOW, data, 4); + PR_INFO("setting watermark (0x%x) to: %x\n", I2C_WATERMARK_REG, data); + _i2cm_reg_write(i2cm, I2C_WATERMARK_REG, data); +} + +static int i2c_reset(struct i2cm *i2cm) +{ + uint32_t fsidata = 0; + debug_print_reg(i2cm); + PR_INFO("### RESETING \n"); + + fsidata = 0xB; + _i2cm_reg_write(i2cm, I2C_IMD_RESET_REG, fsidata); + _i2cm_reg_write(i2cm, I2C_IMD_RESET_ERR_REG, fsidata); + + usleep(10000); + debug_print_reg(i2cm); + return 0; +} + +/* + * If there are errors in the status register, redo the whole + * operation after restting the i2cm. +*/ +static int i2c_poll_status(struct i2cm *i2cm, uint32_t *data) +{ + int loop; + + for (loop = 0; loop < 10; loop++) + { + usleep(10000); + _i2cm_reg_read(i2cm, I2C_STATUS_REG, data); + + if (((*data) & I2C_STAT_CMD_COMP)) + break; + } + if ((*data) & I2C_STAT_PORT_BUSY) + PR_INFO("portbusy\n"); + if ((*data) & I2C_STAT_ERR) { + PR_INFO("ERROR IN STATUS\n"); + debug_print_reg(i2cm); + return 1; + } + return 0; +} + +static int i2c_fifo_write(struct i2cm *i2cm, uint32_t *data, uint16_t size) +{ + int bytes_in_fifo = 1; + int rc = 0, bytes_written = 0; + uint32_t status; + + while (bytes_written < size) { + + if (bytes_written == size) + return 0; + + /* Poll status register's FIFO_ENTRY_COUNT to check that FIFO isn't full */ + rc = i2c_poll_status(i2cm, &status); + bytes_in_fifo = status & I2C_STAT_FIFO_COUNT; + PR_INFO("%x bytes in fifo \n", bytes_in_fifo); + + if (rc) + return 0; + + if (bytes_in_fifo == 8) + continue; + + PR_INFO("\twriting: %x to FIFO\n", data[bytes_written / 4]); + rc = _i2cm_reg_write(i2cm, I2C_FIFO_REG, data[bytes_written / 4]); + if (rc) + return bytes_written; + bytes_written += 4; + } + return bytes_written; +} + +static int i2c_fifo_read(struct i2cm *i2cm, uint32_t *data, uint16_t size) +{ + int bytes_to_read = 1; + int rc = 0, bytes_read = 0; + uint32_t tmp; + uint32_t status; + + while (bytes_to_read) { + + if (bytes_read > size) + return 0; + + /* Poll status register's FIFO_ENTRY_COUNT to check that there is data to consume */ + rc = i2c_poll_status(i2cm, &status); + bytes_to_read = status & I2C_STAT_FIFO_COUNT; + PR_INFO("%x bytes in fifo \n", bytes_to_read); + + if (rc) + return 0; + + if (!bytes_to_read) + continue; + + rc = _i2cm_reg_read(i2cm, I2C_FIFO_REG, &tmp); + if (rc) + return bytes_read; + memcpy(data + (bytes_read / 4), &tmp, 4); + PR_INFO(" %x \n", data[bytes_read / 4]); + bytes_read += 4; + } + return bytes_read; +} + +static int i2cm_ok_to_use(struct i2cm *i2cm) +{ + uint32_t data; + + _i2cm_reg_read(i2cm, I2C_STATUS_REG, &data); + + if (!(data & I2C_STAT_CMD_COMP) || (data & I2C_STAT_ERR)) + { + PR_ERROR("ERROR IN STATUS, attempting to reset %x \n", data); + i2c_reset(i2cm); + _i2cm_reg_read(i2cm, I2C_STATUS_REG, &data); + } + if (data & I2C_STAT_ERR) { + PR_ERROR("ERROR IN STATUS %x\n", data); + return 0; + } + i2c_watermark_write(i2cm); + i2c_mode_write(i2cm); + return 1; +} + +static int i2c_put(struct i2cm *i2cm, uint32_t addr, uint16_t size, uint8_t *d) +{ + uint32_t fsidata; + uint32_t data = 0; + int rc = 0; + + if(!i2cm_ok_to_use(i2cm)) { + rc = 1; + return rc; + } + //TODO: if size > 64kB then use I2C_CMD_READ_CONTINUE and do multiple commands + if (size > 64*1024 -1) + size = 64*1024 -1; + + + /* Set slave device */ + fsidata = I2C_CMD_WITH_START | I2C_CMD_WITH_ADDR; + fsidata = SETFIELD(I2C_CMD_DEV_ADDR, fsidata, addr); + fsidata = SETFIELD(I2C_CMD_LENGTH, fsidata, size); + _i2cm_reg_write(i2cm, I2C_CMD_REG, fsidata); + + rc = i2c_poll_status(i2cm, &data); + if (rc) { + PR_ERROR("FAILED to set i2c device\n"); + return rc; + } + + printf("%i\n", size); + /* Write data into the FIFO of the slave device */ + i2c_fifo_write(i2cm, (uint32_t *)d, size); + + rc = i2c_poll_status(i2cm, &data); + if (rc) { + PR_ERROR("FAILED to write all data\n"); + return rc; + } + return rc; +} + +static int i2c_get(struct i2cm *i2cm, uint32_t addr, uint16_t size, uint8_t *d) +{ + uint32_t fsidata; + uint32_t data = 0; + int rc = 0; + int bytes_read; + + if(!i2cm_ok_to_use(i2cm)) { + rc = 1; + return rc; + } + + //TODO: if size > 64kB then use I2C_CMD_READ_CONTINUE and do multiple commands + if (size > 64*1024 -1) + size = 64*1024 -1; + + /* Tell i2c master to read from slave device's fifo */ + fsidata = I2C_CMD_WITH_START | I2C_CMD_WITH_STOP | I2C_CMD_WITH_ADDR | I2C_CMD_READ_NOT_WRITE; + fsidata = SETFIELD(I2C_CMD_DEV_ADDR, fsidata, addr); + fsidata = SETFIELD(I2C_CMD_LENGTH, fsidata, size); + _i2cm_reg_write(i2cm, I2C_CMD_REG, fsidata); + + bytes_read = i2c_fifo_read(i2cm, (uint32_t*)d, size); + + rc = i2c_poll_status(i2cm, &data); + if (rc) { + PR_ERROR("ERROR while reading FIFO\n"); + return rc; + } + + if (bytes_read < size) { + PR_ERROR("ERROR didn't read all bytes %i\n", bytes_read); + debug_print_reg(i2cm); + return rc; + + } + + if (data & I2C_STAT_CMD_COMP) + PR_INFO(" cmd completed!\n"); + + return rc; +} + +int i2cm_target_probe(struct pdbg_target *target) +{ + return 0; +} + +static struct i2cm i2c_fsi = { + .target = { + .name = "CFAM I2C Master", + .compatible = "ibm,fsi-i2c-master", + .class = "i2cm", + .probe = i2cm_target_probe, + }, + .read = i2c_get, + .write = i2c_put, +}; +DECLARE_HW_UNIT(i2c_fsi); + +///////////////////////////////////////////////////////////////////////////// + #ifndef DISABLE_I2CLIB #include diff --git a/libpdbg/libpdbg.h b/libpdbg/libpdbg.h index 9baab0e..1c60a21 100644 --- a/libpdbg/libpdbg.h +++ b/libpdbg/libpdbg.h @@ -125,6 +125,8 @@ int fsi_write(struct pdbg_target *target, uint32_t addr, uint32_t val); int i2c_read(struct pdbg_target *target, uint16_t port, uint32_t addr, uint16_t size, uint8_t *data); +int i2c_write(struct pdbg_target *target, uint16_t port, uint32_t addr, + uint16_t size, uint8_t *data); int pib_read(struct pdbg_target *target, uint64_t addr, uint64_t *val); int pib_write(struct pdbg_target *target, uint64_t addr, uint64_t val); diff --git a/libpdbg/target.c b/libpdbg/target.c index f577bb3..ed7bc18 100644 --- a/libpdbg/target.c +++ b/libpdbg/target.c @@ -202,10 +202,23 @@ int i2c_read(struct pdbg_target *i2cm_dt, uint16_t port, uint32_t addr, uint16_t i2cm_dt = get_class_target_addr(i2cm_dt, "i2cm", &addr64); i2cm = target_to_i2cm(i2cm_dt); + i2cm->port = port; return i2cm->read(i2cm, addr, size, data); } +int i2c_write(struct pdbg_target *i2cm_dt, uint16_t port, uint32_t addr, uint16_t size, uint8_t *data) +{ + struct i2cm *i2cm; + uint64_t addr64 = addr; + + i2cm_dt = get_class_target_addr(i2cm_dt, "i2cm", &addr64); + i2cm = target_to_i2cm(i2cm_dt); + i2cm->port = port; + + return i2cm->write(i2cm, addr, size, data); +} + int fsi_read(struct pdbg_target *fsi_dt, uint32_t addr, uint32_t *data) { struct fsi *fsi; diff --git a/libpdbg/target.h b/libpdbg/target.h index 14f2b79..8b53a0e 100644 --- a/libpdbg/target.h +++ b/libpdbg/target.h @@ -141,7 +141,8 @@ struct fsi { struct i2cm { struct pdbg_target target; int (*read)(struct i2cm *, uint32_t, uint16_t, uint8_t *); - int (*write)(struct i2cm *, uint32_t, uint16_t, uint8_t*); + int (*write)(struct i2cm *, uint32_t, uint16_t, uint8_t *); + uint8_t port; int i2c_fd; }; #define target_to_i2cm(x) container_of(x, struct i2cm, target) diff --git a/p9-fsi.dtsi.m4 b/p9-fsi.dtsi.m4 index afa7d39..89ba387 100644 --- a/p9-fsi.dtsi.m4 +++ b/p9-fsi.dtsi.m4 @@ -21,6 +21,13 @@ include(p9-pib.dts.m4)dnl }; + i2cm@1800 { + #address-cells = <0x2>; + #size-cells = <0x1>; + reg = <0x0 0x1800 0x400>; + compatible = "ibm,fsi-i2c-master"; + }; + hmfsi@100000 { #address-cells = <0x2>; #size-cells = <0x1>; diff --git a/p9-kernel.dts.m4 b/p9-kernel.dts.m4 index 474beca..dacea83 100644 --- a/p9-kernel.dts.m4 +++ b/p9-kernel.dts.m4 @@ -26,7 +26,7 @@ #address-cells = <0x2>; #size-cells = <0x1>; reg = <0x0 0x1800 0x400>; - compatible = "ibm,kernel-i2c-master"; + compatible = "ibm,fsi-i2c-master"; include(p9-i2c.dts.m4)dnl }; diff --git a/src/i2c.c b/src/i2c.c index 9ac3d53..641355c 100644 --- a/src/i2c.c +++ b/src/i2c.c @@ -17,11 +17,14 @@ #include #include #include +#include +#include #include "main.h" #include "optcmd.h" #include "path.h" #include "target.h" +#include "util.h" static int geti2c(uint16_t port, uint32_t addr, uint16_t size) { @@ -30,8 +33,9 @@ static int geti2c(uint16_t port, uint32_t addr, uint16_t size) data = malloc(size); assert(data); + assert(!(size % 4)); - for_each_path_target_class("i2cbus", target) { + for_each_path_target_class("i2cm", target) { if (pdbg_target_probe(target) != PDBG_TARGET_ENABLED) continue; selected = target; @@ -42,7 +46,37 @@ static int geti2c(uint16_t port, uint32_t addr, uint16_t size) if (selected == NULL) return -1; - printf("data read: 0x%016" PRIx64 "\n", (uint64_t)*data); + + hexdump(size, data, size, 1); return 0; } OPTCMD_DEFINE_CMD_WITH_ARGS(geti2c, geti2c, (DATA16, ADDRESS32, DATA16)); + +static int puti2c(uint16_t port, uint32_t addr, uint8_t offset, uint16_t size, uint64_t data) +{ + uint8_t *d = NULL; + struct pdbg_target *target, *selected = NULL; + + size += sizeof(offset); + assert(!(size % 4)); + d = malloc(size); + assert(d); + + memcpy(d, &offset, sizeof(offset)); + memcpy(d + sizeof(offset), &data, sizeof(data)); + + for_each_path_target_class("i2cm", target) { + if (pdbg_target_probe(target) != PDBG_TARGET_ENABLED) + continue; + selected = target; + if (i2c_write(target, port, addr, size, d) == 0) + break; + break; + } + + if (selected == NULL) + return -1; + printf("wrote %i bytes \n", size); + return 0; +} +OPTCMD_DEFINE_CMD_WITH_ARGS(puti2c, puti2c, (DATA16, ADDRESS32, DATA8, DATA16, DATA)); diff --git a/src/main.c b/src/main.c index 1702efa..2e16b67 100644 --- a/src/main.c +++ b/src/main.c @@ -93,7 +93,7 @@ extern struct optcmd_cmd optcmd_threadstatus, optcmd_sreset, optcmd_regs, optcmd_probe, optcmd_getmem, optcmd_putmem, optcmd_getmemio, optcmd_putmemio, optcmd_getxer, optcmd_putxer, optcmd_getcr, optcmd_putcr, - optcmd_gdbserver, optcmd_geti2c; + optcmd_gdbserver, optcmd_geti2c, optcmd_puti2c; static struct optcmd_cmd *cmds[] = { &optcmd_getscom, &optcmd_putscom, &optcmd_getcfam, &optcmd_putcfam, @@ -103,7 +103,7 @@ static struct optcmd_cmd *cmds[] = { &optcmd_threadstatus, &optcmd_sreset, &optcmd_regs, &optcmd_probe, &optcmd_getmem, &optcmd_putmem, &optcmd_getmemio, &optcmd_putmemio, &optcmd_getxer, &optcmd_putxer, &optcmd_getcr, &optcmd_putcr, - &optcmd_gdbserver, &optcmd_geti2c, + &optcmd_gdbserver, &optcmd_geti2c, &optcmd_puti2c, }; /* Purely for printing usage text. We could integrate printing argument and flag @@ -146,6 +146,7 @@ static struct action actions[] = { { "regs", "[--backtrace]", "State (optionally display backtrace)" }, { "gdbserver", "", "Start a gdb server" }, { "geti2c", " ", "Read size bytes from the offset of specified device" }, + { "puti2c", " ", "Read size bytes from the offset of specified device" }, }; static void print_usage(void) From patchwork Mon Apr 15 01:14:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rashmica Gupta X-Patchwork-Id: 1085425 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44j9X54NJKz9s5c for ; Mon, 15 Apr 2019 11:14:45 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="VxoEPbS4"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 44j9X5386mzDqKJ for ; Mon, 15 Apr 2019 11:14:45 +1000 (AEST) X-Original-To: pdbg@lists.ozlabs.org Delivered-To: pdbg@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::542; helo=mail-pg1-x542.google.com; envelope-from=rashmica.g@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="VxoEPbS4"; dkim-atps=neutral Received: from mail-pg1-x542.google.com (mail-pg1-x542.google.com [IPv6:2607:f8b0:4864:20::542]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 44j9Ws0PyLzDqJq for ; Mon, 15 Apr 2019 11:14:33 +1000 (AEST) Received: by mail-pg1-x542.google.com with SMTP id f6so7740793pgs.8 for ; Sun, 14 Apr 2019 18:14:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=EijVAAGKxSyQQCvC13v8bzrhDIgrDvS3Yp9C5jrY2dM=; b=VxoEPbS45sruL2MNP+elGl4udCLoqt2nI8zuav80L2HjGTUiCjvyuqRgQZxMxHGFkt YcbUSJBvghZhA0MLxvC7eneaScDuxnihQoHATwA3oRSz5U29EnTmusRsNHfAkFP+bRRx v8y1oBg/st4uDnssSWyC88xGnVtOZoUGEKecZ795Q1wHJbV+yFt0ScpL5Pn3qyLWXcPg QStXlNQ8ln4H9j6Hi6prTXPRhS8RHiNtKLRd0N/O3944c93VDH8HQu2+3pXmFKe7yUB/ MzBfAJSLxBSf7MhMtFKnZ73hy0lHpYeyn27Rbge681sYB0k5woHQttu8DeC+Me0AW/eF 2Bhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=EijVAAGKxSyQQCvC13v8bzrhDIgrDvS3Yp9C5jrY2dM=; b=WsSPeaS90o4vg38iql4GYjN8kvF+RW3S3J1ohJ4syglRIXAlkX79cHWsshmUH3mJve ChUlLgq7rSr87R949v5G03nUEdibEAl50stL4Me+p/IKbvGJpofwsiuxMFAXVd8jkfjk ia1eluKPu6EkiMH22L/zmM+cA1IeRBaHL3nKhIGdV9f3+7wVh+ruxq+1gtYlf2BaODbC iY1n5AXqMrX3C5MK+WokimfytLWe/WqyyDhAvSus+0/7g7y24TCUGFqukTI9aaz7Fi4V c5jG2dbYVspiePBuwaNMARlxHsyUzH55UBdRcwJbBj5fVW1Mpvp/MqRUE17CqMDfzIZK OYUg== X-Gm-Message-State: APjAAAUnuFk28oxqv8Awvla3cjceqgQ2Ujr1AGZFiqZMKErxOxsoj7I+ 2v1z7H3U88DH6HuUbw8rBBZWVMo6 X-Google-Smtp-Source: APXvYqzOfaD53qFGGx4fhpPh6fER8ps5v/qLjWf6/hJmj9Epx0tNgUVMiYOs1cWfBRbGwCwM039FMA== X-Received: by 2002:a63:1d26:: with SMTP id d38mr62484621pgd.357.1555290871183; Sun, 14 Apr 2019 18:14:31 -0700 (PDT) Received: from rashmica.ozlabs.ibm.com ([122.99.82.10]) by smtp.gmail.com with ESMTPSA id m7sm64205162pgg.62.2019.04.14.18.14.29 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 14 Apr 2019 18:14:30 -0700 (PDT) From: Rashmica Gupta To: pdbg@lists.ozlabs.org, alistair@popple.id.au, joel@jms.id.au Date: Mon, 15 Apr 2019 11:14:14 +1000 Message-Id: <20190415011414.22315-4-rashmica.g@gmail.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190415011414.22315-1-rashmica.g@gmail.com> References: <20190415011414.22315-1-rashmica.g@gmail.com> Subject: [Pdbg] [PATCH 3/3] libpdbg: Add i2c get and put for i2c masters on the PIB X-BeenThere: pdbg@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "mailing list for https://github.com/open-power/pdbg development" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: pdbg-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Pdbg" This enables the basic i2c functions from the host. Signed-off-by: Rashmica Gupta --- libpdbg/i2cm.c | 183 +++++++++++++++++++++++++++++++++++++++++++++-- libpdbg/target.h | 2 + p9-host.dts.m4 | 28 ++++++++ 3 files changed, 208 insertions(+), 5 deletions(-) diff --git a/libpdbg/i2cm.c b/libpdbg/i2cm.c index 2022122..67fc5c6 100644 --- a/libpdbg/i2cm.c +++ b/libpdbg/i2cm.c @@ -33,7 +33,11 @@ #include -/* I2C common registers */ +/* + * I2C common registers + * - use as is on CFAM + * - use with I2C_PIB_OFFSET on PIB + */ #define I2C_FIFO_REG 0x0 #define I2C_CMD_REG 0x1 #define I2C_MODE_REG 0x2 @@ -47,11 +51,13 @@ #define I2C_RESIDUAL_REG 0x9 #define I2C_PORT_BUSY_REG 0xA +/* I2C PIB only */ #define I2C_PIB_OFFSET 0x4 #define I2C_PIB_ENGINE_0 0x0000 #define I2C_PIB_ENGINE_1 0x1000 #define I2C_PIB_ENGINE_2 0x2000 #define I2C_PIB_ENGINE_3 0x3000 +#define I2C_PIB_FIFO4_REG 0x12 /* I2C command register bits */ #define I2C_CMD_WITH_START PPC_BIT32(0) @@ -131,13 +137,24 @@ static int _i2cm_reg_write(struct i2cm *i2cm, uint32_t addr, uint32_t data) { - CHECK_ERR(fsi_write(&i2cm->target, addr, data)); + if (i2cm->host) + /* pib addr space is 64 bits and i2cm only uses top 32 bits */ + CHECK_ERR(pib_write(&i2cm->target, addr + I2C_PIB_OFFSET, (uint64_t)data << 32)); + else + CHECK_ERR(fsi_write(&i2cm->target, addr, data)); return 0; } static int _i2cm_reg_read(struct i2cm *i2cm, uint32_t addr, uint32_t *data) { - CHECK_ERR(fsi_read(&i2cm->target, addr, data)); + uint64_t d = (uint64_t)*data; + + if (i2cm->host) { + CHECK_ERR(pib_read(&i2cm->target, addr + I2C_PIB_OFFSET, &d)); + *data = d >> 32; + } else { + CHECK_ERR(fsi_read(&i2cm->target, addr, data)); + } return 0; } @@ -277,7 +294,10 @@ static int i2c_fifo_write(struct i2cm *i2cm, uint32_t *data, uint16_t size) continue; PR_INFO("\twriting: %x to FIFO\n", data[bytes_written / 4]); - rc = _i2cm_reg_write(i2cm, I2C_FIFO_REG, data[bytes_written / 4]); + if (i2cm->host) + rc = _i2cm_reg_write(i2cm, I2C_PIB_FIFO4_REG - I2C_PIB_OFFSET , data[bytes_written / 4]); + else + rc = _i2cm_reg_write(i2cm, I2C_FIFO_REG, data[bytes_written / 4]); if (rc) return bytes_written; bytes_written += 4; @@ -308,9 +328,14 @@ static int i2c_fifo_read(struct i2cm *i2cm, uint32_t *data, uint16_t size) if (!bytes_to_read) continue; - rc = _i2cm_reg_read(i2cm, I2C_FIFO_REG, &tmp); + if (i2cm->host) + rc = _i2cm_reg_read(i2cm, I2C_PIB_FIFO4_REG -I2C_PIB_OFFSET, &tmp); + else + rc = _i2cm_reg_read(i2cm, I2C_FIFO_REG, &tmp); + if (rc) return bytes_read; + memcpy(data + (bytes_read / 4), &tmp, 4); PR_INFO(" %x \n", data[bytes_read / 4]); bytes_read += 4; @@ -435,9 +460,157 @@ static struct i2cm i2c_fsi = { }, .read = i2c_get, .write = i2c_put, + .host = false }; DECLARE_HW_UNIT(i2c_fsi); + +///////////////////////////////////////////////////////////////////////////// +#define I2C_ATOMIC_LOCK_REG 0x3ff +#define OCC_BASE 0x00000000006C08A +#define OCC_CLEAR 0x00000000006C08B +#define OCC_SET 0x00000000006C08C + + +#define OCC_LOCKED_ENGINE_1 PPC_BIT(17) +#define OCC_LOCKED_ENGINE_2 PPC_BIT(19) +#define OCC_LOCKED_ENGINE_3 PPC_BIT(21) +#define I2CM_DT_TO_ID(x) ((x>>12) & 0xf) +static int i2cm_locked_by_occ(int id, uint64_t occ_base) +{ + uint64_t mask; + switch (id) + { + case 1: + mask = OCC_LOCKED_ENGINE_1; + break; + case 2: + mask = OCC_LOCKED_ENGINE_2; + break; + case 3: + mask = OCC_LOCKED_ENGINE_3; + break; + default: + mask = 0; + break; + } + return !!(mask & occ_base); +} + +static int pib_i2c_get(struct i2cm *i2cm, uint32_t addr, uint16_t size, uint8_t *d) +{ + uint64_t data = 0; + uint64_t bit; + struct pdbg_target *p; + + pdbg_for_each_class_target("pib", p) { + if (pdbg_target_probe(p) == PDBG_TARGET_ENABLED) + break; + } + + if (!p) { + fprintf(stderr, "No PIB found\n"); + return 0; + } + bit = PPC_BIT(16 + (i2cm->id - 1) * 2); + pib_read(p, OCC_BASE, &data); + + if( !i2cm_locked_by_occ(i2cm->id, data)) { + /* lock i2cm */ + pib_write(p, OCC_SET, bit); + pib_read(p, OCC_BASE, &data); + + i2c_get(i2cm, addr, size, d); + + /* unlock i2cm */ + pib_read(p, OCC_BASE, &data); + pib_read(p, OCC_CLEAR, &data); + pib_write(p, OCC_CLEAR, bit); + pib_read(p, OCC_BASE, &data); + } else { + PR_INFO("I2C: de%d: occflags = 0x%16" PRIx64 "(locks = %x:%x:%x)\n", + i2cm->id, (u64) data, (u16) GETFIELD(PPC_BITMASK(16, 17), data), + (u16) GETFIELD(PPC_BITMASK(18, 19), data), + (u16) GETFIELD(PPC_BITMASK(20, 21), data)); + PR_INFO("I2C master %x is locked by OCC :( \n", i2cm->id); + } + + return 0; +} +static int pib_i2c_put(struct i2cm *i2cm, uint32_t addr, uint16_t size, uint8_t *d) +{ + uint64_t data = 0; + uint64_t bit; + struct pdbg_target *p; + + pdbg_for_each_class_target("pib", p) { + if (pdbg_target_probe(p) == PDBG_TARGET_ENABLED) + break; + } + + if (!p) { + fprintf(stderr, "No PIB found\n"); + return 0; + } + bit = PPC_BIT(16 + (i2cm->id - 1) * 2); + pib_read(p, OCC_BASE, &data); + + if( !i2cm_locked_by_occ(i2cm->id, data)) { + /* lock i2cm */ + pib_write(p, OCC_SET, bit); + pib_read(p, OCC_BASE, &data); + + i2c_put(i2cm, addr, size, d); + + /* unlock i2cm */ + pib_read(p, OCC_BASE, &data); + pib_read(p, OCC_CLEAR, &data); + pib_write(p, OCC_CLEAR, bit); + pib_read(p, OCC_BASE, &data); + } else { + PR_INFO("I2C: de%d: occflags = 0x%16" PRIx64 "(locks = %x:%x:%x)\n", + i2cm->id, (u64) data, (u16) GETFIELD(PPC_BITMASK(16, 17), data), + (u16) GETFIELD(PPC_BITMASK(18, 19), data), + (u16) GETFIELD(PPC_BITMASK(20, 21), data)); + PR_INFO("I2C master %x is locked by OCC :( \n", i2cm->id); + } + return 0; +} + +int host_i2cm_target_probe(struct pdbg_target *target) +{ + int dt_id = pdbg_target_address(target, NULL); + int id = I2CM_DT_TO_ID(dt_id); + printf("###############\n"); + struct i2cm *i2cm = target_to_i2cm(target); + i2cm->id = id; + /* + * 1 0x800000000000 + * 2 0x200000000000 + * 3 0x080000000000 + * */ + + + #define FSI_SET_PIB_RESET_REG 0x07 + + // CHECK_ERR(fsi_write(target, FSI_SET_PIB_RESET_REG, 1)); + + + return 0; +} + +static struct i2cm i2c_pib = { + .target = { + .name = "PIB I2C Master", + .compatible = "ibm,power9-i2cm", + .class = "i2cm", + .probe = i2cm_target_probe, + }, + .read = pib_i2c_get, + .write = pib_i2c_put, + .host = true, +}; +DECLARE_HW_UNIT(i2c_pib); ///////////////////////////////////////////////////////////////////////////// #ifndef DISABLE_I2CLIB diff --git a/libpdbg/target.h b/libpdbg/target.h index 8b53a0e..6e5f369 100644 --- a/libpdbg/target.h +++ b/libpdbg/target.h @@ -144,6 +144,8 @@ struct i2cm { int (*write)(struct i2cm *, uint32_t, uint16_t, uint8_t *); uint8_t port; int i2c_fd; + bool host; + int id; }; #define target_to_i2cm(x) container_of(x, struct i2cm, target) diff --git a/p9-host.dts.m4 b/p9-host.dts.m4 index 52973ff..2d8b18b 100644 --- a/p9-host.dts.m4 +++ b/p9-host.dts.m4 @@ -12,6 +12,19 @@ reg = <0x0>; index = <0x0>; include(p9-pib.dts.m4)dnl + + i2cm@a1000 { + reg = <0x0 0xa1000 0x400>; + compatible = "ibm,power9-i2cm"; + }; + i2cm@a2000 { + reg = <0x0 0xa2000 0x400>; + compatible = "ibm,power9-i2cm"; + }; + i2cm@a3000 { + reg = <0x0 0xa3000 0x400>; + compatible = "ibm,power9-i2cm"; + }; }; pib@8 { @@ -21,5 +34,20 @@ reg = <0x8>; index = <0x8>; include(p9-pib.dts.m4)dnl + + i2cm@a1000 { + reg = <0x0 0xa1000 0x400>; + compatible = "ibm,power9-i2cm"; + }; + i2cm@a2000 { + reg = <0x0 0xa2000 0x400>; + compatible = "ibm,power9-i2cm"; + }; + i2cm@a3000 { + reg = <0x0 0xa3000 0x400>; + compatible = "ibm,power9-i2cm"; + }; + + }; };