devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: <Conor.Dooley@microchip.com>
To: <zong.li@sifive.com>, <robh+dt@kernel.org>,
	<krzysztof.kozlowski+dt@linaro.org>, <palmer@dabbelt.com>,
	<paul.walmsley@sifive.com>, <aou@eecs.berkeley.edu>,
	<greentime.hu@sifive.com>, <devicetree@vger.kernel.org>,
	<linux-riscv@lists.infradead.org>, <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 2/3] soc: sifive: l2 cache: Rename SiFive L2 cache to composible cache.
Date: Mon, 29 Aug 2022 07:05:09 +0000	[thread overview]
Message-ID: <1a0da77e-8b26-a6aa-4af2-bf852470230a@microchip.com> (raw)
In-Reply-To: <20220829062202.3287-3-zong.li@sifive.com>

Hey Zong,

On 29/08/2022 07:22, Zong Li wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
> 
> From: Greentime Hu <greentime.hu@sifive.com>
> 
> Since composible cache may be L3 cache if pL2 cache exists, we should use
> its original name composible cache to prevent confusion.
> 
> Signed-off-by: Greentime Hu <greentime.hu@sifive.com>
> Signed-off-by: Zong Li <zong.li@sifive.com>
> ---
>   drivers/soc/sifive/Kconfig           |   7 +-
>   drivers/soc/sifive/Makefile          |   2 +-
>   drivers/soc/sifive/sifive_ccache.c   | 221 +++++++++++++++++++++++++
>   drivers/soc/sifive/sifive_l2_cache.c | 237 ---------------------------

Where did the 16 lines go? Could you please split renames off from any
other changes so that it is easier to see what has changed?

>   include/soc/sifive/sifive_ccache.h   |  16 ++
>   include/soc/sifive/sifive_l2_cache.h |  16 --
>   6 files changed, 242 insertions(+), 257 deletions(-)
>   create mode 100644 drivers/soc/sifive/sifive_ccache.c
>   delete mode 100644 drivers/soc/sifive/sifive_l2_cache.c
>   create mode 100644 include/soc/sifive/sifive_ccache.h
>   delete mode 100644 include/soc/sifive/sifive_l2_cache.h
> 
> diff --git a/drivers/soc/sifive/Kconfig b/drivers/soc/sifive/Kconfig
> index 58cf8c40d08d..3d65d2771f9a 100644
> --- a/drivers/soc/sifive/Kconfig
> +++ b/drivers/soc/sifive/Kconfig
> @@ -2,9 +2,10 @@
> 
>   if SOC_SIFIVE
> 
> -config SIFIVE_L2
> -       bool "Sifive L2 Cache controller"
> +config SIFIVE_CCACHE
> +       bool "Sifive composable Cache controller"
> +       default y

Changing this to default on is not a rename of the file..
This should be in a different patch.

>          help
> -         Support for the L2 cache controller on SiFive platforms.
> +         Support for the composable cache controller on SiFive platforms.
> 
>   endif
> diff --git a/drivers/soc/sifive/Makefile b/drivers/soc/sifive/Makefile
> index b5caff77938f..1f5dc339bf82 100644
> --- a/drivers/soc/sifive/Makefile
> +++ b/drivers/soc/sifive/Makefile
> @@ -1,3 +1,3 @@
>   # SPDX-License-Identifier: GPL-2.0
> 
> -obj-$(CONFIG_SIFIVE_L2)        += sifive_l2_cache.o
> +obj-$(CONFIG_SIFIVE_CCACHE)    += sifive_ccache.o
> diff --git a/drivers/soc/sifive/sifive_ccache.c b/drivers/soc/sifive/sifive_ccache.c
> new file mode 100644
> index 000000000000..46ce33db7d30
> --- /dev/null
> +++ b/drivers/soc/sifive/sifive_ccache.c
> @@ -0,0 +1,221 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * SiFive composable cache controller Driver
> + *
> + * Copyright (C) 2018-2019 SiFive, Inc.
> + *
> + */
> +#include <linux/debugfs.h>
> +#include <linux/interrupt.h>
> +#include <linux/of_irq.h>
> +#include <linux/of_address.h>
> +#include <linux/device.h>
> +#include <asm/cacheinfo.h>
> +#include <soc/sifive/sifive_ccache.h>
> +
> +#define SIFIVE_CCACHE_DIRECCFIX_LOW 0x100
> +#define SIFIVE_CCACHE_DIRECCFIX_HIGH 0x104
> +#define SIFIVE_CCACHE_DIRECCFIX_COUNT 0x108
> +
> +#define SIFIVE_CCACHE_DATECCFIX_LOW 0x140
> +#define SIFIVE_CCACHE_DATECCFIX_HIGH 0x144
> +#define SIFIVE_CCACHE_DATECCFIX_COUNT 0x148
> +
> +#define SIFIVE_CCACHE_DATECCFAIL_LOW 0x160
> +#define SIFIVE_CCACHE_DATECCFAIL_HIGH 0x164
> +#define SIFIVE_CCACHE_DATECCFAIL_COUNT 0x168
> +
> +#define SIFIVE_CCACHE_CONFIG 0x00
> +#define SIFIVE_CCACHE_WAYENABLE 0x08
> +#define SIFIVE_CCACHE_ECCINJECTERR 0x40

 From what I can see, you've also changed these around too?
Please generate the patch's diff so that the rename is detected & the
diff shows only what changed in the file. The -M option is what you
are looking for.

I have a couple other comments to make about what's changed here other,
thatn the rename but I will do so against a v2 where the diff is usable.

Thanks,
Conor.

> +
> +#define SIFIVE_CCACHE_MAX_ECCINTR 3

  reply	other threads:[~2022-08-29  7:05 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-29  6:21 [PATCH 0/3] Rename sifive L2 cache to sifive CCACHE Zong Li
2022-08-29  6:22 ` [PATCH 1/3] dt-bindings: sifive-ccache: rename SiFive L2 cache to composible cache Zong Li
2022-08-29  6:45   ` Conor.Dooley
2022-08-29  7:38     ` Zong Li
2022-08-29 18:42   ` Rob Herring
2022-08-30  2:57     ` Zong Li
2022-10-07  2:58   ` Palmer Dabbelt
2022-10-07  3:51     ` Zong Li
2022-08-29  6:22 ` [PATCH 2/3] soc: sifive: l2 cache: Rename " Zong Li
2022-08-29  7:05   ` Conor.Dooley [this message]
2022-08-29  8:40     ` Zong Li
2022-08-30  8:41       ` Conor.Dooley
2022-08-31  5:31         ` Zong Li
2022-08-30  8:18   ` Ben Dooks
2022-08-29  6:22 ` [PATCH 3/3] EDAC/sifive: use sifive_ccache instead of sifive_l2 Zong Li
2022-10-07  2:58   ` Palmer Dabbelt
2022-08-30  7:59 ` [PATCH 0/3] Rename sifive L2 cache to sifive CCACHE Ben Dooks
2022-08-31  8:23   ` Zong Li
2022-08-30 12:51 ` [RESEND PATCH] dt-bindings: sifive-ccache: fix cache level for l3 cache Ben Dooks
2022-08-30 12:56   ` Conor.Dooley
2022-08-30 12:58     ` Ben Dooks
2022-08-30 13:49       ` Conor.Dooley
2022-08-30 16:49         ` Ben Dooks
2022-08-30 17:08           ` Conor.Dooley
2022-08-31  5:17             ` Zong Li
2022-08-31  6:25               ` Conor.Dooley
2022-09-02 19:36   ` Rob Herring

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1a0da77e-8b26-a6aa-4af2-bf852470230a@microchip.com \
    --to=conor.dooley@microchip.com \
    --cc=aou@eecs.berkeley.edu \
    --cc=devicetree@vger.kernel.org \
    --cc=greentime.hu@sifive.com \
    --cc=krzysztof.kozlowski+dt@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-riscv@lists.infradead.org \
    --cc=palmer@dabbelt.com \
    --cc=paul.walmsley@sifive.com \
    --cc=robh+dt@kernel.org \
    --cc=zong.li@sifive.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).