From patchwork Sat Dec 16 16:26: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: 13495639 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 AC4F1C46CA2 for ; Sat, 16 Dec 2023 16:27:32 +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=RhggBw5AO0PIbWIpbC/+hFpr8XZW8NoansWREeGgXww=; b=PRCSTl6qDLZlLn KcABMdidfEfCBssNTgoIkUjls2FpP8osAKfxfukf/bY4ABAUkShA4ZdvsufLt3Gde0UWkS0OQGNoV qkv25glOHmGUtXXAAMPmSUQgOSooJPo7E+2NEAlvQCuGftnnxGmK4oEtto48VldQLrA8yKE5YD3ET 2dteowUc2kUuc9IpQVCQumwBj1np0/FDaOHwoIdX0qf2BzhNnPKE3SCZVuj5cfawRx64gm2k2koWC zb9Ciu8ubsgqUf6SPcol2UyXoriMV48LK8Noq3WP4UMuMP2PG9o2gN+aTRKbGhulXkHmPDFwa7A5A WoKG4qc7rRGDgLKqFQMg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rEXVL-006Jmw-0L; Sat, 16 Dec 2023 16:27:07 +0000 Received: from mail-lf1-x135.google.com ([2a00:1450:4864:20::135]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rEXVI-006Jll-1z for linux-arm-kernel@lists.infradead.org; Sat, 16 Dec 2023 16:27:05 +0000 Received: by mail-lf1-x135.google.com with SMTP id 2adb3069b0e04-50e1112b95cso1729046e87.0 for ; Sat, 16 Dec 2023 08:27:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1702744022; x=1703348822; 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=KElCPZfyJpQwk06b+Z31JKlsF2IDE8giU5N99VUu5rY=; b=DcOf0egxlQlpiKBgc+lCIA2pUjD0MKS+2c5i27uX2Av5pXrgqWH5qGZV6B2/DlFyXv jR9NHQDpfD1+q15LIVow0b/fiH7golHK9peXpFuXbjEcc6SK15KJWa/Xhm4CbUKdaEpO oOfRvn+D8A6OxV5DmJJuiEQxj43fR+eoGVA1vYHE605UhrXgSrXmpBoh5+X/pK2Cgiuu GSd5LN298bB6wNjFsZ4Y3QCfFOvOrHRMkYOmWfjXRvKfktifoIfQ5bP+sYcsq1c/ZQLa JLnUdwwqY8x06f1imHh8RKNaVSmeSnHf1xWA0g0Nhs8OrL7f/Sl51+cW9xz4yDTAr3NV 22eQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702744022; x=1703348822; 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=KElCPZfyJpQwk06b+Z31JKlsF2IDE8giU5N99VUu5rY=; b=RUBj0KPfzH6gJQSOarGWAYGyiGcRDwQGZ7XnVk1NvRsUQUBd+hcTnS9+3TTXnCW1d5 SSg2t8PcdbhNr9hsCNu8Y0O5pi0/aQBt7wZjvlAbwlF8CPNmQOUk9jCJQT+GhTG2U+g6 6N8yMTTh+9RDhLLOsEz1fJRXwFMtUsJ1gDCU1yOFmWTx9omqdZ1/dicR5eM0OwHyxheO 3h7tBC39K8XCC+LNONT+zvJUH0r4JJ3XA5O35oTz4MaRiaaqDDPvaqwt5t1CcBuYcXaE jtGErwhk+vfnfKIx+dhZ80ugvKWCLh1N0mFwz6ms6JPsSPxB6AB3jrEGvgNZir6Ip2ox ewQA== X-Gm-Message-State: AOJu0YxH8D/L3RztwaMpIBFs19evBn7Rs0giDd2x5ql6mauxZMUvBYRZ 3sqI3I3sYYMJLQjOMMjSukdu3w== X-Google-Smtp-Source: AGHT+IHJ0WD5two5WbjiaiaYK7rXCoaQopzMhtPMoeu7xcYMpvb1BNyRBM+wF4ZNJogK8hSahkEFQA== X-Received: by 2002:ac2:4e8e:0:b0:50b:ea76:509f with SMTP id o14-20020ac24e8e000000b0050bea76509fmr3427264lfr.64.1702744021897; Sat, 16 Dec 2023 08:27:01 -0800 (PST) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id u19-20020a197913000000b0050e304d437dsm69229lfc.223.2023.12.16.08.27.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Dec 2023 08:27:01 -0800 (PST) From: Dmitry Baryshkov To: Bjorn Andersson , Konrad Dybcio , Joerg Roedel , Will Deacon , Robin Murphy Cc: linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, iommu@lists.linux.dev, Russell King , Joerg Roedel Subject: [PATCH v2 1/3] iommu/msm-iommu: don't limit the driver too much Date: Sat, 16 Dec 2023 18:26:58 +0200 Message-Id: <20231216162700.863456-2-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231216162700.863456-1-dmitry.baryshkov@linaro.org> References: <20231216162700.863456-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-20231216_082704_677882_7875D0CE X-CRM114-Status: GOOD ( 12.40 ) 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). Acked-by: Robin Murphy Acked-by: Joerg Roedel Signed-off-by: Dmitry Baryshkov Reviewed-by: Konrad Dybcio --- drivers/iommu/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig index 9a29d742617e..0d6095290b6a 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig @@ -179,7 +179,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 Sat Dec 16 16:26: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: 13495642 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 3FECCC46CA2 for ; Sat, 16 Dec 2023 16:27:42 +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=OSCC5CtLcS0Grw 6FzkAAIrEW5uIlM0xgOo4MOiZ8EWV5Rlavum8x0C0yddMUop3e1T8vetpWEFA8hIzjeNLSenVqVeP fx7pEYNOVZTRMQ8ZKt/lruL9r2fGNX2KyMqwkQXzqUHsZ2iiTfXE7P/kWCt6JW1pzYB4i9dV9yrwH 1iMdep3t7jcfq23F8lOfi+NgaoDEK4fV7/HEF2IFli5oVG9LEfoDgIsN/S6rLLU/tmpdhbBmWj3kp ljj9L10KrTWoYwvx/WzciJWpZ1nkzgJwFXObomjcy18asdwvCIMEOMrEwuaZkB0y4AA/1rZCaeqSH yDCYdnpxOxQcD11yllZg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rEXVS-006Jr4-2M; Sat, 16 Dec 2023 16:27:14 +0000 Received: from mail-lf1-x133.google.com ([2a00:1450:4864:20::133]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rEXVJ-006Jlm-1y for linux-arm-kernel@lists.infradead.org; Sat, 16 Dec 2023 16:27:07 +0000 Received: by mail-lf1-x133.google.com with SMTP id 2adb3069b0e04-50e18689828so1894601e87.2 for ; Sat, 16 Dec 2023 08:27:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1702744022; x=1703348822; 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=UlIyPmWMLBNhrlRPXGzKO7Ht14qSL2U/AnYCuL9KSgc/lun6z5rUaD/cHld6hlhmP6 KVb7i4qCagO66tV5N/eja71GiBalABubz7vGsmDZq44+29s82YjDdhcRufnqxwrrkIIu aCZtOsOozFm6EaMrJ1BjhtPY1Iu/tx/u7RSTQPxkf7QAn2cpzJjPjLuOUgkgrptV18D1 KpOot5LB7OsF4FaR2rT+XFK4DqSsyo/Oym6AtUFnULHEuVQ3MMHZOI95z5/T0lbj3mUg WjQwyfXCq+7L2HQuPe9sM2A2N2gr62o9+wUTwX71O7jGA3OHYo+d7gqE36oNb5MUFedv d2pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702744022; x=1703348822; 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=UIr4UQaGVf1Z0a0YWIUitOxQaw9/r03p8SCmrBH+tuXX7l1zzkinFl09rVkw6TLwxs gouH5h0FI03ZFtfNlLcdp+SxIhBjYfDqGu/8MCOqoz1I33fCQWOVNroZ2XyydNJffqJZ njErG7gCaoT1reTCTyUF5VQzOZ+mknkJn2c5gDavOk7iRonU9VrQzw8mePIAsizHFAdw 3ndxiIH8zJTEPM5VDs/yAyD5mqiMNwm7vREhXm81RBwzpPpt3GZ+ke+pBmDULyFZpKUv AaAqVlUQNrq37cAQj570HCRaNTGAE76nGrR80gkltE4f0N0orf9oZFd2oIKRElAyWmWu ly2Q== X-Gm-Message-State: AOJu0Yx+nlp6WhoxOsT7sVtaXL8QpHxitSO6gAljZlEI/Di43HN9Z3Wk c0V9r+57B9kyf291mtRltQwH+A== X-Google-Smtp-Source: AGHT+IE/jFD3yOHsP0n5a7l283VLf8+ombeu8GqYWfjwZgT22dw0ahGoGVYCJQsfdwyPuBgkZcjp/g== X-Received: by 2002:a19:f70b:0:b0:50c:17d6:fff6 with SMTP id z11-20020a19f70b000000b0050c17d6fff6mr5574410lfe.1.1702744022620; Sat, 16 Dec 2023 08:27:02 -0800 (PST) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id u19-20020a197913000000b0050e304d437dsm69229lfc.223.2023.12.16.08.27.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Dec 2023 08:27:02 -0800 (PST) From: Dmitry Baryshkov To: Bjorn Andersson , Konrad Dybcio , Joerg Roedel , Will Deacon , Robin Murphy Cc: linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, iommu@lists.linux.dev, Russell King Subject: [PATCH v2 2/3] ARM: qcom: drop most of 32-bit ARCH_QCOM subtypes Date: Sat, 16 Dec 2023 18:26:59 +0200 Message-Id: <20231216162700.863456-3-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231216162700.863456-1-dmitry.baryshkov@linaro.org> References: <20231216162700.863456-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-20231216_082705_646050_2FF6E773 X-CRM114-Status: GOOD ( 11.41 ) 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 Acked-by: Konrad Dybcio --- 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 Sat Dec 16 16:27: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: 13495641 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 240EAC46CA2 for ; Sat, 16 Dec 2023 16:27:40 +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=YtLGLOSNu8u+ls0KYS5+TMMqywTBu7kYkVkFddxN+nE=; b=g8NNOVXR/MuHtd KoIZNBcv9Rdtyy5Qb8hzKqEV1A/eoEdwe1/6KaCDjitPDt6MT10W54K3xSmt3G0Q3dmTxu2K7gdmY zUStZ/PrE78XYRepE3DPVPhbPLAAzAEcCnpZwxqexgzy1MMN/K7Sh/gDgOsa/k7Zjabt/D6WM3ApW ORlOcUr5LhwGcazPE7ht98yifoi6doxsxNj/M+WAtOgLt0EDaczLqEu8Jija49295Mb2KUN1x6C2p DUnY8K6lJTU4DxtutwXsRGUm0N0/xc6dpEYjkuYTkSgSlji4IlV+vJL34zx7gjKsZMXxteBZrKLNW 8LFBaBGgsSUyZx4nmd/g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rEXVU-006Jt4-17; Sat, 16 Dec 2023 16:27:16 +0000 Received: from mail-lf1-x133.google.com ([2a00:1450:4864:20::133]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rEXVJ-006Jlo-1y for linux-arm-kernel@lists.infradead.org; Sat, 16 Dec 2023 16:27:07 +0000 Received: by mail-lf1-x133.google.com with SMTP id 2adb3069b0e04-50bf898c43cso1717024e87.1 for ; Sat, 16 Dec 2023 08:27:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1702744023; x=1703348823; 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=u5ZLFRFzD1CGy334KNd57yMYTCMD3u82eZUZ6VE2QPA=; b=CqrOu1+C388k2wPrmmh2NhNX2CVtK3unsa1N1x7nxbMeMbRWfP/ZgYWmQiziUfeE5r 0Yi+w9hWqITJbpkujpUqgYK+PKHJmQRVSrqDLDpJX2kG8XKvX54eiI1xNrzpq9zHhtRR as4unNB26YIEWs47TRog1SNXSl6YnAD3WXDk9CPO4/TtxNrTmSIKTDvIN4p0Oj3QYEvj nxf6y4zxNKXfCI28AX1LIRFBXm8zM/gVzFU0idbuAk8UVZjZ6ST9BBMdoj0OFDPxZaZa xyGHNJcxmgM2XIrBK4gk98/5Bt/9X8AY6Dd5dqfSs/62u7D6+2r+Mzb5b94VAxTVopkT 8Q2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702744023; x=1703348823; 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=u5ZLFRFzD1CGy334KNd57yMYTCMD3u82eZUZ6VE2QPA=; b=hU43deOojmDNIHEg+Vn8qfPNTqImrohu9pRW6cqoJ1iQ72JmFMv9tGQ5DAF/9D/bGd xzWYOQB0TiceBKDg11Sh7LzVCHx6kV1g9JU0pBCX6LyMobBPF5eaGwWO4vmSCyJEjnkc uB6JBl/ysx6OIv0YUkqkZWKWZfrzdXe40TiY9lKx6RCg+qotIqyuMyPv8Seoi7iGRrod FKZCnrksInoBxp34EX/yErrsr9R4xOMHLMcfwtBl+fTGPZ+3BJ7plJt9boCC33uYMp0K Ux4gnB4oZe1NFzYcKtuXfaj5LIiRjH0vc0NwStGLUsg6KE8EnjqeuFPk25y4UBtj/mNB RBAA== X-Gm-Message-State: AOJu0Yw3opIy+VJmL3yFu+aEVE2mzo2W6bq1aghtVFQV3eavz0VEa8bi tWlrpJ+rdLLXbCZUxGGJiDjZiA== X-Google-Smtp-Source: AGHT+IEdlLjha0pDKVzgZ8VedXq3zwTQeBW66gbUelSUrCVVlVfnjfOPU+pT4taKuf9PB4jXLPRiNQ== X-Received: by 2002:a05:6512:15a0:b0:50b:f84a:539d with SMTP id bp32-20020a05651215a000b0050bf84a539dmr4674856lfb.19.1702744023345; Sat, 16 Dec 2023 08:27:03 -0800 (PST) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id u19-20020a197913000000b0050e304d437dsm69229lfc.223.2023.12.16.08.27.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Dec 2023 08:27:02 -0800 (PST) From: Dmitry Baryshkov To: Bjorn Andersson , Konrad Dybcio , Joerg Roedel , Will Deacon , Robin Murphy Cc: linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, iommu@lists.linux.dev, Russell King Subject: [PATCH v2 3/3] ARM: qcom: merge remaining subplatforms into sensible Kconfig entry Date: Sat, 16 Dec 2023 18:27:00 +0200 Message-Id: <20231216162700.863456-4-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231216162700.863456-1-dmitry.baryshkov@linaro.org> References: <20231216162700.863456-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-20231216_082705_649012_5E3E6CC0 X-CRM114-Status: GOOD ( 11.89 ) 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..95216a508d80 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_RESERVE_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..f4765be1b2a0 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_RESERVE_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