From patchwork Thu Mar 16 05:19:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Yang X-Patchwork-Id: 13176999 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 EF264C74A5B for ; Thu, 16 Mar 2023 05:21:09 +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=i56Y5ZdJX9GGAZTHrzBl5r7Q2ohCx6YJNlz28b0CHrc=; b=On5vF6R4E5LLRs dgX+iIrjdgTvHOJLEAI0kdogWyjJ+WXWWCR2gvET4PxEx3jTG7aEjyVFqnvVE+mfVG9UnrTQl/sB7 6st8qoORNqh/90vHKsdv1tY+OtE+xcY4CMgNeZx6a3EQglke607aLdse2RXPJax83/8y+Pf6kP11r /tI37gPjQLKUV59/254bpEQ7FEUhPevqbvSFBdOcHgJ6LY0NX5dPpGZUSUpF1jxe2CzKwemQWPr7X oWoq18RHIpn0pLxHSdyn+1OWrS8lyOvt/arj9iIOA7kqTPOISaYU8Hxw5oVUPKCwbYzMUFGI4B5ju NjAqL9CcNlJNvLjTEu/A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pcg25-00FFgp-39; Thu, 16 Mar 2023 05:20:10 +0000 Received: from mail-pj1-x1029.google.com ([2607:f8b0:4864:20::1029]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pcg21-00FFfC-2K for linux-arm-kernel@lists.infradead.org; Thu, 16 Mar 2023 05:20:06 +0000 Received: by mail-pj1-x1029.google.com with SMTP id j3-20020a17090adc8300b0023d09aea4a6so4157599pjv.5 for ; Wed, 15 Mar 2023 22:20:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678944002; 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=cnS/2L5eapvwqGTZQsUuWuWrYgLcDrvgqwnYFYygers=; b=QE826bxyY1maP+6E6wVynxn9Mv6IuqRQViB2FhQD0h/chSW/Kw+weOZ4aZ4wVs81Pf Ing4sukZ64gzdoNgoFnEKc1PUpuvKZmKztMqw5eFxiRCO8X1OIjuVsEGuhYJOkjl/Jqf taUF8/Q8HWqTvOx3TQmc1s2avXtx3xP0JavcyM3wlC2IBVTz17uGXho9CLqP0sRoe65f vdOyOoCURiYufz8tH653p2RPal+y1gioShzqK6otX5Z01blem1kiFqghfcjNxYaJergQ BF9XVxFbTiGT9aWCVT+nHcza7vCFaZ89i89ufYjjHTfRjOfmpXqO04UtM7B/bUPc5DS6 1ROg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678944002; 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=cnS/2L5eapvwqGTZQsUuWuWrYgLcDrvgqwnYFYygers=; b=UjUsbZ8n4G24scRs9VXZ6efiwEPz7OSoZzMobdCWBCtAZcGX9XJ0xLi29ajk/napz6 E6dKnlLRBxd7gITxcfytqauTAVQFy6G7utPeGh0z0POMaVNh2WEULzJEU5ronD1KBniv LEoGwu9M7tsTxtqiABCn18lD9RF4OdouBZH7qIGuM5i4gXUYt/sJFCgVUfAPI4Fl7So/ JAlPcaQ0c6xpnw/decONIulAzUnxJABywRlhrPML9Dw+h8E0o4l95gJksx+eaqpY/hq8 XjOdwA2giFUSTxAbPSpIHQ5YAsa+O/89nI6X+6vJBsP7r9c0vCSWmxrF8jsjBw2JpIkT Desw== X-Gm-Message-State: AO0yUKVCCpPF+T07QsFIUhQWID1awZ3EDm97VUS1qP6nin/lbITxZeje IMDpP7wG1PFn/7SGwlm3ipA= X-Google-Smtp-Source: AK7set9cI/OHaF/cbDFfzC0cU9Z94ikfd7AyHCR0H2ZEwPcKdsECly1zQatRRbZthu1DOkP6YL7UfA== X-Received: by 2002:a17:902:ce92:b0:19c:fd73:5586 with SMTP id f18-20020a170902ce9200b0019cfd735586mr2269077plg.38.1678944002224; Wed, 15 Mar 2023 22:20:02 -0700 (PDT) Received: from d.home.yangfl.dn42 ([104.28.213.199]) by smtp.gmail.com with ESMTPSA id jh1-20020a170903328100b0019a593e45f1sm4475708plb.261.2023.03.15.22.19.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Mar 2023 22:20:02 -0700 (PDT) From: David Yang To: mmyangfl@gmail.com Cc: Wei Xu , Russell King , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] ARM: hisi: Add S40 IO map Date: Thu, 16 Mar 2023 13:19:33 +0800 Message-Id: <20230316051936.1775033-2-mmyangfl@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230316051936.1775033-1-mmyangfl@gmail.com> References: <20230316051936.1775033-1-mmyangfl@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230315_222005_766555_34FADE5D X-CRM114-Status: GOOD ( 10.80 ) 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 Hisilion S40 platform supports ARM Cortex-A9 processors. Signed-off-by: David Yang --- arch/arm/mach-hisi/hisilicon.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/arch/arm/mach-hisi/hisilicon.c b/arch/arm/mach-hisi/hisilicon.c index b8d14b369..9f56b0f56 100644 --- a/arch/arm/mach-hisi/hisilicon.c +++ b/arch/arm/mach-hisi/hisilicon.c @@ -50,3 +50,36 @@ DT_MACHINE_START(HI3620, "Hisilicon Hi3620 (Flattened Device Tree)") .map_io = hi3620_map_io, .dt_compat = hi3xxx_compat, MACHINE_END + +#define S40_IOCH1_PHYS_BASE 0xf8000000 +#define S40_IOCH1_VIRT_BASE 0xf9000000 +#define S40_IOCH1_SIZE 0x02000000 + +static struct map_desc s40_io_desc[] __initdata = { + { + .pfn = __phys_to_pfn(S40_IOCH1_PHYS_BASE), + .virtual = S40_IOCH1_VIRT_BASE, + .length = S40_IOCH1_SIZE, + .type = MT_DEVICE, + }, +}; + +static void __init s40_map_io(void) +{ + debug_ll_io_init(); + iotable_init(s40_io_desc, ARRAY_SIZE(s40_io_desc)); +} + +static const char *const s40_compat[] __initconst = { + "hisilicon,hi3798cv200", + "hisilicon,hi3796mv200", + "hisilicon,hi3798cv200", + "hisilicon,hi3798mv200", + "hisilicon,hi3798mv300", + NULL, +}; + +DT_MACHINE_START(S40, "Hisilicon S40 (Flattened Device Tree)") + .map_io = s40_map_io, + .dt_compat = s40_compat, +MACHINE_END From patchwork Thu Mar 16 05:19:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Yang X-Patchwork-Id: 13176997 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 E21A3C6FD19 for ; Thu, 16 Mar 2023 05:21:07 +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=MPyeTmxEpCNwStbcEmZZh7bqwcxySPk/8vbCUIRyEcI=; b=nux65ESFsGNAFp 44zdShFeh9GGjhLm5iaxvAsnj4ZVMn9JpHyVZKpBHMbVt6js6nkkTrDZUEe7NOpOmhuntgi2y0VLx QRYO4fBYqwVM9BmGk91Cx7OzaIDsCmvxcgsRBq2boK5S2eAnxlVgX471ilVh0tHathdGwKb/ZubfA 1w3ol2ijEXYI/jur/X3Ohy0tifSTQPkVUw1S3+udJwgGfNNm/jEuNLWnvJfuBmpNZBFN/+8Yu3PRR TXN8zHflS6p7oAASAhUMd08e5IxMfbBZBM4gB/HwJJOFSXzu8z3BeXoPnWCXbEgbp3U9KlekkU/Zu CT+cgWER1ZAArIqB+6Kw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pcg2C-00FFi3-2c; Thu, 16 Mar 2023 05:20:16 +0000 Received: from mail-pj1-x1032.google.com ([2607:f8b0:4864:20::1032]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pcg24-00FFeJ-2f for linux-arm-kernel@lists.infradead.org; Thu, 16 Mar 2023 05:20:10 +0000 Received: by mail-pj1-x1032.google.com with SMTP id qe8-20020a17090b4f8800b0023f07253a2cso444275pjb.3 for ; Wed, 15 Mar 2023 22:20:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678944008; 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=LN29kza4KP9+va9q8WQlQCM3UUiFt6hAQqDjXosgzqs=; b=muzRYG4npi5Fc+pBJCCHrt/h4NEe3GwxCYPXhlBC2XF0Ypm5YpzWQOkTd/7jltf4rI ha9wslI/6XTVb5f4gwyFVZfmazKVY0Z14ReT6xI2FPYBPf/AZYte+I+3N+OH3F+nugRY vQB70q2AnoeOUU6nLsIKS6woKvEQwiqWlTIiRruqr7unVdkDlQEuRZH7/w0QKE4e7zgp JG0gmv+wjyRoQ1TVYL8k81h5BEHGGafjiZH4nzUrN/JtucKJ2U1EgqtsnUuPTWF1fSiV GsrUVx/EZmQZZ/s/AxcKQ5GpSSwVLO8M8148R7rkeTDXFqWx+io6wqB5mHta8lwr46ab uAhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678944008; 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=LN29kza4KP9+va9q8WQlQCM3UUiFt6hAQqDjXosgzqs=; b=P1HX3mrK7dpMp6VNf+gR+oR9dejbBVEoi0xkDQSMN5a0PwtpCTjdQaFrifWDc1v2gD SJ0oATB1K9GPa4QDC1/zTJLliu3y3GUjF0JHc5mSpUSYcBMHgEElbRGCAZE/hT4z93WJ eVJYwcTLdOfiCFJSDhWQCK/pl7e8PidapzrIywSW3fR0IJ2ZU68hhQmnkkgW400ZVGMD KZbgRqlAdw9sClXMO/QdSKS1Rq3NObrrRjFaMtAYfHI1vuCDecLCyRWCaUDO3Nf7W1Ok Zf4+VoFby6JhP6kurVw17lo+pIan4RKhFT/gxaLJQ646Ac+qV1l90x8NN7tQsWOxKVfi X69g== X-Gm-Message-State: AO0yUKVs9Hb0gXvTa3yDMpxglhHryZDZMIAnlsbA2d9ZFpn6AZkDLPD7 mm3MNWvdxNmowm5JkZ8seUg= X-Google-Smtp-Source: AK7set+PvqwxPTJ0mHbgfxxOfLfXi24zg5IjBzLiPkmV1jFA5jjMCPOv+hdI7+J7/GWt5tb0wf1SOQ== X-Received: by 2002:a17:90b:388d:b0:234:b082:48a2 with SMTP id mu13-20020a17090b388d00b00234b08248a2mr2448834pjb.28.1678944008407; Wed, 15 Mar 2023 22:20:08 -0700 (PDT) Received: from d.home.yangfl.dn42 ([104.28.213.199]) by smtp.gmail.com with ESMTPSA id jh1-20020a170903328100b0019a593e45f1sm4475708plb.261.2023.03.15.22.20.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Mar 2023 22:20:08 -0700 (PDT) From: David Yang To: mmyangfl@gmail.com Cc: Wei Xu , Russell King , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] ARM: hisi: Add S5 IO map Date: Thu, 16 Mar 2023 13:19:34 +0800 Message-Id: <20230316051936.1775033-3-mmyangfl@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230316051936.1775033-1-mmyangfl@gmail.com> References: <20230316051936.1775033-1-mmyangfl@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230315_222008_864299_A450FD07 X-CRM114-Status: GOOD ( 10.84 ) 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 Hisilion S5 platform supports ARM Cortex-A7 processors. Signed-off-by: David Yang --- arch/arm/mach-hisi/hisilicon.c | 37 ++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/arch/arm/mach-hisi/hisilicon.c b/arch/arm/mach-hisi/hisilicon.c index 9f56b0f56..f9109df8c 100644 --- a/arch/arm/mach-hisi/hisilicon.c +++ b/arch/arm/mach-hisi/hisilicon.c @@ -83,3 +83,40 @@ DT_MACHINE_START(S40, "Hisilicon S40 (Flattened Device Tree)") .map_io = s40_map_io, .dt_compat = s40_compat, MACHINE_END + +#define S5_IOCH2_PHYS_BASE 0xff000000 +#define S5_IOCH2_VIRT_BASE 0xfb000000 +#define S5_IOCH2_SIZE 0x00430000 + +static struct map_desc s5_io_desc[] __initdata = { + { + .pfn = __phys_to_pfn(S5_IOCH2_PHYS_BASE), + .virtual = S5_IOCH2_VIRT_BASE, + .length = S5_IOCH2_SIZE, + .type = MT_DEVICE, + }, + { + .pfn = __phys_to_pfn(S40_IOCH1_PHYS_BASE), + .virtual = S40_IOCH1_VIRT_BASE, + .length = S40_IOCH1_SIZE, + .type = MT_DEVICE, + }, +}; + +static void __init s5_map_io(void) +{ + debug_ll_io_init(); + iotable_init(s5_io_desc, ARRAY_SIZE(s5_io_desc)); +} + +static const char *const s5_compat[] __initconst = { + "hisilicon,hi3716cv200", + "hisilicon,hi3716mv410", + "hisilicon,hi3798mv100", + NULL, +}; + +DT_MACHINE_START(S5, "Hisilicon S5 (Flattened Device Tree)") + .map_io = s5_map_io, + .dt_compat = s5_compat, +MACHINE_END From patchwork Thu Mar 16 05:19:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Yang X-Patchwork-Id: 13177000 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 0A10AC6FD1F for ; Thu, 16 Mar 2023 05:21:11 +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=wTnK+MFg9iChsw4anpQcWapMtnU99ZjCll52s6o7rrY=; b=qnyNJgRB6hEiYo O+SCi/bU6xOBPwvkov7ANwNcVVCssM//sXJsFJwuzdfYkDwz7hAuU1/gzXAa1Wz2fyrBmj/57Cvoe wQANB4lL0dCjJ6O6lRA/lhtOvBMERxqNAw+r5M3N8MCW1pLsJsbc7LcZcVGp7BQ3NtrNoduQ7sJYt X7L/TNcyT3O6TT076rXD0BJaK+71xL8Tt7jV4jG1ghd5zk2vq/al9Dik95E4kLq/VsDW0iJCOrfoY wLgChBcqawFL+huVbVJT87zZN+zDCV/rQV2crA2YKFgsSuDkW4wdyczwEjaxDDaBhdhr31rUbkF4R SgQZCsU89BxKS0yZmhFA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pcg2I-00FFjD-0V; Thu, 16 Mar 2023 05:20:22 +0000 Received: from mail-pj1-x102e.google.com ([2607:f8b0:4864:20::102e]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pcg2D-00FFhe-1f for linux-arm-kernel@lists.infradead.org; Thu, 16 Mar 2023 05:20:19 +0000 Received: by mail-pj1-x102e.google.com with SMTP id om3-20020a17090b3a8300b0023efab0e3bfso4035826pjb.3 for ; Wed, 15 Mar 2023 22:20:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678944014; 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=MdHaFK8bWu3beR7Jd/q7mNjpdPdNabQi6H6vrXWG2vM=; b=ICXNUrFzhY87RvUD7KoIgmJhvGt9ZXbHUe1gGgAGeE7renBeuMu/qKG05SqKClZUxm 4Us0GMSyDrKUBq+GEwxgvP3morI+C4YL5VdAbpDNPB4SylS6ARWTHlp3/dicyrFbHeDy gMdZceAqZbihAB+xcThdeFnPVAWlvfOA19HECHmHwNP/Cek51uWImoQgEKlDsAHldpul 4o0qE6Ze0xErbWDMm37ZK8F5Ufk+n4EdBzQ7I6qkH0zjo5NvgVNu3Iev5tYwu3FF9s91 AXPwZrKkbLqv5XBZJQP3EkO1ZWZmRZEtDjd4Tg3YuOKaKUJtTjomuSeGdKwCiOT9s7DY LY9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678944014; 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=MdHaFK8bWu3beR7Jd/q7mNjpdPdNabQi6H6vrXWG2vM=; b=gn48JtZcF1LGkiYINtXfFuF/58HMuBSD/CBIoqY5YuuXa4ppKtFht8za+klmTSps2x XjlR6nrjb2saFKowyo6gSzO1NFqFlQdTr/TfEhuprE8tAp3+IMa7r2Mb0DbYaqk5ZDD8 f+Xv4KovS6UYUV0qvxxw22HiH4ud8RdFDZkFLtqVau3o8NhryTyJIrbqVqJw4S2YNxmp FPv7uJQB3AZs9Fo4KfJUXQxkm+mMhDfzHbYaTR2IzngwVUwf0fYcaD3GYpGU38uulaeF Yp036dUvcKAlkwme3GHmnagnmEbhIuI1COgJ7pkiSbFye6s8M6hvrtivYCgDsZ4vW5+4 9CAA== X-Gm-Message-State: AO0yUKW6qOWVVxvywloKdKsyDWZGSw3FRYgpIhr7wXtrUt4HHTz4KGTs 8GxQCnN7QX6q4q98XapghsI= X-Google-Smtp-Source: AK7set+ubhAakngPAY0DQE+8TS0NybxKflmURFbqBUg7pORknbsuRQMN6n6KH/Ss1DYXNZqn4vAacQ== X-Received: by 2002:a17:902:da8f:b0:1a0:d2c8:8c58 with SMTP id j15-20020a170902da8f00b001a0d2c88c58mr2017860plx.61.1678944014365; Wed, 15 Mar 2023 22:20:14 -0700 (PDT) Received: from d.home.yangfl.dn42 ([104.28.213.199]) by smtp.gmail.com with ESMTPSA id jh1-20020a170903328100b0019a593e45f1sm4475708plb.261.2023.03.15.22.20.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Mar 2023 22:20:13 -0700 (PDT) From: David Yang To: mmyangfl@gmail.com Cc: Wei Xu , Russell King , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] ARM: hisi: Support Hi3798 SoC Date: Thu, 16 Mar 2023 13:19:35 +0800 Message-Id: <20230316051936.1775033-4-mmyangfl@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230316051936.1775033-1-mmyangfl@gmail.com> References: <20230316051936.1775033-1-mmyangfl@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230315_222017_566919_B06DE5C6 X-CRM114-Status: GOOD ( 33.00 ) 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 Hi3798 are SoC series for IPTV STB, with Cortex A9 or A7 cores. Signed-off-by: David Yang --- arch/arm/mach-hisi/Makefile | 2 +- arch/arm/mach-hisi/core.h | 6 ++ arch/arm/mach-hisi/headsmp.S | 36 ++++++++++ arch/arm/mach-hisi/hotplug.c | 120 ++++++++++++++++++++++++++++++-- arch/arm/mach-hisi/platsmp.c | 128 +++++++++++++++++++++++++++++++++++ 5 files changed, 287 insertions(+), 5 deletions(-) create mode 100644 arch/arm/mach-hisi/headsmp.S diff --git a/arch/arm/mach-hisi/Makefile b/arch/arm/mach-hisi/Makefile index 39476355e..71e2f67cd 100644 --- a/arch/arm/mach-hisi/Makefile +++ b/arch/arm/mach-hisi/Makefile @@ -7,4 +7,4 @@ CFLAGS_platmcpm.o := -march=armv7-a obj-y += hisilicon.o obj-$(CONFIG_MCPM) += platmcpm.o -obj-$(CONFIG_SMP) += platsmp.o hotplug.o +obj-$(CONFIG_SMP) += headsmp.o platsmp.o hotplug.o diff --git a/arch/arm/mach-hisi/core.h b/arch/arm/mach-hisi/core.h index 61245274f..1ada6503b 100644 --- a/arch/arm/mach-hisi/core.h +++ b/arch/arm/mach-hisi/core.h @@ -4,6 +4,9 @@ #include +extern volatile int hisi_pen_release; +extern void hisi_secondary_startup(void); + extern void hi3xxx_set_cpu_jump(int cpu, void *jump_addr); extern int hi3xxx_get_cpu_jump(int cpu); extern void secondary_startup(void); @@ -16,4 +19,7 @@ extern void hix5hd2_set_cpu(int cpu, bool enable); extern void hix5hd2_cpu_die(unsigned int cpu); extern void hip01_set_cpu(int cpu, bool enable); + +extern void hi3798_set_cpu(int cpu, bool enable); +extern void hi3798_cpu_die(unsigned int cpu); #endif diff --git a/arch/arm/mach-hisi/headsmp.S b/arch/arm/mach-hisi/headsmp.S new file mode 100644 index 000000000..67cfb584a --- /dev/null +++ b/arch/arm/mach-hisi/headsmp.S @@ -0,0 +1,36 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright (c) 2003 ARM Limited + * All Rights Reserved + */ +#include +#include +#include + +/* + * Hisilicon specific entry point for secondary CPUs. This provides + * a "holding pen" into which all secondary cores are held until we're + * ready for them to initialise. + */ +ENTRY(hisi_secondary_startup) + ARM_BE8(setend be) + mrc p15, 0, r0, c0, c0, 5 + and r0, r0, #15 + adr r4, 1f + ldmia r4, {r5, r6} + sub r4, r4, r5 + add r6, r6, r4 +pen: ldr r7, [r6] + cmp r7, r0 + bne pen + + /* + * we've been released from the holding pen: secondary_stack + * should now contain the SVC stack for this core + */ + b secondary_startup + + .align +1: .long . + .long hisi_pen_release +ENDPROC(hisi_secondary_startup) diff --git a/arch/arm/mach-hisi/hotplug.c b/arch/arm/mach-hisi/hotplug.c index c51794141..7102546e7 100644 --- a/arch/arm/mach-hisi/hotplug.c +++ b/arch/arm/mach-hisi/hotplug.c @@ -55,7 +55,7 @@ #define CPU0_SRST_REQ_EN (1 << 0) #define HIX5HD2_PERI_CRG20 0x50 -#define CRG20_CPU1_RESET (1 << 17) +#define CRG20_ARM_SRST(i) (1 << ((i) + 16)) #define HIX5HD2_PERI_PMC0 0x1000 #define PMC0_CPU1_WAIT_MTCOMS_ACK (1 << 8) @@ -65,6 +65,12 @@ #define HIP01_PERI9 0x50 #define PERI9_CPU1_RESET (1 << 1) +#define HI3798_PERI_CRG18 0x48 +#define CRG18_CPU_SW_BEGIN (1 << 10) +#define HI3798_PERI_CRG20 0x50 +#define CRG20_ARM_POR_SRST(i) (1 << ((i) + 12)) +#define CRG20_CLUSTER_DBG_SRST(i) (1 << ((i) + 20)) + enum { HI3620_CTRL, ERROR_CTRL, @@ -204,7 +210,7 @@ void hix5hd2_set_cpu(int cpu, bool enable) writel_relaxed(val, ctrl_base + HIX5HD2_PERI_PMC0); /* unreset */ val = readl_relaxed(ctrl_base + HIX5HD2_PERI_CRG20); - val &= ~CRG20_CPU1_RESET; + val &= ~CRG20_ARM_SRST(cpu); writel_relaxed(val, ctrl_base + HIX5HD2_PERI_CRG20); } else { /* power down cpu1 */ @@ -212,10 +218,9 @@ void hix5hd2_set_cpu(int cpu, bool enable) val |= PMC0_CPU1_PMC_ENABLE | PMC0_CPU1_POWERDOWN; val &= ~PMC0_CPU1_WAIT_MTCOMS_ACK; writel_relaxed(val, ctrl_base + HIX5HD2_PERI_PMC0); - /* reset */ val = readl_relaxed(ctrl_base + HIX5HD2_PERI_CRG20); - val |= CRG20_CPU1_RESET; + val |= CRG20_ARM_SRST(cpu); writel_relaxed(val, ctrl_base + HIX5HD2_PERI_CRG20); } } @@ -248,6 +253,54 @@ void hip01_set_cpu(int cpu, bool enable) } } +void hi3798_set_cpu(int cpu, bool enable) +{ + u32 val; + u32 val_crg18; + + if (!ctrl_base) + if (!hix5hd2_hotplug_init()) + BUG(); + + if (enable) { + val_crg18 = readl_relaxed(ctrl_base + HI3798_PERI_CRG18); + /* select 400MHz */ + val = 0x306; + writel_relaxed(val, ctrl_base + HI3798_PERI_CRG18); + val |= CRG18_CPU_SW_BEGIN; + writel_relaxed(val, ctrl_base + HI3798_PERI_CRG18); + /* unreset arm_por_srst_req */ + val = readl_relaxed(ctrl_base + HI3798_PERI_CRG20); + val &= ~CRG20_ARM_POR_SRST(cpu); + writel_relaxed(val, ctrl_base + HI3798_PERI_CRG20); + /* unreset cluster_dbg_srst_req */ + val = readl_relaxed(ctrl_base + HI3798_PERI_CRG20); + val &= ~CRG20_CLUSTER_DBG_SRST(cpu); + writel_relaxed(val, ctrl_base + HI3798_PERI_CRG20); + /* unreset */ + val = readl_relaxed(ctrl_base + HI3798_PERI_CRG20); + val &= ~CRG20_ARM_SRST(cpu); + writel_relaxed(val, ctrl_base + HI3798_PERI_CRG20); + /* restore freq */ + val = val_crg18 & ~CRG18_CPU_SW_BEGIN; + writel_relaxed(val, ctrl_base + HI3798_PERI_CRG18); + writel_relaxed(val_crg18, ctrl_base + HI3798_PERI_CRG18); + } else { + /* reset */ + val = readl_relaxed(ctrl_base + HI3798_PERI_CRG20); + val |= CRG20_ARM_SRST(cpu); + writel_relaxed(val, ctrl_base + HI3798_PERI_CRG20); + /* reset cluster_dbg_srst_req */ + val = readl_relaxed(ctrl_base + HI3798_PERI_CRG20); + val |= CRG20_CLUSTER_DBG_SRST(cpu); + writel_relaxed(val, ctrl_base + HI3798_PERI_CRG20); + /* reset arm_por_srst_req */ + val = readl_relaxed(ctrl_base + HI3798_PERI_CRG20); + val |= CRG20_ARM_POR_SRST(cpu); + writel_relaxed(val, ctrl_base + HI3798_PERI_CRG20); + } +} + static inline void cpu_enter_lowpower(void) { unsigned int v; @@ -269,6 +322,45 @@ static inline void cpu_enter_lowpower(void) : "cc"); } +static inline void cpu_leave_lowpower(void) +{ + unsigned int v; + + asm volatile( + " mrc p15, 0, %0, c1, c0, 0\n" + " orr %0, %0, #0x04\n" + " mcr p15, 0, %0, c1, c0, 0\n" + " mrc p15, 0, %0, c1, c0, 1\n" + " orr %0, %0, #0x20\n" + " mcr p15, 0, %0, c1, c0, 1\n" + : "=&r" (v) + : + : "cc"); +} + +static inline void hisi_do_lowpower(unsigned int cpu, int *spurious) +{ + for (;;) { + wfi(); + + if (hisi_pen_release == cpu) { + /* + * OK, proper wakeup, we're done + */ + break; + } + + /* + * Getting here, means that we have come out of WFI without + * having been woken up - this shouldn't happen + * + * Just note it happening - when we're woken, we can report + * its occurrence. + */ + (*spurious)++; + } +} + #ifdef CONFIG_HOTPLUG_CPU void hi3xxx_cpu_die(unsigned int cpu) { @@ -296,4 +388,24 @@ void hix5hd2_cpu_die(unsigned int cpu) flush_cache_all(); hix5hd2_set_cpu(cpu, false); } + +void hi3798_cpu_die(unsigned int cpu) +{ + int spurious = 0; + + /* + * we're ready for shutdown now, so do it + */ + cpu_enter_lowpower(); + hisi_do_lowpower(cpu, &spurious); + + /* + * bring this CPU back into the world of cache + * coherency, and then restore interrupts + */ + cpu_leave_lowpower(); + + if (spurious) + pr_warn("CPU%u: %u spurious wakeup calls\n", cpu, spurious); +} #endif diff --git a/arch/arm/mach-hisi/platsmp.c b/arch/arm/mach-hisi/platsmp.c index 9ce93e0b6..da4c620a1 100644 --- a/arch/arm/mach-hisi/platsmp.c +++ b/arch/arm/mach-hisi/platsmp.c @@ -20,6 +20,48 @@ static void __iomem *ctrl_base; +/* + * hisi_pen_release controls the release of CPUs from the holding + * pen in headsmp.S, which exists because we are not always able to + * control the release of individual CPUs from the board firmware. + */ +volatile int hisi_pen_release = -1; + +/* + * Write hisi_write_pen_release in a way that is guaranteed to be visible to + * all observers, irrespective of whether they're taking part in coherency + * or not. This is necessary for the hotplug code to work reliably. + */ +static void hisi_write_pen_release(int val) +{ + hisi_pen_release = val; + smp_wmb(); + sync_cache_w(&hisi_pen_release); +} + +/* + * hisi_lock exists to avoid running the loops_per_jiffy delay loop + * calibrations on the secondary CPU while the requesting CPU is using + * the limited-bandwidth bus - which affects the calibration value. + */ +static DEFINE_RAW_SPINLOCK(hisi_lock); + +static void hisi_pen_secondary_init(unsigned int cpu) +{ + /* + * let the primary processor know we're out of the + * pen, then head off into the C entry point + */ + hisi_write_pen_release(-1); + + /* + * Synchronise with the boot thread. + */ + raw_spin_lock(&hisi_lock); + raw_spin_unlock(&hisi_lock); +} + + void hi3xxx_set_cpu_jump(int cpu, void *jump_addr) { cpu = cpu_logical_map(cpu); @@ -182,6 +224,92 @@ static const struct smp_operations hip01_smp_ops __initconst = { .smp_boot_secondary = hip01_boot_secondary, }; + +static void hi3798_smp_prepare_cpus(unsigned int max_cpus) +{ + unsigned int i; + unsigned int l2ctlr; + unsigned int ncores; + + asm ("mrc p15, 1, %0, c9, c0, 2\n" : "=r" (l2ctlr)); + ncores = ((l2ctlr >> 24) & 0x3) + 1; + + pr_info("SMP: %u cores detected\n", ncores); + if (ncores > max_cpus) { + pr_warn("SMP: %u cores greater than maximum (%u), clipping\n", + ncores, max_cpus); + ncores = max_cpus; + } + for (i = 0; i < ncores; i++) + set_cpu_possible(i, true); + + /* Put the boot address in this magic register */ + hix5hd2_set_scu_boot_addr(HIX5HD2_BOOT_ADDRESS, + __pa_symbol(hisi_secondary_startup)); +} + +static int hi3798_boot_secondary(unsigned int cpu, struct task_struct *idle) +{ + unsigned long timeout; + + /* + * Set synchronisation state between this boot processor + * and the secondary one + */ + raw_spin_lock(&hisi_lock); + + hi3798_set_cpu(cpu, true); + + /* + * This is really belt and braces; we hold unintended secondary + * CPUs in the holding pen until we're ready for them. However, + * since we haven't sent them a soft interrupt, they shouldn't + * be there. + */ + hisi_write_pen_release(cpu); + + /* + * Send the secondary CPU a soft interrupt, thereby causing + * the boot monitor to read the system wide flags register, + * and branch to the address found there. + */ + arch_send_wakeup_ipi_mask(cpumask_of(cpu)); + + timeout = jiffies + (1 * HZ); + while (time_before(jiffies, timeout)) { + smp_rmb(); + if (hisi_pen_release == -1) + break; + + udelay(10); + } + + /* + * now the secondary core is starting up let it run its + * calibrations, then wait for it to finish + */ + raw_spin_unlock(&hisi_lock); + + return hisi_pen_release != -1 ? -ENOSYS : 0; +} + +static int hi3798_cpu_kill(unsigned int cpu) +{ + hi3798_set_cpu(cpu, false); + return 1; +} + +static const struct smp_operations hi3798_smp_ops __initconst = { + .smp_prepare_cpus = hi3798_smp_prepare_cpus, + .smp_secondary_init = hisi_pen_secondary_init, + .smp_boot_secondary = hi3798_boot_secondary, +#ifdef CONFIG_HOTPLUG_CPU + .cpu_die = hi3798_cpu_die, + .cpu_kill = hi3798_cpu_kill, +#endif +}; + CPU_METHOD_OF_DECLARE(hi3xxx_smp, "hisilicon,hi3620-smp", &hi3xxx_smp_ops); CPU_METHOD_OF_DECLARE(hix5hd2_smp, "hisilicon,hix5hd2-smp", &hix5hd2_smp_ops); CPU_METHOD_OF_DECLARE(hip01_smp, "hisilicon,hip01-smp", &hip01_smp_ops); +CPU_METHOD_OF_DECLARE(hi3798_smp, "hisilicon,hi3798-smp", &hi3798_smp_ops);