From patchwork Thu Nov 15 01:28:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Leach X-Patchwork-Id: 10683411 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 0D53014DB for ; Thu, 15 Nov 2018 01:31:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E92B02C09F for ; Thu, 15 Nov 2018 01:31:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DBCFE2C0AF; Thu, 15 Nov 2018 01:31:21 +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 6E4A92C09F for ; Thu, 15 Nov 2018 01:31:21 +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=fMMQv1+Inv1v/esa5EJZE9obkY/5E7O/ld0s51lqZ78=; b=HjrxDNBzOOgimu AvkRt9uxK/DmFs1KePfFtwR0tlHR+gm+/l49h2CXgKOHaGnGu4raxl5emBEt+9g2jLs2OQMGpckep GrCTOukq7174JCQxkkLzLAMnKuj5bvmu6uJGknzDzAQi/TzitdQxro6QnFxQ21iRoLpA/UpO0HSmu +CaXVb5whPbE3Qa2DRl2oD8G/5N4irgDHSkBqyLaPHJLBdt3zZNCOSPoXVD0Yvm2NgqTEqOkyqc9w t8Es/2MHfrj/25jD90aWlA4ZdeTvjcD8oZ0f2sM4Hvr/bwFDOC1UK7rGFDji3dS/Xe2b/kemicYvb Ih7n/RC4tKIUEf5QDxRA==; 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 1gN6V5-0001Mc-Oa; Thu, 15 Nov 2018 01:31:19 +0000 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gN6Un-0000xU-9j for linux-arm-kernel@lists.infradead.org; Thu, 15 Nov 2018 01:31:02 +0000 Received: by mail-wr1-x441.google.com with SMTP id j10so5144509wru.4 for ; Wed, 14 Nov 2018 17:30:50 -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=D0NWtVdUkvf03gEAl6Mgz7ASn2+epe5rCmKA11S9J80=; b=guaxGoNX1PrS5dChvu/u7OE5US3IV3iR3bg93ZvSl83edrSsIMEgRBBr22+83H7zmu w8EG3uidWNg5y5xPu9+Ebe4j66nfPdxArdoRzW93pjNqS/uDcfx09/MfQr8Bm8sE26wb AACYU4sIeWmqBmxJbqRSqmNe0eEXMGyHMOS54= 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=D0NWtVdUkvf03gEAl6Mgz7ASn2+epe5rCmKA11S9J80=; b=jW3sZgPSuUanKPMrJm7SM9TktFaTy4cqt9CCdfq4dE533Cf6qd3+r3Bmq9RP7TLOfG xcCYdCYtYRpBffzIVJHQA3LZqX/voGfctGGCJ+ztZPIofukvpRvPRpHyfCqMM3R7NTRq L+Usa/UNTcVsnx6Jhw9rlu7MgnuCImw4TruHfV36YFAoFY9cTHe16kapxIbY0MzmGn/n YNCRorpMXE5naUqdxsxW+jqFrPaaRlqTGD5BjsUNi1meObje5rameZSTFo+5IMsPz650 0JgXSyW55HVEEAvhr84KnW3UZvCoJdB3t7RI/FcIpwRf3gOtZYB09aTzzBn5Okr/4XsS VGZw== X-Gm-Message-State: AGRZ1gJEuLk0PnLrLNf9OpJN655yti0M5pW6Z9NAKEvykQttfdaXT+4W oe7WHw3gP9yh10xtLyVkkCShFg== X-Google-Smtp-Source: AJdET5ck9AEmS/RlszMycLUxfyWc5QLw7P0jvD/R04lnxUDA6hvuGkBpoGPA51a3y00nzK0gl/uBxA== X-Received: by 2002:a5d:5206:: with SMTP id j6-v6mr3718256wrv.147.1542245449563; Wed, 14 Nov 2018 17:30:49 -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.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 14 Nov 2018 17:30:49 -0800 (PST) From: Mike Leach To: mathieu.poirier@linaro.org, coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org Subject: [RFC PATCH 3/3] amba: coresight: Driver test for new CoreSight UCI matching Date: Thu, 15 Nov 2018 01:28:42 +0000 Message-Id: <20181115012842.2353-4-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_173101_360245_BCC42016 X-CRM114-Status: GOOD ( 18.36 ) 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 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. 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 6eab977f4314..3a27d655dcc9 100644 --- a/drivers/amba/bus.c +++ b/drivers/amba/bus.c @@ -31,19 +31,30 @@ static int amba_uci_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->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 1dcb7e14ea6b..13d674a02194 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 */ {}, };