From patchwork Thu Dec 7 12:54:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13483266 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 914E4C10F04 for ; Thu, 7 Dec 2023 12:55:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=W9t9jxrByKqXBYuFtCGsxPH+HEpcIIVJ5eYM0jD0Tig=; b=R2xwXOODq7Btk2 Z7cpKVS7my1MdplEYhSfr2f+oEoFgnsYArF/h6dzjQ/bXzvNSL9D+rzSXQn0wn7dWMUtk8fMcueU0 tfaWA3B44xR8dNDF3z/6XfAlcWDRtYA7WqBCAvi3HPwLl2oA0DhY89W32hD03kAgCkm+l1pn8BuFF 6Ae3si457IDdtpnBIdTxN0gRnPj+bZExZLWgadEl3y+42wZUpO5VkY7m2LaYDjqU5pr2f37IdBvP2 mOM7u83fUjsn1hpBgtp+v4nViFzYo4eski2v7eqE1kFS2FIcO1hzgOKH6N7CV0Ln+NH1J4XQn0w3a FR35g74xnqr9bUGdUkmw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rBDuG-00CqtO-1o; Thu, 07 Dec 2023 12:55:08 +0000 Received: from mail-lf1-x12a.google.com ([2a00:1450:4864:20::12a]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rBDuC-00CqrZ-0a for linux-arm-kernel@lists.infradead.org; Thu, 07 Dec 2023 12:55:06 +0000 Received: by mail-lf1-x12a.google.com with SMTP id 2adb3069b0e04-50be9e6427dso641253e87.1 for ; Thu, 07 Dec 2023 04:55:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1701953702; x=1702558502; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dRRcxjW3hYUF4pvL7cDymuG16d1D2vZw+YzDn6n0y/M=; b=QAMzht4oXNKwzL6Wo89dMK5DPjdwkNQv4p+VInNc2CN3bG44k/hAerc95b3H+crkPM glAVKgUYwcBsRp2OlHNZJpuvO3eCX/NSJ2K++JNQAQhenOlPqTszI1LA8jN7kyn1a0IV qSmHoLa6cvlHNQOxbAr/bB5v3cHpOEYPAhNCP3eMItW4/TM2AqNBkDQx9YZEAvnGsd8+ fDt/RJvWYYG/aa7w/sfGaXCzsYewruLcDEBsw0wMcYtN6JrqyIlm3VYykfRlZ8G+0Vbo txwI609Gh/ICEEozxwD20qEn9rCR3yQF8pqKT5mVLFr7RsOsdiXn4blTB51wCGrhUbsI GKhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701953702; x=1702558502; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dRRcxjW3hYUF4pvL7cDymuG16d1D2vZw+YzDn6n0y/M=; b=dCQ+64FOfOKeTXB5NzztX98nYraNf/Ab5edQkrWHp7yVpu75YCTrsHDL7YoV6Ie8Bc ouyI0D68TwezRN/Xc+tqUHiYxrxthEGUbEueTkJuBSH0Skge6bpul+xoxE18tBRnC5Uz BDupYK7vG8yZYcdwVLQM8rtOK+9Anlm4sO8v9/I90+eLns7czgwDdLA/frd9O58EqBnQ QZD6AIN2oSJxi3lKqwT0L33l5jg7UO2h/sw78YVKc2D5J7N+j8rK+oq0RZHlue4aVQXF TRHYnUANSyBruy69tU87bFpoQs16vJbcc4p9owgqs3rh4ZMWoc7N6iUBrFBpCEYecUaj E65A== X-Gm-Message-State: AOJu0Yx8pU7iNU/0RCZpm188jXh8g/DUAVXJNvRv10RD44Zh/Qkqkavr NIQ/T5RSBVjpYu0ARnH2NF+gB/MeAZ4/QSGlDFk= X-Google-Smtp-Source: AGHT+IFZ7sHhE81Ocy92+1ArPxojSOEYpfmENzAM2vPFw3RZ+Xcz+EuXmeZtcNaYJEK+StIVY5K/Rg== X-Received: by 2002:a05:6512:29b:b0:50b:f8d8:b176 with SMTP id j27-20020a056512029b00b0050bf8d8b176mr1354154lfp.124.1701953702303; Thu, 07 Dec 2023 04:55:02 -0800 (PST) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id cf30-20020a056512281e00b0050bfc6dbb8asm163659lfb.302.2023.12.07.04.55.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Dec 2023 04:55:02 -0800 (PST) From: Dmitry Baryshkov To: Will Deacon , Robin Murphy , Joerg Roedel , Rob Herring , Krzysztof Kozlowski , Bjorn Andersson , Konrad Dybcio , Rob Clark Cc: Vinod Koul , Sai Prakash Ranjan , linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, iommu@lists.linux.dev, devicetree@vger.kernel.org, freedreno@lists.freedesktop.org Subject: [PATCH 1/3] iommu/msm-iommu: don't limit the driver too much Date: Thu, 7 Dec 2023 15:54:58 +0300 Message-Id: <20231207125500.3322229-2-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231207125500.3322229-1-dmitry.baryshkov@linaro.org> References: <20231207125500.3322229-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231207_045504_247623_15EFB5BA X-CRM114-Status: GOOD ( 12.71 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org In preparation of dropping most of ARCH_QCOM subtypes, stop limiting the driver just to those machines. Allow it to be built for any 32-bit Qualcomm platform (ARCH_QCOM). Signed-off-by: Dmitry Baryshkov Acked-by: Robin Murphy Acked-by: Joerg Roedel --- drivers/iommu/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig index 7673bb82945b..fd67f586f010 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig @@ -178,7 +178,7 @@ config FSL_PAMU config MSM_IOMMU bool "MSM IOMMU Support" depends on ARM - depends on ARCH_MSM8X60 || ARCH_MSM8960 || COMPILE_TEST + depends on ARCH_QCOM || COMPILE_TEST select IOMMU_API select IOMMU_IO_PGTABLE_ARMV7S help From patchwork Thu Dec 7 12:54:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13483267 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E4C5BC4167B for ; Thu, 7 Dec 2023 12:55:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=fRFaAJwVhbOLcT/maWc0BRBAY9A570huLhXkIi8UXCc=; b=Ukv357X/v9zFtK wj5kEN30y4TW9pVIJ6FaMK91pySVr3xmtXP26vdM0yGzqprYcpSlOXaohQj6EWpAKC0+/kSC/JHVQ pDzFMV1Sd+0fseNasnt6SkHVAhVDt9i2JQfu6NY0esjDu68vKqXoNkZmL60EWTpwFyr8yweDyo5Qo jzpTgCvRzwp5FYCb9bDRUyLRLs5tc2RBqOQFfdjE6h17EEM9fe47QO+uPFJdItu+SVxp+xuP2asL7 mreeEl11Hd+kLjPPV9xYh+t5ffDxzZk/vYZn8bF/kATssKXOiDl7BmQI1F6r205xryNNuRRYl4paj PdftYd+IdjGg9mFkzEFA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rBDuK-00Cque-1g; Thu, 07 Dec 2023 12:55:12 +0000 Received: from mail-lf1-x130.google.com ([2a00:1450:4864:20::130]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rBDuF-00Cqrb-3D for linux-arm-kernel@lists.infradead.org; Thu, 07 Dec 2023 12:55:09 +0000 Received: by mail-lf1-x130.google.com with SMTP id 2adb3069b0e04-50c05ea5805so771563e87.0 for ; Thu, 07 Dec 2023 04:55:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1701953703; x=1702558503; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MXRZlAau+k7NGTbzeyPNFZOgIyK71YnKo+kgg/iWUAM=; b=uNCYcD43S1kRGQ69YXKiBOfN5rBjZepIyiar20M3hlvAXKAPrFvujjbWHUArnKSBYK /ntNaGYi1Wjn0QeDAWfJEca3pDZFPl0I4acpkAMgmFtdyxDz1udUhrMVd/Swf7JZDAiU WSPU3oQohlc7rzD6ZECZ7jkkeU1/I+F7oau5v61ulY0OLAG1PQ8AQzPdqYnzM0RGbTbE kPhLfU4Bli5nFMrpeEUYASp7A6HIfpp1AsCExwxeAKbFXpTVrj3uK4Dc/jbOmm/7IFc/ CXOV9Ruw4r+rsVdd24AaYNFylC8fnDgvR4+n5oIhGZASr2PUJlnT4OxrqwUZvDhdpJiT KS6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701953703; x=1702558503; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MXRZlAau+k7NGTbzeyPNFZOgIyK71YnKo+kgg/iWUAM=; b=ZJqpNWuNHwXKF/xdstDpaBPilBtCKfR0h4Tz4a2oIzoqgwpdL43//JR6OHekkiqLN5 di3uEkMC7LOSFTLyXH3ZcZXSAaBAfVmhAvlqscRBVv3Nhm3sgoKW9kYSV3djrVwGchoe BPEal+e7qc2fjkREv0UeiIPm1Sia0Q+g1qJvZIDBaaswtrjLWfUIeOQKK5vJFZ8uJRNK 7ou+/j8uBh2yH++uk//IjUB+tIrU+pbnuCUNaYDqSCAvsdovSSF2yIlma6Kp7B3JvI+d CEEF5JpcIzYRgLIC4xnzCef1ye6ucVdAxGn2iWWFPR8xGD4OwEH245JlwT6fRY4n72Om kXEQ== X-Gm-Message-State: AOJu0YzGKXmoKKnKmR/VPr3opJ1/MTTnhYA/Wfs/EfJKcRzTCGbBG5fO +O0QdeSMgpwE7E4H/5zKh0WeTg== X-Google-Smtp-Source: AGHT+IH8ass7HzS6uZLXeKJmVhmIziNGBwk8jv4tdxJanOaneYQPNZLBKTC6kWejFA4F6qBuDA1Nrg== X-Received: by 2002:a19:9102:0:b0:50b:ee85:ef5e with SMTP id t2-20020a199102000000b0050bee85ef5emr1247967lfd.119.1701953703035; Thu, 07 Dec 2023 04:55:03 -0800 (PST) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id cf30-20020a056512281e00b0050bfc6dbb8asm163659lfb.302.2023.12.07.04.55.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Dec 2023 04:55:02 -0800 (PST) From: Dmitry Baryshkov To: Will Deacon , Robin Murphy , Joerg Roedel , Rob Herring , Krzysztof Kozlowski , Bjorn Andersson , Konrad Dybcio , Rob Clark Cc: Vinod Koul , Sai Prakash Ranjan , linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, iommu@lists.linux.dev, devicetree@vger.kernel.org, freedreno@lists.freedesktop.org Subject: [PATCH 2/3] ARM: qcom: drop most of 32-bit ARCH_QCOM subtypes Date: Thu, 7 Dec 2023 15:54:59 +0300 Message-Id: <20231207125500.3322229-3-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231207125500.3322229-1-dmitry.baryshkov@linaro.org> References: <20231207125500.3322229-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231207_045508_040261_0414E1CB X-CRM114-Status: GOOD ( 11.77 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Historically we had several subtypes of 32-bit Qualcomm platforms. Nowadays they became just useless symbols in Kconfig. Drop them and pull corresponding clocksource entries towards top-level ARCH_QCOM entry. Note, I've left ARCH_IPQ40XX, ARCH_MSM8x60 and ARCH_MSM8960 in place, since they have special TEXT_OFFSET handling, which can be sorted out separately. Signed-off-by: Dmitry Baryshkov --- arch/arm/mach-qcom/Kconfig | 30 ++++-------------------------- 1 file changed, 4 insertions(+), 26 deletions(-) diff --git a/arch/arm/mach-qcom/Kconfig b/arch/arm/mach-qcom/Kconfig index 12a812e61c16..27d5ca0043be 100644 --- a/arch/arm/mach-qcom/Kconfig +++ b/arch/arm/mach-qcom/Kconfig @@ -4,46 +4,24 @@ menuconfig ARCH_QCOM depends on ARCH_MULTI_V7 select ARM_GIC select ARM_AMBA + select CLKSRC_QCOM + select HAVE_ARM_ARCH_TIMER select PINCTRL select QCOM_SCM if SMP help Support for Qualcomm's devicetree based systems. + This includes support for a few devices with ARM64 SoC, that have + ARM32 signed firmware that does not allow booting ARM64 kernels. if ARCH_QCOM config ARCH_IPQ40XX bool "Enable support for IPQ40XX" - select CLKSRC_QCOM - select HAVE_ARM_ARCH_TIMER config ARCH_MSM8X60 bool "Enable support for MSM8X60" - select CLKSRC_QCOM - -config ARCH_MSM8909 - bool "Enable support for MSM8909" - select HAVE_ARM_ARCH_TIMER - -config ARCH_MSM8916 - bool "Enable support for MSM8916" - select HAVE_ARM_ARCH_TIMER - help - Enable support for the Qualcomm Snapdragon 410 (MSM8916/APQ8016). - - Note that ARM64 is the main supported architecture for MSM8916. - The ARM32 option is intended for a few devices with signed firmware - that does not allow booting ARM64 kernels. config ARCH_MSM8960 bool "Enable support for MSM8960" - select CLKSRC_QCOM - -config ARCH_MSM8974 - bool "Enable support for MSM8974" - select HAVE_ARM_ARCH_TIMER - -config ARCH_MDM9615 - bool "Enable support for MDM9615" - select CLKSRC_QCOM endif From patchwork Thu Dec 7 12:55:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13483264 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 28A42C10F04 for ; Thu, 7 Dec 2023 12:55:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Fr7TVc/vzGlcN5FNquBsON9kunxycs+dH3KcrmpAvic=; b=WE6qJzHyZz0RRN uNJeQ6UB0MzFxGyXmzFIa1o79a3rTTe0Ka4ojRnJ9ofrXKIbhrtv5U6SuQl1h1YNkY9fwN0ZA5osJ KzGFgkZGuNZtKTKE1t6Dd+Piu4B/8bJHWkwtpNQPAB+3baZGnRb1JQI/JOR8M6qsMu12YLfSD3oAn r+1qy218n7aF7M0PslkdvTVsv45E14TH94cTcBO79uIntDB5MTk6C0XzJutr3RqQYZlTqahFBN2Xt CGd0wZEg6wlgaZpdM54oT3vtK51P7AbVUapD4byg+e1UuAJvrOPAfJFjcGJwVjC0NAD0EO/p9/wiV AKDJ0hxUOmrXBCrU7kWQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rBDuJ-00CquM-2f; Thu, 07 Dec 2023 12:55:11 +0000 Received: from mail-lj1-x22f.google.com ([2a00:1450:4864:20::22f]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rBDuF-00Cqs0-2y for linux-arm-kernel@lists.infradead.org; Thu, 07 Dec 2023 12:55:09 +0000 Received: by mail-lj1-x22f.google.com with SMTP id 38308e7fff4ca-2c9f72176cfso8308321fa.2 for ; Thu, 07 Dec 2023 04:55:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1701953704; x=1702558504; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=j5KSmEP1TGocOwJYVVwYZKa9nj2Hg1ok92vdy7xwTe8=; b=xGUEOCAbrTk1Cb0tHcc3eBkMVLDPZwmKK93zED16Tw18fJhkRlA1HCENL029CBC0t7 8vmvZzn8WE8NnXFwrdV5X8SadOr6KPXp3HVQLzW33Flu2dJpS4Vak0fLT1nvjmda6Kp5 iaLcg9gCcXRET9ZDHi1u0iVdb003ccchsETB0hlGBKGeBhPgppMJqwg6Rtf+lXtYieVv gGFMOn+jAHPBr5tDMcy5FBUyBk+3TRYNAYx92cSKi0A51Y7do+Wf1vTecefblEB/ts4v nA3HVAS02hMeBVr5b4CRMbA3avwAVSj/ZF0qpWs1Sg1xKp1H0FiaQx9zwkVZXnjLC1o5 EATg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701953704; x=1702558504; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=j5KSmEP1TGocOwJYVVwYZKa9nj2Hg1ok92vdy7xwTe8=; b=JGjyVxgmNLknz7YN6P3ptdE3S9racrunnQHCl7EdL49hODswfV8fFQCRkL0BGsMFi3 9U7I1r/VsFMo51MmQCmQ2ZqY/fs5n/U2QxVGtU6I7M8T64Ob49qXShxPwn9lTJF9JQlo +qfYQCJvRl6HQZjcK683jBtpdYfGUJ9stzj1z+c5Ihp2qfS9sqSYw6s0VTTnhGcVnybv aTSWJAbyyhwQfAr5xHwX/RPBByWTvXwxEM4jeIbpUxRDHdU9hqLTcXm+2CCHe7zrjbJe LuR68LFlNrkr4MDB3VJw5khfeIrJ46FQ+7sKfC/I9UFswr2etbu4vX7l1ywNkU3FOs98 V05A== X-Gm-Message-State: AOJu0Yw39K6J9yPoZUrAhL+eqMPsq5obDQJfMoGVcU5Oe+TPrsKLP2bL OndDNv940MZunJv5BbUJ0X+9fQ== X-Google-Smtp-Source: AGHT+IEPd3y1di3O6hl7akm24VuD+UvFlBj59LsViuKsxVfNbyodkQMJ3vhlHaDmvfNAZZhg7vxVeA== X-Received: by 2002:ac2:538b:0:b0:50b:f881:862a with SMTP id g11-20020ac2538b000000b0050bf881862amr704995lfh.128.1701953703825; Thu, 07 Dec 2023 04:55:03 -0800 (PST) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id cf30-20020a056512281e00b0050bfc6dbb8asm163659lfb.302.2023.12.07.04.55.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Dec 2023 04:55:03 -0800 (PST) From: Dmitry Baryshkov To: Will Deacon , Robin Murphy , Joerg Roedel , Rob Herring , Krzysztof Kozlowski , Bjorn Andersson , Konrad Dybcio , Rob Clark Cc: Vinod Koul , Sai Prakash Ranjan , linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, iommu@lists.linux.dev, devicetree@vger.kernel.org, freedreno@lists.freedesktop.org Subject: [PATCH 3/3] ARM: qcom: merge remaining subplatforms into sensible Kconfig entry Date: Thu, 7 Dec 2023 15:55:00 +0300 Message-Id: <20231207125500.3322229-4-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231207125500.3322229-1-dmitry.baryshkov@linaro.org> References: <20231207125500.3322229-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231207_045507_955018_C728035E X-CRM114-Status: GOOD ( 12.32 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Three remaining Qualcomm platforms have special handling of the TEXT_OFFSET to reserve the memory at the beginnig of the system RAM, see the commit 9e775ad19f52 ("ARM: 7012/1: Set proper TEXT_OFFSET for newer MSMs"). This is required for older platforms like IPQ40xx, MSM8x60, MSM8960 and APQ8064 and is compatible with other 32-bit Qualcomm platforms. Signed-off-by: Dmitry Baryshkov --- arch/arm/Makefile | 4 +--- arch/arm/mach-qcom/Kconfig | 13 +++++-------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 5ba42f69f8ce..45fa8ac001c5 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -158,9 +158,7 @@ textofs-$(CONFIG_ARCH_REALTEK) := 0x00108000 ifeq ($(CONFIG_ARCH_SA1100),y) textofs-$(CONFIG_SA1111) := 0x00208000 endif -textofs-$(CONFIG_ARCH_IPQ40XX) := 0x00208000 -textofs-$(CONFIG_ARCH_MSM8X60) := 0x00208000 -textofs-$(CONFIG_ARCH_MSM8960) := 0x00208000 +textofs-$(CONFIG_ARCH_QCOM_SMEM) := 0x00208000 textofs-$(CONFIG_ARCH_MESON) := 0x00208000 textofs-$(CONFIG_ARCH_AXXIA) := 0x00308000 diff --git a/arch/arm/mach-qcom/Kconfig b/arch/arm/mach-qcom/Kconfig index 27d5ca0043be..0c99d0a746d4 100644 --- a/arch/arm/mach-qcom/Kconfig +++ b/arch/arm/mach-qcom/Kconfig @@ -15,13 +15,10 @@ menuconfig ARCH_QCOM if ARCH_QCOM -config ARCH_IPQ40XX - bool "Enable support for IPQ40XX" - -config ARCH_MSM8X60 - bool "Enable support for MSM8X60" - -config ARCH_MSM8960 - bool "Enable support for MSM8960" +config ARCH_QCOM_SMEM + bool "Reserve SMEM at the beginning of RAM" + help + Reserve 2MB at the beginning of the System RAM for shared mem. + This is required on IPQ40xx, MSM8x60 and MSM8960 platforms. endif