From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DA957C64E7B for ; Fri, 27 Nov 2020 17:53:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9DCB02224B for ; Fri, 27 Nov 2020 17:53:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="byW8dfwf" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732619AbgK0RxE (ORCPT ); Fri, 27 Nov 2020 12:53:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36944 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732435AbgK0RxD (ORCPT ); Fri, 27 Nov 2020 12:53:03 -0500 Received: from mail-pf1-x443.google.com (mail-pf1-x443.google.com [IPv6:2607:f8b0:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 76418C0613D1 for ; Fri, 27 Nov 2020 09:53:03 -0800 (PST) Received: by mail-pf1-x443.google.com with SMTP id b63so5160306pfg.12 for ; Fri, 27 Nov 2020 09:53:03 -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=rij0KH1Dkx0c0dtAsJPJhqxaQEYYtBan22nB71uEE9k=; b=byW8dfwfqducQED5XmXk6bQEjWTUIXAtZk0WlDUmuKtiP6wFRFqdno0mekD+1HGqVv Vy0zwk2UZPJ2L+q1N974R9z8kwVNpCtfqKR299RaTjNpWjrwXdiLZow4L3WUSxBG0XyH D2LVyArmkRqAJ/iYYEjv9YbAw1nwvdOONK6hw3eGl2eFO7emlyjZDo3bnW1VTP/+bTXx EK5RGaNLHnE3j7Ar8H/fFvKKmwogurBEe3KJ0pOCmV4MR7RC79kroG/UR+gupMd/4aOJ xwP9TUlHfiUMCaM61rS6LobxcKhms3u7zPx5Y14mtMV7sMocfmuFtNEIQMPEMxsYEUCO z3/g== 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=rij0KH1Dkx0c0dtAsJPJhqxaQEYYtBan22nB71uEE9k=; b=gSyNDADoo8KZThJ8Mzg4w6V3za8ECBEO4dW4lRUoe4AUCq0ZkAj/Dhxj/OxJ8+jb8Z Uk+hu4zhAWIVjh4RfvD7HsGb4jJxaOTnANeOl8l6vFwuKeJfTEYG0UguSSTwy4/HAiOi a1pHA7x05yV5vVNS1llbArs+DJ0CW87LTnoY+ajusHTGh5L7XyVSnBE6BbU8mLmHYSeL PxnnB3efDcPMUafwLIaXkTiBmGZVWTmAP/MQALqaviErb7QSXCsNFYimcj82/Tv9AHZu mck3vkDnsDljlfo2YoQTtyNGR5RmZn+aGTGO/tZ0U2Suy4opsWd2RhcQ2+UCc6tGML8s fQvQ== X-Gm-Message-State: AOAM532Zn798DTqE4xI1CBwgwHoLXb0snvfTkAyEuGnvpyR0RoUbpQfT BQkjlG99UQqsbgq6f6lwHuwtuQ== X-Google-Smtp-Source: ABdhPJwJkTnVmdAmCwwPnmbp9LBe78MjFmlM5BVzejujiU1U+W2Dj8VfT9TXDmb6sax1CS25KOKQvQ== X-Received: by 2002:a62:f909:0:b029:18b:588d:979e with SMTP id o9-20020a62f9090000b029018b588d979emr8105544pfh.48.1606499583071; Fri, 27 Nov 2020 09:53:03 -0800 (PST) Received: from xps15.cg.shawcable.net (S0106889e681aac74.cg.shawcable.net. [68.147.0.187]) by smtp.gmail.com with ESMTPSA id t18sm10536724pji.1.2020.11.27.09.53.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Nov 2020 09:53:02 -0800 (PST) From: Mathieu Poirier To: gregkh@linuxfoundation.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 05/15] coresight: etm4x: Update TRCIDR3.NUMPROCS handling to match v4.2 Date: Fri, 27 Nov 2020 10:52:46 -0700 Message-Id: <20201127175256.1092685-6-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201127175256.1092685-1-mathieu.poirier@linaro.org> References: <20201127175256.1092685-1-mathieu.poirier@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Suzuki K Poulose Since ETMv4.2, TRCIDR3.NUMPROCS has been extended to a 5bit field by encoding the top 2 bits[4:3] in TRCIDR3.[13:12], which were RES0. Fix the driver to compute the field correctly for ETMv4.2+ Cc: Mike Leach Cc: Mathieu Poirier Signed-off-by: Suzuki K Poulose Signed-off-by: Mathieu Poirier --- drivers/hwtracing/coresight/coresight-etm4x-core.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c index af0ab2f44865..cbbe755d1d16 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c @@ -724,8 +724,13 @@ static void etm4_init_arch_data(void *info) else drvdata->sysstall = false; - /* NUMPROC, bits[30:28] the number of PEs available for tracing */ - drvdata->nr_pe = BMVAL(etmidr3, 28, 30); + /* + * NUMPROC - the number of PEs available for tracing, 5bits + * = TRCIDR3.bits[13:12]bits[30:28] + * bits[4:3] = TRCIDR3.bits[13:12] (since etm-v4.2, otherwise RES0) + * bits[3:0] = TRCIDR3.bits[30:28] + */ + drvdata->nr_pe = (BMVAL(etmidr3, 12, 13) << 3) | BMVAL(etmidr3, 28, 30); /* NOOVERFLOW, bit[31] is trace overflow prevention supported */ if (BMVAL(etmidr3, 31, 31)) -- 2.25.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7AB11C3E8C5 for ; Fri, 27 Nov 2020 17:54:54 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EAC1F2224A for ; Fri, 27 Nov 2020 17:54:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="1UY3P0jV"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="byW8dfwf" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EAC1F2224A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.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=+Hr0E7rEfq/ydhGWqSJy3jzCrxaSvjRIQCA1f1HGE8Y=; b=1UY3P0jVaW5l7uYVxk++R3Bfq J2k1j0rNybdMsl6QzIFs4Ij73BMUdXUuMCdUR92wiGbQkqsq86RlP2tWDwzlj4o7PaZJI0UyLScZT kbnTRUoad/1jCBvCvcu4U3+1lb2NpZjkeUlS5g/kqwrCXrele0brMbizmj8dVCdZJdfQcve3thdmk O52pb36FfkxRM0tdb3q728Alau5mtOEFaZneeZQSUbGshEV2QptV++Um7Rd8ZSB9Wyzsin2N32h6c maJ5NEaVFWl6v9akXX1VHsQiT2vsMM8nQ81VP1hz1tGF8ATCXGyijXuZN85Q52i4rm2VbR7Izif+5 LblhitupA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kihvq-0004hh-2Z; Fri, 27 Nov 2020 17:53:18 +0000 Received: from mail-pg1-x544.google.com ([2607:f8b0:4864:20::544]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kihvd-0004bu-SK for linux-arm-kernel@lists.infradead.org; Fri, 27 Nov 2020 17:53:07 +0000 Received: by mail-pg1-x544.google.com with SMTP id t3so4859990pgi.11 for ; Fri, 27 Nov 2020 09:53:04 -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=rij0KH1Dkx0c0dtAsJPJhqxaQEYYtBan22nB71uEE9k=; b=byW8dfwfqducQED5XmXk6bQEjWTUIXAtZk0WlDUmuKtiP6wFRFqdno0mekD+1HGqVv Vy0zwk2UZPJ2L+q1N974R9z8kwVNpCtfqKR299RaTjNpWjrwXdiLZow4L3WUSxBG0XyH D2LVyArmkRqAJ/iYYEjv9YbAw1nwvdOONK6hw3eGl2eFO7emlyjZDo3bnW1VTP/+bTXx EK5RGaNLHnE3j7Ar8H/fFvKKmwogurBEe3KJ0pOCmV4MR7RC79kroG/UR+gupMd/4aOJ xwP9TUlHfiUMCaM61rS6LobxcKhms3u7zPx5Y14mtMV7sMocfmuFtNEIQMPEMxsYEUCO z3/g== 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=rij0KH1Dkx0c0dtAsJPJhqxaQEYYtBan22nB71uEE9k=; b=tWyBDP6jwuT9cHXTAMRvRFoevZjHpIfjpgvAeIpRmXjLFAac4pz27TA7G+DHDki74a 6o4BMbU41chAshFLvazYSB9n+3HQSqBfv30qgEHEhHvQcK9ZtbFKsBQUYaRxtUUZjM1i v+iFy1HZjXpilObYlpgudQaI/wnatvgNRBTH0LO3Tr10dFnN3crlQCMQYU3cGfi8x2hR 6iX4aD1LwSwOC7CnTLM34SBwyOGyXB1qrg1uXo6jHS9Vt9+imktu/djXPQOuaSRF111V KmXlxvCyRjDWP0NKe8rh51hxIcgRUwujvLLLShv0c2B9MACmC1pK/1/Y/6fPsJKtCsHj Bvbw== X-Gm-Message-State: AOAM531I1bo+edxJrKUmCAe7gxzccNOvvsJrhKqUNh73eB25g8jqVv1X 9Cw0kOGSfxJUFUs28WlGY24lgHibfnHBhoFP X-Google-Smtp-Source: ABdhPJwJkTnVmdAmCwwPnmbp9LBe78MjFmlM5BVzejujiU1U+W2Dj8VfT9TXDmb6sax1CS25KOKQvQ== X-Received: by 2002:a62:f909:0:b029:18b:588d:979e with SMTP id o9-20020a62f9090000b029018b588d979emr8105544pfh.48.1606499583071; Fri, 27 Nov 2020 09:53:03 -0800 (PST) Received: from xps15.cg.shawcable.net (S0106889e681aac74.cg.shawcable.net. [68.147.0.187]) by smtp.gmail.com with ESMTPSA id t18sm10536724pji.1.2020.11.27.09.53.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Nov 2020 09:53:02 -0800 (PST) From: Mathieu Poirier To: gregkh@linuxfoundation.org Subject: [PATCH 05/15] coresight: etm4x: Update TRCIDR3.NUMPROCS handling to match v4.2 Date: Fri, 27 Nov 2020 10:52:46 -0700 Message-Id: <20201127175256.1092685-6-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201127175256.1092685-1-mathieu.poirier@linaro.org> References: <20201127175256.1092685-1-mathieu.poirier@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201127_125306_042224_E1557147 X-CRM114-Status: GOOD ( 14.47 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Suzuki K Poulose Since ETMv4.2, TRCIDR3.NUMPROCS has been extended to a 5bit field by encoding the top 2 bits[4:3] in TRCIDR3.[13:12], which were RES0. Fix the driver to compute the field correctly for ETMv4.2+ Cc: Mike Leach Cc: Mathieu Poirier Signed-off-by: Suzuki K Poulose Signed-off-by: Mathieu Poirier --- drivers/hwtracing/coresight/coresight-etm4x-core.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c index af0ab2f44865..cbbe755d1d16 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c @@ -724,8 +724,13 @@ static void etm4_init_arch_data(void *info) else drvdata->sysstall = false; - /* NUMPROC, bits[30:28] the number of PEs available for tracing */ - drvdata->nr_pe = BMVAL(etmidr3, 28, 30); + /* + * NUMPROC - the number of PEs available for tracing, 5bits + * = TRCIDR3.bits[13:12]bits[30:28] + * bits[4:3] = TRCIDR3.bits[13:12] (since etm-v4.2, otherwise RES0) + * bits[3:0] = TRCIDR3.bits[30:28] + */ + drvdata->nr_pe = (BMVAL(etmidr3, 12, 13) << 3) | BMVAL(etmidr3, 28, 30); /* NOOVERFLOW, bit[31] is trace overflow prevention supported */ if (BMVAL(etmidr3, 31, 31)) -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel