From patchwork Tue Dec 18 21:59:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Leach X-Patchwork-Id: 154205 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp4226277ljp; Tue, 18 Dec 2018 14:00:20 -0800 (PST) X-Google-Smtp-Source: AFSGD/UvPTaFGDz4LCQ2RXovHrF8mMrq1kRASXnzWY3m8AcpgLUY7NXE1bLACU+jMlVrYTVQwoNu X-Received: by 2002:a63:2d82:: with SMTP id t124mr17135498pgt.260.1545170420105; Tue, 18 Dec 2018 14:00:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545170420; cv=none; d=google.com; s=arc-20160816; b=B5vDLBpX6aCffdAcRmlc2AOvupmDxld9r74kr65HNGyWF2rF+0wRCI0fJgC6Jiuvof qRZlU/2bwpPDZSYT45q11d997ab/FCA8XvQUe9UcrcY5CprHirJvvD1p9YhduGX9cr/V 7LmrQI3nfZoIUgyka0l7y0jqG8D5p9T99epds4w13o2HYUysFNEf0NDiFxhgrzOe56rf +nMm6NsEc6u7zO8rfYMGmIyfeHixAuDKpMUObK7FySiqg9bJyyA918Y0B7kd3tn7bnnb MyD6Cl6Ishopu6a9HdRuYsadUfhTzHAD4NPH3FOhEPldRV+EQTFQx2TM41OAggCZbEer X0Gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ydSAlnd72VkQ6lGpPSCbYq4vE2P1PydjacJOrhz/zN0=; b=P6IOs4sO0uPIVIXo1jx7rv3Ga3v9kLPpfJHAlqgzeHqUiuG7FhejP8ETaAXNhzojN/ b2k0k4CuHRsmcWFsqWNR8bfsT9RbUavUGtPf+Z1qYU8jjLk7Wuwi4XxPLnKBDIcSXVYW bNkwH5exSyaLBpV64hsvSHhFNVSx64MQR+K4iH9EMnlAkgjM/eCKll+SFvmZue5qtZ7X yTkvT8CgocZfvIV+RNm7FtWtwKn76O2TbVpU6XIcFl2lo6wXybRFtDbegd82eV5HfOEN JZtb1pShl+PveHFRom7cneXNkwLufC0aEysWA29DPXsbxLQAYWkGyOYTfEIwl2CMnEsd G9pw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="jRIUyLp/"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 4si14230911pla.299.2018.12.18.14.00.19; Tue, 18 Dec 2018 14:00:20 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="jRIUyLp/"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727498AbeLRWAS (ORCPT + 31 others); Tue, 18 Dec 2018 17:00:18 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:43806 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726559AbeLRWAQ (ORCPT ); Tue, 18 Dec 2018 17:00:16 -0500 Received: by mail-wr1-f66.google.com with SMTP id r10so17461360wrs.10 for ; Tue, 18 Dec 2018 14:00:15 -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=ydSAlnd72VkQ6lGpPSCbYq4vE2P1PydjacJOrhz/zN0=; b=jRIUyLp/4QHRrny9LWddhWAJID7GF7mlDFGuK2DnWoswCv7oSP10H/WQBrHtf9JYve dakU/umJ5DqsjpHY0X7DjOIWA3ATFeMt4kItii6TFazvHROYMg1NAZNsdjtxu8ja8eH/ ukVCXTHZYrYzF5ISBZ6jUyVKuTLvWgbUhMtsc= 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=ydSAlnd72VkQ6lGpPSCbYq4vE2P1PydjacJOrhz/zN0=; b=WVtbtK0CBkGcZmNMlIO1ci4D20K6vCVum7HTduaTwoCoNECUslb8QK+xP9pY4sagTK 31KQ7/duofkV2ozrGNO+82SHuoqk1ZISEOxJp/8e7F4aMHMVHs+36ZIkDuu1ZDYfX5vE UU87vOVcd7JKeZx084jjAB3PY0I5UOgziogiKZ6iUaZGzt1M6/AF9ZWaVwhg3Cjx71BQ kyK9WF+kktwDIHej+4y4mZX23E1UeF/ybO/ngCNaddxYGGu4eSUUD6+DkcbVAzVUvMID sUC8CZrRm8hzN3NrIijVH+4fCPRIfs1cxC/86T2jFVujO35tarH6iF5iyubNAC+Ot90t GbHw== X-Gm-Message-State: AA+aEWaRtxL288UQX7N4RAf/wF8iaIQwunqK4fzGoQSjdb4Ti4Dy6kSr Wc3PpHs9RApjw8/TYmEzzmR42Q== X-Received: by 2002:a5d:68c3:: with SMTP id p3mr16815373wrw.34.1545170414485; Tue, 18 Dec 2018 14:00:14 -0800 (PST) Received: from linaro.org ([2a00:23c5:6815:3901:cf0e:17bd:f425:fac3]) by smtp.gmail.com with ESMTPSA id x76sm7449158wmd.27.2018.12.18.14.00.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 18 Dec 2018 14:00:13 -0800 (PST) From: Mike Leach To: mike.leach@linaro.org, linux@armlinux.org.uk Cc: mathieu.poirier@linaro.org, coresight@lists.linaro.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [RESEND PATCH v3 2/2] coresight: etmv4: Update ID register table to add UCI support Date: Tue, 18 Dec 2018 21:59:44 +0000 Message-Id: <20181218215944.2444-3-mike.leach@linaro.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181218215944.2444-1-mike.leach@linaro.org> References: <20181218215944.2444-1-mike.leach@linaro.org> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Updates the ID register tables to contain a UCI entry for the A35 ETM device to allow correct matching of driver in the amba bus code. Signed-off-by: Mike Leach Reviewed-by: Mathieu Poirier --- drivers/hwtracing/coresight/coresight-etm4x.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) -- 2.19.1 Reviewed-by: Suzuki K Poulose diff --git a/drivers/hwtracing/coresight/coresight-etm4x.c b/drivers/hwtracing/coresight/coresight-etm4x.c index 53e2fb6e86f6..2fb8054e43ab 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x.c +++ b/drivers/hwtracing/coresight/coresight-etm4x.c @@ -1073,12 +1073,28 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id) .mask = 0x000fffff, \ } +static struct amba_cs_uci_id uci_id_etm4[] = { + { + /* ETMv4 UCI data */ + .devarch = 0x47704a13, + .devarch_mask = 0xfff0ffff, + .devtype = 0x00000013, + } +}; + +#define ETM4x_AMBA_UCI_ID(pid) \ + { \ + .id = pid, \ + .mask = 0x000fffff, \ + .data = uci_id_etm4, \ + } + static const struct amba_id etm4_ids[] = { ETM4x_AMBA_ID(0x000bb95d), /* Cortex-A53 */ ETM4x_AMBA_ID(0x000bb95e), /* Cortex-A57 */ ETM4x_AMBA_ID(0x000bb95a), /* Cortex-A72 */ ETM4x_AMBA_ID(0x000bb959), /* Cortex-A73 */ - ETM4x_AMBA_ID(0x000bb9da), /* Cortex-A35 */ + ETM4x_AMBA_UCI_ID(0x000bb9da), /* Cortex-A35 */ {}, };