From patchwork Mon Feb 22 16:02:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 385862 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=unavailable 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 979EAC4332E for ; Mon, 22 Feb 2021 16:05:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 77FD064EF2 for ; Mon, 22 Feb 2021 16:05:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231373AbhBVQEy (ORCPT ); Mon, 22 Feb 2021 11:04:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50832 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231364AbhBVQDo (ORCPT ); Mon, 22 Feb 2021 11:03:44 -0500 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 581C0C06121E for ; Mon, 22 Feb 2021 08:01:45 -0800 (PST) Received: by mail-wr1-x42c.google.com with SMTP id u14so19654196wri.3 for ; Mon, 22 Feb 2021 08:01:45 -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=Vlf/ot8rdszf9DD1IlnSclOJAqaQ4vSy7GijpaYLiA8=; b=NJhVwKed5vcjzBfb6kT9X/UDdUdVdMYIU3j3dylUtyDCxcaswALQ0xLN4grG1L4idD SDCTcC4U7VOqQCtvnqLg/FOXyD6yWVAFGH58/c2gZV+SlGpsNifusSnZCNEXaDIIeOG0 +XX9illg5CnSgd7YwljaNhaQ5FBuVweShgdeZrUTpvS+PRbgVey8OzbEJQ6riuNujYch bTmVgI3KAVxTFynoM53RWC4ooUBS/id6nmm/S1iG8XabHmA/Ts61f4tucD8U1TLQn2j6 l47LUdSmdfQSeNeIy/lALIdBHJUsiOWYYZOxnw5NS81rfUmyZEONtBYKKARnB6y3O0W3 zkkw== 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=Vlf/ot8rdszf9DD1IlnSclOJAqaQ4vSy7GijpaYLiA8=; b=q0GIy4H/M0Sc9gqAKCbWhNFro4lloW/4hDBPhBY4zkszDd8ro/O6UidmBl0bF6t5RW poOyXYp8ibgBRMZmdCmlJKAbupARoBRyxRo4SEUqu/MHMcheaTUUgBKwToGISuNTe3V7 pTepP422uJd0IvlIM7BjNXFVC3PV6kAKXhhbgtvsK60b9j85WFmknq1LVxq0VRvst32C 0J1gVk1o6l3cJlBFYtuPNqjVFhEXSYUPPjls6cF9mnGpntMf8nMEbHp/5ySKwXsLTpDK 4moETxNb+EihyuKmtJ9zJQrC3dzYKLswsyS9xHBRPqSwx3RVzUiTwlU7mOodAwc+XXTF z8Hg== X-Gm-Message-State: AOAM533HWI85ZBwvHvK5T80O7Jck0kLf+m9jreMXxT7XOm0Azfkdq78b CxjWY4Ydz7bLNTdcoR70Bo1mMQ== X-Google-Smtp-Source: ABdhPJysLUCRqvvzTo21k/VHY+1WxWTos4A7dzYxtioWV/Dsf8jUDXZ8nBldsMxqEUoDOPdmz1hUbQ== X-Received: by 2002:adf:b611:: with SMTP id f17mr21588878wre.8.1614009704138; Mon, 22 Feb 2021 08:01:44 -0800 (PST) Received: from sagittarius-a.chello.ie (188-141-3-169.dynamic.upc.ie. [188.141.3.169]) by smtp.gmail.com with ESMTPSA id c3sm7373697wrw.80.2021.02.22.08.01.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Feb 2021 08:01:43 -0800 (PST) From: Bryan O'Donoghue To: stanimir.varbanov@linaro.org, agross@kernel.org, bjorn.andersson@linaro.org, mchehab@kernel.org, linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org Cc: bryan.odonoghue@linaro.org, dikshita@codeaurora.org, jonathan@marek.ca, vgarodia@codeaurora.org Subject: [PATCH 07/25] media: venus: hfi: Define block offsets for V6 hardware Date: Mon, 22 Feb 2021 16:02:42 +0000 Message-Id: <20210222160300.1811121-8-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210222160300.1811121-1-bryan.odonoghue@linaro.org> References: <20210222160300.1811121-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org From: Dikshita Agarwal This commit defines a range of new base addresses for already defined blocks. - CPU_BASE_V6 - CPU_CS_BASE_V6 - CPU_IC_BASE_V6 - WRAPPER_BASE_V6 The base addresses of the blocks are slightly different for 6xx but, aside from that are layout and bit compatible. New 6xx specific block addresses will be added in separate commits. Signed-off-by: Dikshita Agarwal Co-developed-by: Bryan O'Donoghue Signed-off-by: Bryan O'Donoghue Acked-by: Stanimir Varbanov --- drivers/media/platform/qcom/venus/hfi_venus_io.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/media/platform/qcom/venus/hfi_venus_io.h b/drivers/media/platform/qcom/venus/hfi_venus_io.h index 4c392b67252c..8604b213f03f 100644 --- a/drivers/media/platform/qcom/venus/hfi_venus_io.h +++ b/drivers/media/platform/qcom/venus/hfi_venus_io.h @@ -19,6 +19,9 @@ #define CPU_CS_BASE (CPU_BASE + 0x12000) #define CPU_IC_BASE (CPU_BASE + 0x1f000) +#define CPU_BASE_V6 0xa0000 +#define CPU_CS_BASE_V6 CPU_BASE_V6 +#define CPU_IC_BASE_V6 (CPU_BASE_V6 + 0x138) #define CPU_CS_A2HSOFTINTCLR 0x1c @@ -59,6 +62,7 @@ #define CPU_IC_SOFTINT_H2A_SHIFT 0xf /* Venus wrapper */ +#define WRAPPER_BASE_V6 0x000b0000 #define WRAPPER_BASE 0x000e0000 #define WRAPPER_HW_VERSION 0x00