From patchwork Wed Nov 28 10:14:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Leach X-Patchwork-Id: 10702259 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 EB4B813A4 for ; Wed, 28 Nov 2018 10:15:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DB4C22CE23 for ; Wed, 28 Nov 2018 10:15:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CF89A2CF85; Wed, 28 Nov 2018 10:15:57 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED 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 6D9462CE23 for ; Wed, 28 Nov 2018 10:15:57 +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=xDGnnnGSHrCzcoHibUwIkCCD9ECjV8exCt+I/yljSXo=; b=X5H5+WXwwuZPyy 7VDnHxxkGdH78qn9+VbofuK6sN18QfzySOfH9Vp/vjY4VBm/fF+Hzts8tILJKDu3XrVODf/zl1lQo wNiTCUUWCewtBV0/m8tOXsdbOWqi1Vl3Vn/iCHRrPTc7lOBHGXaR7WogsK6fUjruMB06K+bmdgdm3 bqtxyWB1MvKfxTGvbnRM5ieV97bEqz5boyjZZq8B7IaLPu3pcddLPRRq8u73X7GIPRvDl4NER57gj h3aWHiK4kJX+tBhfn0xTmnr4ctTQrWjLZUMf2nkHobsOwedw2IO8ShXjkTPUH0nOYGJbUddE38p3n TPWxe+3rzvOIoKj9Dwow==; 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 1gRwsu-0002HQ-Ka; Wed, 28 Nov 2018 10:15:56 +0000 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gRws8-00007P-0P for linux-arm-kernel@lists.infradead.org; Wed, 28 Nov 2018 10:15:15 +0000 Received: by mail-wm1-x343.google.com with SMTP id k198so1959765wmd.3 for ; Wed, 28 Nov 2018 02:14:57 -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=YvT3dqwTDs0o+ga2r81dxgNs/bWyhNQ8OBvFpXsRz0A=; b=gF4/fFVQzC3/xdTW9d8mG0sI1CEKWL5G9GAn2tm6AobmyAUK8fu66saUGx27gp80KK 7uk5z4Q++WWZXiNKaFmdxLTK5/KmYtRg3mRHr4SKF4S4KnHsOGD8QWxgRVCbgqDm6fQz xKp5JRikSkBl4M8vIua4s3sdLzdtRtYxWHRSs= 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=YvT3dqwTDs0o+ga2r81dxgNs/bWyhNQ8OBvFpXsRz0A=; b=d/6J3v6pv1fUWViuVKVfmHmIYA+KFAFRuMWRfHBTiHjPdZ7ECjjk45GMk7vNaVAxZ+ 329ir+FulEGXBRZbvI+W5yd7w5I1c9efBBKN1QYyCxuyMwAg8cgz9g44kFN6eWf8pHuO qzZQbz/aTaZmJPtWnD1JSMxkm5bRcL2BkkorX1lGP/KBHxLt6uYzhwvYvR83f0guW8bC KOGvME/a7P4GSxWUqGY+ijcsZnREI3m3rNZS9AzIhTbDwn7NYZ4oTYmlvP5OO3wTTfMp a1y/+ILBZokACAJDzOLdCJ4RZtR4bwnm1oBsG/y2j7+pQnvQ8rstq+jfarofF1ul3LJp FgbQ== X-Gm-Message-State: AA+aEWbHpaacilpV0l535fO+ABNpuFjdrY6MOoZv0JJeX8sldlnlIhkS M7kDKLgPYYB7YPMhGeIWfgIaOQ== X-Google-Smtp-Source: AFSGD/VPQqXPzlo3Rz/6kSwlByEKUES6wHe4NjrsuOTcRgWvDj2OwLxnxBCZLKKcuJ1Q14su7t3+8A== X-Received: by 2002:a1c:9f0e:: with SMTP id i14mr2299374wme.10.1543400096521; Wed, 28 Nov 2018 02:14:56 -0800 (PST) Received: from linaro.org ([2a00:23c5:6815:3901:cf0e:17bd:f425:fac3]) by smtp.gmail.com with ESMTPSA id w16sm8852108wrp.1.2018.11.28.02.14.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 28 Nov 2018 02:14:55 -0800 (PST) From: Mike Leach To: mike.leach@linaro.org, linux@armlinux.org.uk, coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org Subject: [RFC PATCH v2 3/3] amba: coresight: Driver test for new CoreSight UCI matching Date: Wed, 28 Nov 2018 10:14:23 +0000 Message-Id: <20181128101423.15961-4-mike.leach@linaro.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181128101423.15961-1-mike.leach@linaro.org> References: <20181128101423.15961-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-20181128_021508_234451_976B3FF7 X-CRM114-Status: GOOD ( 17.53 ) 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: mathieu.poirier@linaro.org, suzuki.poulose@arm.com 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 This patch adds in logging and modifications to amba driver, etmv4 driver and DB410C device tree to allow testing of the new UCI component matching algorithm used for certain class of components on an AMBA bus. Test only - not intended for upstream. Signed-off-by: Mike Leach --- arch/arm64/boot/dts/qcom/msm8916.dtsi | 9 +++++++++ drivers/amba/bus.c | 13 ++++++++++++- drivers/hwtracing/coresight/coresight-etm4x.c | 3 ++- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi index d302d8d639a1..c8b503a63b2c 100644 --- a/arch/arm64/boot/dts/qcom/msm8916.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi @@ -1368,6 +1368,15 @@ }; }; + /* add an as yet unsupported CTI for UCI test - CPU-0 */ + cti@858000 { + compatible = "arm,coresight-cti", "arm,primecell"; + reg = <0x858000 0x1000>; + + clocks = <&rpmcc RPM_QDSS_CLK>; + clock-names = "apb_pclk"; + }; + venus: video-codec@1d00000 { compatible = "qcom,msm8916-venus"; reg = <0x01d00000 0xff000>; diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c index 387ee8f7720b..ccc2bb4a98b8 100644 --- a/drivers/amba/bus.c +++ b/drivers/amba/bus.c @@ -32,19 +32,30 @@ amba_cs_uci_id_match(const struct amba_id *table, struct amba_device *dev) { int ret = 0; struct amba_cs_uci_id *uci; + struct device *adev; /* device for test logging */ uci = table->data; + adev = &dev->dev; /* no table data - return match on periphid */ - if (!uci) + if (!uci) { + dev_info(adev, "uci_match: no UCI, use periphID\n"); return 1; + } if (uci->devarch) { ret = (dev->uci.devtype == uci->devtype) && ((dev->uci.devarch & uci->devarch_mask) == uci->devarch); + dev_info(adev, "device: devtype[%x]; devarch[%x];\n", + dev->uci.devtype, dev->uci.devarch); + dev_info(adev, "uci_match: devtype[%x]; devarch[%x]; (%s)\n", + uci->devtype, uci->devarch, + ret ? "match" : "no match"); } else { /* devtype only if devarch set to 0 */ ret = dev->uci.devtype == uci->devtype; + dev_info(adev, "uci_match: devtype-only[%x]; (%s)\n", + uci->devtype, ret ? "match" : "no match"); } return ret; } diff --git a/drivers/hwtracing/coresight/coresight-etm4x.c b/drivers/hwtracing/coresight/coresight-etm4x.c index 2fb8054e43ab..4dfc41c37447 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x.c +++ b/drivers/hwtracing/coresight/coresight-etm4x.c @@ -1090,11 +1090,12 @@ static struct amba_cs_uci_id uci_id_etm4[] = { } static const struct amba_id etm4_ids[] = { - ETM4x_AMBA_ID(0x000bb95d), /* Cortex-A53 */ + ETM4x_AMBA_UCI_ID(0x000bb95d), /* C-A53 - UCI optional for test */ ETM4x_AMBA_ID(0x000bb95e), /* Cortex-A57 */ ETM4x_AMBA_ID(0x000bb95a), /* Cortex-A72 */ ETM4x_AMBA_ID(0x000bb959), /* Cortex-A73 */ ETM4x_AMBA_UCI_ID(0x000bb9da), /* Cortex-A35 */ + ETM4x_AMBA_UCI_ID(0x000bb9a8), /* CTI PID A53 - test fail UCI match */ {}, };