From patchwork Tue Oct 11 21:39:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: christopher.lee.bostic@gmail.com X-Patchwork-Id: 680945 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3str7C6YTgz9s2Q for ; Wed, 12 Oct 2016 08:42:15 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=UD5LDRpe; 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 3str7C5ZbMzDswt for ; Wed, 12 Oct 2016 08:42:15 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=UD5LDRpe; dkim-atps=neutral X-Original-To: openbmc@lists.ozlabs.org Delivered-To: openbmc@lists.ozlabs.org Received: from mail-oi0-x242.google.com (mail-oi0-x242.google.com [IPv6:2607:f8b0:4003:c06::242]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3str4x3wgdzDsrV for ; Wed, 12 Oct 2016 08:40:17 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=UD5LDRpe; dkim-atps=neutral Received: by mail-oi0-x242.google.com with SMTP id p136so2125642oic.1 for ; Tue, 11 Oct 2016 14:40:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=5/l9GSguLmdsNaTyjE0TJqyq8mDG562gCo7EDwgmE4E=; b=UD5LDRpeI6DFBpZ2T17hwInCPtdK3GFWgeonpvEqxBNAY8kGg+jT5eDS3WajLTxxlQ O1Np8YnTtBfNDin9pJmyArgbYHBwijyxBqNZT1aoL7bqkNOKy1tWlNxd54CDIQDpVW3g cISfmEiorsUOY6i3D9/o23Fdt9OKfdwKOOmlKi2wfc+QfZFaF32KDkHzP/rGRsyv953z HJCg254+m+O1EFuIkU+dLWWUXkJwH1C/8CDTKWTyPW2xdJxB/5yugCYRr2Q/x1WL+l72 QbTP16OsGPC5avh9syunbuiiH+B0Hc9J0X9HRKJvUpMZnamU6czgREVMfBlKv8fNjqEe P1sA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=5/l9GSguLmdsNaTyjE0TJqyq8mDG562gCo7EDwgmE4E=; b=c4oUKUmgmldYgnDX2uacnEJo8qH1zzmWk632la1P7e9g2xDK2aststST612QQvHrMO j/OK+/pAiAENC+8pmCIaZFke4A7qtdzuIrotFYGfiAMaxMQ/vk5YkbzVCqFvDM9LzygE Y288eD86DDchwdC76XvwGPh48UpzgxLB4/e+GtQr3MXIFjjYCfXchUlVOa2LrSmPIg0I YiJJDb5bxusPJvGSt0XcNjakmYkomuT6WQ+LO/KGPfKDDLRzYPmaCMD0aBiHwz8s9Uip 9cz1wKmSn6hvvErup6nwK4D9RqNPRHJBI/2LERa4pYcso6WSC7w84pIanpmI2/IALig0 yCqQ== X-Gm-Message-State: AA6/9Rke7BGJVk3RFUt9KdP5y1Irx2MELpOgUpHXWLstZqiJNJWxfTWJALZb1reEipRGiw== X-Received: by 10.157.48.3 with SMTP id d3mr3465363otc.204.1476222015845; Tue, 11 Oct 2016 14:40:15 -0700 (PDT) Received: from Christophers-MacBook-Pro.local.com (45-20-192-79.lightspeed.austtx.sbcglobal.net. [45.20.192.79]) by smtp.gmail.com with ESMTPSA id h91sm1811153oth.40.2016.10.11.14.40.15 (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 11 Oct 2016 14:40:15 -0700 (PDT) From: christopher.lee.bostic@gmail.com To: openbmc@lists.ozlabs.org Subject: [PATCH linux v3 11/18] fsi: scan slaves & register devices Date: Tue, 11 Oct 2016 16:39:56 -0500 Message-Id: <1476222003-99697-12-git-send-email-christopher.lee.bostic@gmail.com> X-Mailer: git-send-email 2.7.4 (Apple Git-66) In-Reply-To: <1476222003-99697-1-git-send-email-christopher.lee.bostic@gmail.com> References: <1476222003-99697-1-git-send-email-christopher.lee.bostic@gmail.com> X-BeenThere: openbmc@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Development list for OpenBMC List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: xxpetri@de.ibm.com, zahrens@us.ibm.com MIME-Version: 1.0 Errors-To: openbmc-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "openbmc" From: Jeremy Kerr Now that we have fsi_slave devices, scan each for endpoints, and register them on the fsi bus. Signed-off-by: Jeremy Kerr --- drivers/fsi/fsi-core.c | 125 ++++++++++++++++++++++++++++++++++++++++++++++++- include/linux/fsi.h | 4 ++ 2 files changed, 128 insertions(+), 1 deletion(-) diff --git a/drivers/fsi/fsi-core.c b/drivers/fsi/fsi-core.c index 49a8e14..63d26b5 100644 --- a/drivers/fsi/fsi-core.c +++ b/drivers/fsi/fsi-core.c @@ -24,6 +24,16 @@ #define FSI_N_SLAVES 4 +#define FSI_SLAVE_CONF_NEXT_MASK 0x80000000 +#define FSI_SLAVE_CONF_SLOTS_MASK 0x00ff0000 +#define FSI_SLAVE_CONF_SLOTS_SHIFT 16 +#define FSI_SLAVE_CONF_VERSION_MASK 0x0000f000 +#define FSI_SLAVE_CONF_VERSION_SHIFT 12 +#define FSI_SLAVE_CONF_TYPE_MASK 0x00000ff0 +#define FSI_SLAVE_CONF_TYPE_SHIFT 4 + +static const int engine_page_size = 0x400; + static atomic_t master_idx = ATOMIC_INIT(-1); struct fsi_slave { @@ -35,6 +45,29 @@ struct fsi_slave { #define to_fsi_slave(d) container_of(d, struct fsi_slave, dev) +/* FSI endpoint-device support */ + +static void fsi_device_release(struct device *_device) +{ + struct fsi_device *device = to_fsi_dev(_device); + kfree(device); +} + +static struct fsi_device *fsi_create_device(struct fsi_slave *slave) +{ + struct fsi_device *dev; + + dev = kzalloc(sizeof(*dev), GFP_KERNEL); + if (!dev) + return NULL; + + dev->dev.parent = &slave->dev; + dev->dev.bus = &fsi_bus_type; + dev->dev.release = fsi_device_release; + + return dev; +} + /* crc helpers */ static const uint8_t crc4_tab[] = { 0x0, 0x7, 0xe, 0x9, 0xb, 0xc, 0x5, 0x2, @@ -59,6 +92,95 @@ static bool check_crc4(uint32_t x) } /* FSI slave support */ +static int fsi_slave_read(struct fsi_slave *slave, uint32_t addr, + void *val, size_t size) +{ + return slave->master->read(slave->master, slave->link, + slave->id, addr, val, size); +} + +static int fsi_slave_scan(struct fsi_slave *slave) +{ + uint32_t engine_addr; + uint32_t conf; + int rc, i; + + /* + * scan engines + * + * We keep the peek mode and slave engines for the core; so start + * at the third slot in the configuration table. We also need to + * skip the chip ID entry at the start of the address space. + */ + engine_addr = engine_page_size * 3; + for (i = 2; i < engine_page_size / sizeof(uint32_t); i++) { + uint8_t slots, version, type; + struct fsi_device *dev; + + rc = fsi_slave_read(slave, (i + 1) * sizeof(conf), + &conf, sizeof(conf)); + if (rc) { + dev_warn(&slave->dev, + "error reading slave registers\n"); + return -1; + } + + conf = be32_to_cpu(conf); + + if (!check_crc4(conf)) { + dev_warn(&slave->dev, + "crc error in slave register at 0x%04x\n", + i); + return -1; + } + + slots = (conf & FSI_SLAVE_CONF_SLOTS_MASK) + >> FSI_SLAVE_CONF_SLOTS_SHIFT; + version = (conf & FSI_SLAVE_CONF_VERSION_MASK) + >> FSI_SLAVE_CONF_VERSION_SHIFT; + type = (conf & FSI_SLAVE_CONF_TYPE_MASK) + >> FSI_SLAVE_CONF_TYPE_SHIFT; + + /* Unused address areas are marked by a zero type value; this + * skips the defined address areas */ + if (type != 0) { + + /* create device */ + dev = fsi_create_device(slave); + if (!dev) + return -ENOMEM; + + dev->engine_type = type; + dev->version = version; + dev->unit = i; + dev->addr = engine_addr; + dev->size = slots * engine_page_size; + + dev_info(&slave->dev, + "engine[%i]: type %x, version %x, addr %x size %x\n", + dev->unit, dev->engine_type, version, + dev->addr, dev->size); + + device_initialize(&dev->dev); + dev_set_name(&dev->dev, "%02x:%02x:%02x:%02x", + slave->master->idx, slave->link, + slave->id, i - 2); + + rc = device_add(&dev->dev); + if (rc) { + dev_warn(&slave->dev, "add failed: %d\n", rc); + put_device(&dev->dev); + } + } + + engine_addr += slots * engine_page_size; + + if (!(conf & FSI_SLAVE_CONF_NEXT_MASK)) + break; + } + + return 0; +} static void fsi_slave_release(struct device *dev) { @@ -109,7 +231,8 @@ static int fsi_slave_init(struct fsi_master *master, return rc; } - return rc; + fsi_slave_scan(slave); + return 0; } /* FSI master support */ diff --git a/include/linux/fsi.h b/include/linux/fsi.h index 6d843d4..dfd3513 100644 --- a/include/linux/fsi.h +++ b/include/linux/fsi.h @@ -22,6 +22,10 @@ struct fsi_device { struct device dev; u8 engine_type; u8 version; + u8 unit; + struct fsi_slave *slave; + uint32_t addr; + uint32_t size; }; struct fsi_device_id {