Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Yash Shah <yash.shah@sifive.com>
To:     "Paul Walmsley ( Sifive)" <paul.walmsley@sifive.com>
CC:     "palmer@dabbelt.com" <palmer@dabbelt.com>,
        "aou@eecs.berkeley.edu" <aou@eecs.berkeley.edu>,
        "bp@alien8.de" <bp@alien8.de>,
        "mchehab@kernel.org" <mchehab@kernel.org>,
        "tony.luck@intel.com" <tony.luck@intel.com>,
        "james.morse@arm.com" <james.morse@arm.com>,
        "rrichter@marvell.com" <rrichter@marvell.com>,
        "linux-riscv@lists.infradead.org" <linux-riscv@lists.infradead.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "linux-edac@vger.kernel.org" <linux-edac@vger.kernel.org>
Subject: RE: [PATCH] riscv: move sifive_l2_cache.h to include/soc
Thread-Topic: [PATCH] riscv: move sifive_l2_cache.h to include/soc
Thread-Index: AQHVxeorDALZ3QQDdE2BsC6QnTnA3KfkqnIAgAAL4gCAACLh8A==
Date:   Sat, 11 Jan 2020 03:57:25 +0000
Message-ID: <CH2PR13MB3368D2DF7D06BA494AECBE238C3B0@CH2PR13MB3368.namprd13.prod.outlook.com>
References: <1578463746-25279-1-git-send-email-yash.shah@sifive.com>
 <alpine.DEB.2.21.9999.2001101704440.32308@viisi.sifive.com>
 <alpine.DEB.2.21.9999.2001101746310.40553@viisi.sifive.com>
In-Reply-To: <alpine.DEB.2.21.9999.2001101746310.40553@viisi.sifive.com>
Accept-Language: en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: sifive.com does not designate
 permitted sender hosts)
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: d41a66f8-3fbf-43be-e724-08d7964a5f0f
X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Jan 2020 03:57:25.7011
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 22f88e9d-ae0d-4ed9-b984-cdc9be1529f1
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: o+OP+VEZjDHzOQObiN8lFsh/85yxU+EZpa3jHPsN/MDMHkLlssqfPJF6xIrsti2c0HcDfWeqQLS+DYUIy1VGWA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR13MB3590
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


> -----Original Message-----
> From: Paul Walmsley <paul.walmsley@sifive.com>
> Sent: 11 January 2020 07:17
> To: Yash Shah <yash.shah@sifive.com>
> Cc: palmer@dabbelt.com; aou@eecs.berkeley.edu; bp@alien8.de;
> mchehab@kernel.org; tony.luck@intel.com; james.morse@arm.com;
> rrichter@marvell.com; linux-riscv@lists.infradead.org; linux-
> kernel@vger.kernel.org; linux-edac@vger.kernel.org
> Subject: Re: [PATCH] riscv: move sifive_l2_cache.h to include/soc
>=20
> On Fri, 10 Jan 2020, Paul Walmsley wrote:
>=20
> > On Tue, 7 Jan 2020, Yash Shah wrote:
> >
> > > The commit 9209fb51896f ("riscv: move sifive_l2_cache.c to
> > > drivers/soc") moves the sifive L2 cache driver to driver/soc. It did
> > > not move the header file along with the driver. Therefore this patch
> > > moves the header file to driver/soc
> > >
> > > Signed-off-by: Yash Shah <yash.shah@sifive.com>
> >
> > Thanks, queued for v5.5-rc.
>=20
> By the way, I fixed the include guard also.  The queued patch follows.

Thanks, somehow I had overseen that.

- Yash

>=20
>=20
> - Paul
>=20
> From: Yash Shah <yash.shah@sifive.com>
> Date: Tue, 7 Jan 2020 22:09:06 -0800
> Subject: [PATCH] riscv: move sifive_l2_cache.h to include/soc
>=20
> The commit 9209fb51896f ("riscv: move sifive_l2_cache.c to drivers/soc")
> moves the sifive L2 cache driver to driver/soc. It did not move the heade=
r file
> along with the driver. Therefore this patch moves the header file to
> driver/soc
>=20
> Signed-off-by: Yash Shah <yash.shah@sifive.com>
> Reviewed-by: Anup Patel <anup@brainfault.org>
> [paul.walmsley@sifive.com: updated to fix the include guard]
> Fixes: 9209fb51896f ("riscv: move sifive_l2_cache.c to drivers/soc")
> Signed-off-by: Paul Walmsley <paul.walmsley@sifive.com>
> ---
>  drivers/edac/sifive_edac.c                                  | 2 +-
>  drivers/soc/sifive/sifive_l2_cache.c                        | 2 +-
>  .../include/asm =3D> include/soc/sifive}/sifive_l2_cache.h    | 6 +++---
>  3 files changed, 5 insertions(+), 5 deletions(-)  rename
> {arch/riscv/include/asm =3D> include/soc/sifive}/sifive_l2_cache.h (72%)
>=20
> diff --git a/drivers/edac/sifive_edac.c b/drivers/edac/sifive_edac.c inde=
x
> 413cdb4a591d..c0cc72a3b2be 100644
> --- a/drivers/edac/sifive_edac.c
> +++ b/drivers/edac/sifive_edac.c
> @@ -10,7 +10,7 @@
>  #include <linux/edac.h>
>  #include <linux/platform_device.h>
>  #include "edac_module.h"
> -#include <asm/sifive_l2_cache.h>
> +#include <soc/sifive/sifive_l2_cache.h>
>=20
>  #define DRVNAME "sifive_edac"
>=20
> diff --git a/drivers/soc/sifive/sifive_l2_cache.c
> b/drivers/soc/sifive/sifive_l2_cache.c
> index a9ffff3277c7..a5069394cd61 100644
> --- a/drivers/soc/sifive/sifive_l2_cache.c
> +++ b/drivers/soc/sifive/sifive_l2_cache.c
> @@ -9,7 +9,7 @@
>  #include <linux/interrupt.h>
>  #include <linux/of_irq.h>
>  #include <linux/of_address.h>
> -#include <asm/sifive_l2_cache.h>
> +#include <soc/sifive/sifive_l2_cache.h>
>=20
>  #define SIFIVE_L2_DIRECCFIX_LOW 0x100
>  #define SIFIVE_L2_DIRECCFIX_HIGH 0x104
> diff --git a/arch/riscv/include/asm/sifive_l2_cache.h
> b/include/soc/sifive/sifive_l2_cache.h
> similarity index 72%
> rename from arch/riscv/include/asm/sifive_l2_cache.h
> rename to include/soc/sifive/sifive_l2_cache.h
> index 04f6748fc50b..92ade10ed67e 100644
> --- a/arch/riscv/include/asm/sifive_l2_cache.h
> +++ b/include/soc/sifive/sifive_l2_cache.h
> @@ -4,8 +4,8 @@
>   *
>   */
>=20
> -#ifndef _ASM_RISCV_SIFIVE_L2_CACHE_H
> -#define _ASM_RISCV_SIFIVE_L2_CACHE_H
> +#ifndef __SOC_SIFIVE_L2_CACHE_H
> +#define __SOC_SIFIVE_L2_CACHE_H
>=20
>  extern int register_sifive_l2_error_notifier(struct notifier_block *nb);=
  extern
> int unregister_sifive_l2_error_notifier(struct notifier_block *nb); @@ -1=
3,4
> +13,4 @@ extern int unregister_sifive_l2_error_notifier(struct notifier_b=
lock
> *nb);  #define SIFIVE_L2_ERR_TYPE_CE 0  #define SIFIVE_L2_ERR_TYPE_UE 1
>=20
> -#endif /* _ASM_RISCV_SIFIVE_L2_CACHE_H */
> +#endif /* __SOC_SIFIVE_L2_CACHE_H */
> --
> 2.25.0.rc2
>=20
>=20