From patchwork Thu Nov 15 01:28:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Leach X-Patchwork-Id: 10683409 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5B51314D6 for ; Thu, 15 Nov 2018 01:31:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 43F782C09F for ; Thu, 15 Nov 2018 01:31:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3769A2C0AF; Thu, 15 Nov 2018 01:31:20 +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=-3.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 AD5662C09F for ; Thu, 15 Nov 2018 01:31:19 +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: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=MiSZEG4N1hhHCX6IFiX3nq9/T0vkxMDobH/yc88Gh2A=; b=JsyPP+Kw+ajDEO mwB/EX43wbOVNlmiX3S2AjKILmj9MQGfb1Lc+EUiRKd9Xqd56Ln7AXOTgHRDLro6wdvvDE53307dE 0Q18FVocLippoEGPzKY3yDxQL8D2QO/zVmrGj6+AJBDY0xcJWHwifFuNBMHt05fvvQDXGwFFlIB3p 4zsXS+GSnGNRQBGqVPtNww7iteRkqN/BXuVmGzEleVTsR9spFu7HycrKiLYfAKJskf0uws/KkB7M7 LZn39isfBjfKRfywoj3VTM/Q/38SRv8qVryvlN4auNnl+73M5RwXDoq2IXUlK++2buBvb+cRweV/b CX0Rtt5VuB744RomvxkQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gN6Uw-00018M-Hn; Thu, 15 Nov 2018 01:31:10 +0000 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gN6Ul-0000xS-3m for linux-arm-kernel@lists.infradead.org; Thu, 15 Nov 2018 01:31:00 +0000 Received: by mail-wm1-x342.google.com with SMTP id f10-v6so17165560wme.3 for ; Wed, 14 Nov 2018 17:30:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xHSv5vgxSr8YmVa5kWyp/vxFkBRT3PMtEIqZhvTEefI=; b=ZfXkS4Urdwiwp6RHn9FNstp6RVrr0sakEXABz6uFMrGI0UuTKST0LJXK8iTjMh1yEI bifuNvgWltE9KWVMIEZ85bqXdMVWU1j0m1ta11NCAEKGdRbJchgShvbj26Xnnjbok21P 22wZgayBSTb8EvqMt9AxtjExA66BZBn17TQmE= 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:mime-version:content-transfer-encoding; bh=xHSv5vgxSr8YmVa5kWyp/vxFkBRT3PMtEIqZhvTEefI=; b=BkQvTA3zsk9dRtUTmjNTlfhpuLBlEU0MTwgzzzOW8DFT6Uhjc6PV+PqmrJ85YDVfUW FHYg5lKjRbrbeo/RY2ys0yMk1VIp+gEYdxuc9646uI8JM9wq+HblvDYJo0X+9mjRUGxb WxyisCZPbElggM9diNQPxbgdXgSbhGgyPhINqe9bRZXuioNwlZVehgZBwPU1L54vu3gL BHgwQVCl6uiTycjkrfBAef+cfmjYuTtXJmD5T7ITSIT9Yjh5Z2MU1iqkpQxIhua+dxcE 1e5JnjW4o3bSocrwxqel3gwxdGKuFKFWphFJyUqbJ73nqUUtH9uSqsffP0IKo5MV0XoV Ql6A== X-Gm-Message-State: AGRZ1gLssKFtd+z86BS1HIzpxbh3b05eZpBNO6VPuA7QdGBkmSUj1M4d T+pF8dhni7I/Px/PdbsknK7tLA== X-Google-Smtp-Source: AJdET5fyLxMqa5iECpFpbE+w5XtpWGYpJD4yJugFI3Cod1rgSb7bJV/d721Kav9KLUqpdbqxPgDLrw== X-Received: by 2002:a1c:28c6:: with SMTP id o189-v6mr3367657wmo.89.1542245447409; Wed, 14 Nov 2018 17:30:47 -0800 (PST) Received: from linaro.org (host86-129-101-165.range86-129.btcentralplus.com. [86.129.101.165]) by smtp.gmail.com with ESMTPSA id v23-v6sm17219890wrd.92.2018.11.14.17.30.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 14 Nov 2018 17:30:46 -0800 (PST) From: Mike Leach To: mathieu.poirier@linaro.org, coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org Subject: [RFC PATCH 1/3] drivers: amba: Updates to component identification for driver matching. Date: Thu, 15 Nov 2018 01:28:40 +0000 Message-Id: <20181115012842.2353-2-mike.leach@linaro.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181115012842.2353-1-mike.leach@linaro.org> References: <20181115012842.2353-1-mike.leach@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181114_173059_150763_4C9CF669 X-CRM114-Status: GOOD ( 19.91 ) 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: Mike Leach 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 The CoreSight specification (ARM IHI 0029E), updates the ID register requirements for components on an AMBA bus, to cover both traditional ARM Primecell type devices, and newer CoreSight and other components. The Peripheral ID (PID) / Component ID (CID) pair is extended in certain cases to uniquely identify components. CoreSight components related to a single function can share Peripheral ID values, and must be further identified using a Unique Component Identifier (UCI). e.g. the ETM, CTI, PMU and Debug hardware of the A35 all share the same PID. Bits 11:8 of the CID are defined to be the device class. Class 0xF remains for PrimeCell and legacy components. Class 0x9 defines the component as CoreSight (CORESIGHT_CID above) Class 0x0, 0x1, 0xB, 0xE define components that do not have driver support at present. Class 0x2-0x8,0xA and 0xD-0xD are presently reserved. The specification futher defines which classes of device use the standard CID/PID pair, and when additional ID registers are required. The patches provide an update of amba_device and matching code to handle the additional registers required for the Class 0x9 (CoreSight) UCI. The *data pointer in the amba_id is used by the driver to provide extended ID register values for matching. CoreSight components where PID/CID pair is currently sufficient for unique identification need not provide this additional information. Signed-off-by: Mike Leach --- drivers/amba/bus.c | 48 ++++++++++++++++++++++++++++++++++++---- include/linux/amba/bus.h | 33 +++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 4 deletions(-) diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c index 41b706403ef7..6eab977f4314 100644 --- a/drivers/amba/bus.c +++ b/drivers/amba/bus.c @@ -26,6 +26,28 @@ #define to_amba_driver(d) container_of(d, struct amba_driver, drv) +/* called on periphid match and class 0x9 coresight device. */ +static int amba_uci_match(const struct amba_id *table, struct amba_device *dev) +{ + int ret = 0; + struct amba_cs_uci_id *uci; + + uci = table->data; + + /* no table data - return match on periphid */ + if (!uci) + return 1; + + if (uci->devarch) { + ret = (dev->uci.devtype == uci->devtype) && + ((dev->uci.devarch & uci->mask) == uci->devarch); + } else { + /* devtype only if devarch set to 0 */ + ret = dev->uci.devtype == uci->devtype; + } + return ret; +} + static const struct amba_id * amba_lookup(const struct amba_id *table, struct amba_device *dev) { @@ -33,11 +55,17 @@ amba_lookup(const struct amba_id *table, struct amba_device *dev) while (table->mask) { ret = (dev->periphid & table->mask) == table->id; - if (ret) - break; + /* matched on periphid - check UCI if CoreSight */ + if (ret) { + if (dev->cid == CORESIGHT_CID) { + ret = amba_uci_match(table, dev); + if (ret) + break; + } else + break; + } table++; } - return ret ? table : NULL; } @@ -399,10 +427,22 @@ static int amba_device_try_add(struct amba_device *dev, struct resource *parent) cid |= (readl(tmp + size - 0x10 + 4 * i) & 255) << (i * 8); + if (cid == CORESIGHT_CID) { + /* set the base to the start of the last 4k block */ + void __iomem *csbase = tmp + size - 4096; + + dev->uci.devarch = + readl(csbase + UCI_REG_DEVARCH_OFFSET); + dev->uci.devtype = + readl(csbase + UCI_REG_DEVTYPE_OFFSET) & 0xff; + } + amba_put_disable_pclk(dev); - if (cid == AMBA_CID || cid == CORESIGHT_CID) + if (cid == AMBA_CID || cid == CORESIGHT_CID) { dev->periphid = pid; + dev->cid = cid; + } if (!dev->periphid) ret = -ENODEV; diff --git a/include/linux/amba/bus.h b/include/linux/amba/bus.h index d143c13bed26..a83a0a3dece8 100644 --- a/include/linux/amba/bus.h +++ b/include/linux/amba/bus.h @@ -25,6 +25,36 @@ #define AMBA_CID 0xb105f00d #define CORESIGHT_CID 0xb105900d +/* + * CoreSight Architecture specification updates the ID specification + * for components on the AMBA bus. (ARM IHI 0029E) + * + * Bits 11:8 of the CID are the device class. + * + * Class 0xF remains for PrimeCell and legacy components. (AMBA_CID above) + * Class 0x9 defines the component as CoreSight (CORESIGHT_CID above) + * Class 0x0, 0x1, 0xB, 0xE define components that do not have driver support + * at present. + * Class 0x2-0x8,0xA and 0xD-0xD are presently reserved. + * + * Remaining CID bits stay as 0xb105-00d + */ + +/* + * Class 0x9 components use additional values to form a Unique Component + * Identifier (UCI), where peripheral ID values are identical for different + * components. Passed to the amba bus code from the component driver via + * the amba_id->data pointer. + */ +struct amba_cs_uci_id { + unsigned int devarch; + unsigned int mask; + unsigned int devtype; +}; + +#define UCI_REG_DEVTYPE_OFFSET 0xFCC +#define UCI_REG_DEVARCH_OFFSET 0xFBC + struct clk; struct amba_device { @@ -32,6 +62,8 @@ struct amba_device { struct resource res; struct clk *pclk; unsigned int periphid; + unsigned int cid; + struct amba_cs_uci_id uci; unsigned int irq[AMBA_NR_IRQS]; char *driver_override; }; @@ -61,6 +93,7 @@ enum amba_vendor { (((conf) & 0xff) << 24 | ((rev) & 0xf) << 20 | \ AMBA_VENDOR_LINUX << 12 | ((part) & 0xfff)) + extern struct bus_type amba_bustype; #define to_amba_device(d) container_of(d, struct amba_device, dev)