diff mbox series

[v2] riscv: dmi: Add SMBIOS/DMI support

Message ID 20240318020916.1299190-1-haibo1.xu@intel.com
State Superseded
Headers show
Series [v2] riscv: dmi: Add SMBIOS/DMI support | expand

Commit Message

Haibo Xu March 18, 2024, 2:09 a.m. UTC
Enable the dmi driver for riscv which would allow access the
SMBIOS info through some userspace file(/sys/firmware/dmi/*).

The change was based on that of arm64 and has been verified
by dmidecode tool.

Signed-off-by: Haibo Xu <haibo1.xu@intel.com>
---
Changes since v1
  - Change to use memremap/memunmap for dmi_(early)_remap/unmap
    definition(suggested by Ard)
  - Minor clean up for comments (Ard)
---
 arch/riscv/Kconfig                   | 11 +++++++++++
 arch/riscv/include/asm/dmi.h         | 24 ++++++++++++++++++++++++
 drivers/firmware/efi/riscv-runtime.c | 13 +++++++++++++
 3 files changed, 48 insertions(+)
 create mode 100644 arch/riscv/include/asm/dmi.h

Comments

Ard Biesheuvel March 19, 2024, 5:14 p.m. UTC | #1
On Mon, 18 Mar 2024 at 02:55, Haibo Xu <haibo1.xu@intel.com> wrote:
>
> Enable the dmi driver for riscv which would allow access the
> SMBIOS info through some userspace file(/sys/firmware/dmi/*).
>
> The change was based on that of arm64 and has been verified
> by dmidecode tool.
>
> Signed-off-by: Haibo Xu <haibo1.xu@intel.com>

Reviewed-by: Ard Biesheuvel <ardb@kernel.org>


> ---
> Changes since v1
>   - Change to use memremap/memunmap for dmi_(early)_remap/unmap
>     definition(suggested by Ard)
>   - Minor clean up for comments (Ard)
> ---
>  arch/riscv/Kconfig                   | 11 +++++++++++
>  arch/riscv/include/asm/dmi.h         | 24 ++++++++++++++++++++++++
>  drivers/firmware/efi/riscv-runtime.c | 13 +++++++++++++
>  3 files changed, 48 insertions(+)
>  create mode 100644 arch/riscv/include/asm/dmi.h
>
> diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
> index 8ebafe337eac..3639151cb4ef 100644
> --- a/arch/riscv/Kconfig
> +++ b/arch/riscv/Kconfig
> @@ -952,6 +952,17 @@ config EFI
>           allow the kernel to be booted as an EFI application. This
>           is only useful on systems that have UEFI firmware.
>
> +config DMI
> +       bool "Enable support for SMBIOS (DMI) tables"
> +       depends on EFI
> +       default y
> +       help
> +         This enables SMBIOS/DMI feature for systems.
> +
> +         This option is only useful on systems that have UEFI firmware.
> +         However, even with this option, the resultant kernel should
> +         continue to boot on existing non-UEFI platforms.
> +
>  config CC_HAVE_STACKPROTECTOR_TLS
>         def_bool $(cc-option,-mstack-protector-guard=tls -mstack-protector-guard-reg=tp -mstack-protector-guard-offset=0)
>
> diff --git a/arch/riscv/include/asm/dmi.h b/arch/riscv/include/asm/dmi.h
> new file mode 100644
> index 000000000000..ca7cce557ef7
> --- /dev/null
> +++ b/arch/riscv/include/asm/dmi.h
> @@ -0,0 +1,24 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> +/*
> + * Copyright (C) 2024 Intel Corporation
> + *
> + * based on arch/arm64/include/asm/dmi.h
> + *
> + * This file is subject to the terms and conditions of the GNU General Public
> + * License.  See the file "COPYING" in the main directory of this archive
> + * for more details.
> + */
> +
> +#ifndef __ASM_DMI_H
> +#define __ASM_DMI_H
> +
> +#include <linux/io.h>
> +#include <linux/slab.h>
> +
> +#define dmi_early_remap(x, l)          memremap(x, l, MEMREMAP_WB)
> +#define dmi_early_unmap(x, l)          memunmap(x)
> +#define dmi_remap(x, l)                        memremap(x, l, MEMREMAP_WB)
> +#define dmi_unmap(x)                   memunmap(x)
> +#define dmi_alloc(l)                   kzalloc(l, GFP_KERNEL)
> +
> +#endif
> diff --git a/drivers/firmware/efi/riscv-runtime.c b/drivers/firmware/efi/riscv-runtime.c
> index 09525fb5c240..c3bfb9e77e02 100644
> --- a/drivers/firmware/efi/riscv-runtime.c
> +++ b/drivers/firmware/efi/riscv-runtime.c
> @@ -152,3 +152,16 @@ void arch_efi_call_virt_teardown(void)
>  {
>         efi_virtmap_unload();
>  }
> +
> +static int __init riscv_dmi_init(void)
> +{
> +       /*
> +        * On riscv, DMI depends on UEFI, and dmi_setup() needs to
> +        * be called early because dmi_id_init(), which is an arch_initcall
> +        * itself, depends on dmi_scan_machine() having been called already.
> +        */
> +       dmi_setup();
> +
> +       return 0;
> +}
> +core_initcall(riscv_dmi_init);
> --
> 2.34.1
>
Atish Kumar Patra March 19, 2024, 7:46 p.m. UTC | #2
On 3/17/24 19:09, Haibo Xu wrote:
> Enable the dmi driver for riscv which would allow access the
> SMBIOS info through some userspace file(/sys/firmware/dmi/*).
> 
> The change was based on that of arm64 and has been verified
> by dmidecode tool.
> 
> Signed-off-by: Haibo Xu <haibo1.xu@intel.com>
> ---
> Changes since v1
>    - Change to use memremap/memunmap for dmi_(early)_remap/unmap
>      definition(suggested by Ard)
>    - Minor clean up for comments (Ard)
> ---
>   arch/riscv/Kconfig                   | 11 +++++++++++
>   arch/riscv/include/asm/dmi.h         | 24 ++++++++++++++++++++++++
>   drivers/firmware/efi/riscv-runtime.c | 13 +++++++++++++
>   3 files changed, 48 insertions(+)
>   create mode 100644 arch/riscv/include/asm/dmi.h
> 
> diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
> index 8ebafe337eac..3639151cb4ef 100644
> --- a/arch/riscv/Kconfig
> +++ b/arch/riscv/Kconfig
> @@ -952,6 +952,17 @@ config EFI
>   	  allow the kernel to be booted as an EFI application. This
>   	  is only useful on systems that have UEFI firmware.
>   
> +config DMI
> +	bool "Enable support for SMBIOS (DMI) tables"
> +	depends on EFI
> +	default y
> +	help
> +	  This enables SMBIOS/DMI feature for systems.
> +
> +	  This option is only useful on systems that have UEFI firmware.
> +	  However, even with this option, the resultant kernel should
> +	  continue to boot on existing non-UEFI platforms.
> +
>   config CC_HAVE_STACKPROTECTOR_TLS
>   	def_bool $(cc-option,-mstack-protector-guard=tls -mstack-protector-guard-reg=tp -mstack-protector-guard-offset=0)
>   
> diff --git a/arch/riscv/include/asm/dmi.h b/arch/riscv/include/asm/dmi.h
> new file mode 100644
> index 000000000000..ca7cce557ef7
> --- /dev/null
> +++ b/arch/riscv/include/asm/dmi.h
> @@ -0,0 +1,24 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> +/*
> + * Copyright (C) 2024 Intel Corporation
> + *
> + * based on arch/arm64/include/asm/dmi.h
> + *
> + * This file is subject to the terms and conditions of the GNU General Public
> + * License.  See the file "COPYING" in the main directory of this archive
> + * for more details.
> + */
> +
> +#ifndef __ASM_DMI_H
> +#define __ASM_DMI_H
> +
> +#include <linux/io.h>
> +#include <linux/slab.h>
> +
> +#define dmi_early_remap(x, l)		memremap(x, l, MEMREMAP_WB)
> +#define dmi_early_unmap(x, l)		memunmap(x)
> +#define dmi_remap(x, l)			memremap(x, l, MEMREMAP_WB)
> +#define dmi_unmap(x)			memunmap(x)
> +#define dmi_alloc(l)			kzalloc(l, GFP_KERNEL)
> +
> +#endif
> diff --git a/drivers/firmware/efi/riscv-runtime.c b/drivers/firmware/efi/riscv-runtime.c
> index 09525fb5c240..c3bfb9e77e02 100644
> --- a/drivers/firmware/efi/riscv-runtime.c
> +++ b/drivers/firmware/efi/riscv-runtime.c
> @@ -152,3 +152,16 @@ void arch_efi_call_virt_teardown(void)
>   {
>   	efi_virtmap_unload();
>   }
> +
> +static int __init riscv_dmi_init(void)
> +{
> +	/*
> +	 * On riscv, DMI depends on UEFI, and dmi_setup() needs to
> +	 * be called early because dmi_id_init(), which is an arch_initcall
> +	 * itself, depends on dmi_scan_machine() having been called already.
> +	 */
> +	dmi_setup();
> +
> +	return 0;
> +}
> +core_initcall(riscv_dmi_init);

Reviewed-by: Atish Patra <atishp@rivosinc.com>
Haibo Xu April 29, 2024, 2:22 p.m. UTC | #3
Hi @Palmer,

Could you please let me know whether this patch was OK for the next RISC-V PULL?

Thanks,
Haibo

On Wed, Mar 20, 2024 at 3:46 AM Atish Patra <atishp@rivosinc.com> wrote:
>
> On 3/17/24 19:09, Haibo Xu wrote:
> > Enable the dmi driver for riscv which would allow access the
> > SMBIOS info through some userspace file(/sys/firmware/dmi/*).
> >
> > The change was based on that of arm64 and has been verified
> > by dmidecode tool.
> >
> > Signed-off-by: Haibo Xu <haibo1.xu@intel.com>
> > ---
> > Changes since v1
> >    - Change to use memremap/memunmap for dmi_(early)_remap/unmap
> >      definition(suggested by Ard)
> >    - Minor clean up for comments (Ard)
> > ---
> >   arch/riscv/Kconfig                   | 11 +++++++++++
> >   arch/riscv/include/asm/dmi.h         | 24 ++++++++++++++++++++++++
> >   drivers/firmware/efi/riscv-runtime.c | 13 +++++++++++++
> >   3 files changed, 48 insertions(+)
> >   create mode 100644 arch/riscv/include/asm/dmi.h
> >
> > diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
> > index 8ebafe337eac..3639151cb4ef 100644
> > --- a/arch/riscv/Kconfig
> > +++ b/arch/riscv/Kconfig
> > @@ -952,6 +952,17 @@ config EFI
> >         allow the kernel to be booted as an EFI application. This
> >         is only useful on systems that have UEFI firmware.
> >
> > +config DMI
> > +     bool "Enable support for SMBIOS (DMI) tables"
> > +     depends on EFI
> > +     default y
> > +     help
> > +       This enables SMBIOS/DMI feature for systems.
> > +
> > +       This option is only useful on systems that have UEFI firmware.
> > +       However, even with this option, the resultant kernel should
> > +       continue to boot on existing non-UEFI platforms.
> > +
> >   config CC_HAVE_STACKPROTECTOR_TLS
> >       def_bool $(cc-option,-mstack-protector-guard=tls -mstack-protector-guard-reg=tp -mstack-protector-guard-offset=0)
> >
> > diff --git a/arch/riscv/include/asm/dmi.h b/arch/riscv/include/asm/dmi.h
> > new file mode 100644
> > index 000000000000..ca7cce557ef7
> > --- /dev/null
> > +++ b/arch/riscv/include/asm/dmi.h
> > @@ -0,0 +1,24 @@
> > +/* SPDX-License-Identifier: GPL-2.0 */
> > +/*
> > + * Copyright (C) 2024 Intel Corporation
> > + *
> > + * based on arch/arm64/include/asm/dmi.h
> > + *
> > + * This file is subject to the terms and conditions of the GNU General Public
> > + * License.  See the file "COPYING" in the main directory of this archive
> > + * for more details.
> > + */
> > +
> > +#ifndef __ASM_DMI_H
> > +#define __ASM_DMI_H
> > +
> > +#include <linux/io.h>
> > +#include <linux/slab.h>
> > +
> > +#define dmi_early_remap(x, l)                memremap(x, l, MEMREMAP_WB)
> > +#define dmi_early_unmap(x, l)                memunmap(x)
> > +#define dmi_remap(x, l)                      memremap(x, l, MEMREMAP_WB)
> > +#define dmi_unmap(x)                 memunmap(x)
> > +#define dmi_alloc(l)                 kzalloc(l, GFP_KERNEL)
> > +
> > +#endif
> > diff --git a/drivers/firmware/efi/riscv-runtime.c b/drivers/firmware/efi/riscv-runtime.c
> > index 09525fb5c240..c3bfb9e77e02 100644
> > --- a/drivers/firmware/efi/riscv-runtime.c
> > +++ b/drivers/firmware/efi/riscv-runtime.c
> > @@ -152,3 +152,16 @@ void arch_efi_call_virt_teardown(void)
> >   {
> >       efi_virtmap_unload();
> >   }
> > +
> > +static int __init riscv_dmi_init(void)
> > +{
> > +     /*
> > +      * On riscv, DMI depends on UEFI, and dmi_setup() needs to
> > +      * be called early because dmi_id_init(), which is an arch_initcall
> > +      * itself, depends on dmi_scan_machine() having been called already.
> > +      */
> > +     dmi_setup();
> > +
> > +     return 0;
> > +}
> > +core_initcall(riscv_dmi_init);
>
> Reviewed-by: Atish Patra <atishp@rivosinc.com>
Haibo Xu May 26, 2024, 9:17 a.m. UTC | #4
kindly ping!

Any more comments on this patch?

Thanks,
Haibo

On Mon, Apr 29, 2024 at 10:22 PM Haibo Xu <xiaobo55x@gmail.com> wrote:
>
> Hi @Palmer,
>
> Could you please let me know whether this patch was OK for the next RISC-V PULL?
>
> Thanks,
> Haibo
>
> On Wed, Mar 20, 2024 at 3:46 AM Atish Patra <atishp@rivosinc.com> wrote:
> >
> > On 3/17/24 19:09, Haibo Xu wrote:
> > > Enable the dmi driver for riscv which would allow access the
> > > SMBIOS info through some userspace file(/sys/firmware/dmi/*).
> > >
> > > The change was based on that of arm64 and has been verified
> > > by dmidecode tool.
> > >
> > > Signed-off-by: Haibo Xu <haibo1.xu@intel.com>
> > > ---
> > > Changes since v1
> > >    - Change to use memremap/memunmap for dmi_(early)_remap/unmap
> > >      definition(suggested by Ard)
> > >    - Minor clean up for comments (Ard)
> > > ---
> > >   arch/riscv/Kconfig                   | 11 +++++++++++
> > >   arch/riscv/include/asm/dmi.h         | 24 ++++++++++++++++++++++++
> > >   drivers/firmware/efi/riscv-runtime.c | 13 +++++++++++++
> > >   3 files changed, 48 insertions(+)
> > >   create mode 100644 arch/riscv/include/asm/dmi.h
> > >
> > > diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
> > > index 8ebafe337eac..3639151cb4ef 100644
> > > --- a/arch/riscv/Kconfig
> > > +++ b/arch/riscv/Kconfig
> > > @@ -952,6 +952,17 @@ config EFI
> > >         allow the kernel to be booted as an EFI application. This
> > >         is only useful on systems that have UEFI firmware.
> > >
> > > +config DMI
> > > +     bool "Enable support for SMBIOS (DMI) tables"
> > > +     depends on EFI
> > > +     default y
> > > +     help
> > > +       This enables SMBIOS/DMI feature for systems.
> > > +
> > > +       This option is only useful on systems that have UEFI firmware.
> > > +       However, even with this option, the resultant kernel should
> > > +       continue to boot on existing non-UEFI platforms.
> > > +
> > >   config CC_HAVE_STACKPROTECTOR_TLS
> > >       def_bool $(cc-option,-mstack-protector-guard=tls -mstack-protector-guard-reg=tp -mstack-protector-guard-offset=0)
> > >
> > > diff --git a/arch/riscv/include/asm/dmi.h b/arch/riscv/include/asm/dmi.h
> > > new file mode 100644
> > > index 000000000000..ca7cce557ef7
> > > --- /dev/null
> > > +++ b/arch/riscv/include/asm/dmi.h
> > > @@ -0,0 +1,24 @@
> > > +/* SPDX-License-Identifier: GPL-2.0 */
> > > +/*
> > > + * Copyright (C) 2024 Intel Corporation
> > > + *
> > > + * based on arch/arm64/include/asm/dmi.h
> > > + *
> > > + * This file is subject to the terms and conditions of the GNU General Public
> > > + * License.  See the file "COPYING" in the main directory of this archive
> > > + * for more details.
> > > + */
> > > +
> > > +#ifndef __ASM_DMI_H
> > > +#define __ASM_DMI_H
> > > +
> > > +#include <linux/io.h>
> > > +#include <linux/slab.h>
> > > +
> > > +#define dmi_early_remap(x, l)                memremap(x, l, MEMREMAP_WB)
> > > +#define dmi_early_unmap(x, l)                memunmap(x)
> > > +#define dmi_remap(x, l)                      memremap(x, l, MEMREMAP_WB)
> > > +#define dmi_unmap(x)                 memunmap(x)
> > > +#define dmi_alloc(l)                 kzalloc(l, GFP_KERNEL)
> > > +
> > > +#endif
> > > diff --git a/drivers/firmware/efi/riscv-runtime.c b/drivers/firmware/efi/riscv-runtime.c
> > > index 09525fb5c240..c3bfb9e77e02 100644
> > > --- a/drivers/firmware/efi/riscv-runtime.c
> > > +++ b/drivers/firmware/efi/riscv-runtime.c
> > > @@ -152,3 +152,16 @@ void arch_efi_call_virt_teardown(void)
> > >   {
> > >       efi_virtmap_unload();
> > >   }
> > > +
> > > +static int __init riscv_dmi_init(void)
> > > +{
> > > +     /*
> > > +      * On riscv, DMI depends on UEFI, and dmi_setup() needs to
> > > +      * be called early because dmi_id_init(), which is an arch_initcall
> > > +      * itself, depends on dmi_scan_machine() having been called already.
> > > +      */
> > > +     dmi_setup();
> > > +
> > > +     return 0;
> > > +}
> > > +core_initcall(riscv_dmi_init);
> >
> > Reviewed-by: Atish Patra <atishp@rivosinc.com>
Palmer Dabbelt June 26, 2024, 3:03 p.m. UTC | #5
On Sun, 26 May 2024 02:17:40 PDT (-0700), xiaobo55x@gmail.com wrote:
> kindly ping!
>
> Any more comments on this patch?

Sorry I dropped the ball on this one, it's queued up for staging and 
should show up on for-next assuming it passes the tests.

>
> Thanks,
> Haibo
>
> On Mon, Apr 29, 2024 at 10:22 PM Haibo Xu <xiaobo55x@gmail.com> wrote:
>>
>> Hi @Palmer,
>>
>> Could you please let me know whether this patch was OK for the next RISC-V PULL?
>>
>> Thanks,
>> Haibo
>>
>> On Wed, Mar 20, 2024 at 3:46 AM Atish Patra <atishp@rivosinc.com> wrote:
>> >
>> > On 3/17/24 19:09, Haibo Xu wrote:
>> > > Enable the dmi driver for riscv which would allow access the
>> > > SMBIOS info through some userspace file(/sys/firmware/dmi/*).
>> > >
>> > > The change was based on that of arm64 and has been verified
>> > > by dmidecode tool.
>> > >
>> > > Signed-off-by: Haibo Xu <haibo1.xu@intel.com>
>> > > ---
>> > > Changes since v1
>> > >    - Change to use memremap/memunmap for dmi_(early)_remap/unmap
>> > >      definition(suggested by Ard)
>> > >    - Minor clean up for comments (Ard)
>> > > ---
>> > >   arch/riscv/Kconfig                   | 11 +++++++++++
>> > >   arch/riscv/include/asm/dmi.h         | 24 ++++++++++++++++++++++++
>> > >   drivers/firmware/efi/riscv-runtime.c | 13 +++++++++++++
>> > >   3 files changed, 48 insertions(+)
>> > >   create mode 100644 arch/riscv/include/asm/dmi.h
>> > >
>> > > diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
>> > > index 8ebafe337eac..3639151cb4ef 100644
>> > > --- a/arch/riscv/Kconfig
>> > > +++ b/arch/riscv/Kconfig
>> > > @@ -952,6 +952,17 @@ config EFI
>> > >         allow the kernel to be booted as an EFI application. This
>> > >         is only useful on systems that have UEFI firmware.
>> > >
>> > > +config DMI
>> > > +     bool "Enable support for SMBIOS (DMI) tables"
>> > > +     depends on EFI
>> > > +     default y
>> > > +     help
>> > > +       This enables SMBIOS/DMI feature for systems.
>> > > +
>> > > +       This option is only useful on systems that have UEFI firmware.
>> > > +       However, even with this option, the resultant kernel should
>> > > +       continue to boot on existing non-UEFI platforms.
>> > > +
>> > >   config CC_HAVE_STACKPROTECTOR_TLS
>> > >       def_bool $(cc-option,-mstack-protector-guard=tls -mstack-protector-guard-reg=tp -mstack-protector-guard-offset=0)
>> > >
>> > > diff --git a/arch/riscv/include/asm/dmi.h b/arch/riscv/include/asm/dmi.h
>> > > new file mode 100644
>> > > index 000000000000..ca7cce557ef7
>> > > --- /dev/null
>> > > +++ b/arch/riscv/include/asm/dmi.h
>> > > @@ -0,0 +1,24 @@
>> > > +/* SPDX-License-Identifier: GPL-2.0 */
>> > > +/*
>> > > + * Copyright (C) 2024 Intel Corporation
>> > > + *
>> > > + * based on arch/arm64/include/asm/dmi.h
>> > > + *
>> > > + * This file is subject to the terms and conditions of the GNU General Public
>> > > + * License.  See the file "COPYING" in the main directory of this archive
>> > > + * for more details.
>> > > + */
>> > > +
>> > > +#ifndef __ASM_DMI_H
>> > > +#define __ASM_DMI_H
>> > > +
>> > > +#include <linux/io.h>
>> > > +#include <linux/slab.h>
>> > > +
>> > > +#define dmi_early_remap(x, l)                memremap(x, l, MEMREMAP_WB)
>> > > +#define dmi_early_unmap(x, l)                memunmap(x)
>> > > +#define dmi_remap(x, l)                      memremap(x, l, MEMREMAP_WB)
>> > > +#define dmi_unmap(x)                 memunmap(x)
>> > > +#define dmi_alloc(l)                 kzalloc(l, GFP_KERNEL)
>> > > +
>> > > +#endif
>> > > diff --git a/drivers/firmware/efi/riscv-runtime.c b/drivers/firmware/efi/riscv-runtime.c
>> > > index 09525fb5c240..c3bfb9e77e02 100644
>> > > --- a/drivers/firmware/efi/riscv-runtime.c
>> > > +++ b/drivers/firmware/efi/riscv-runtime.c
>> > > @@ -152,3 +152,16 @@ void arch_efi_call_virt_teardown(void)
>> > >   {
>> > >       efi_virtmap_unload();
>> > >   }
>> > > +
>> > > +static int __init riscv_dmi_init(void)
>> > > +{
>> > > +     /*
>> > > +      * On riscv, DMI depends on UEFI, and dmi_setup() needs to
>> > > +      * be called early because dmi_id_init(), which is an arch_initcall
>> > > +      * itself, depends on dmi_scan_machine() having been called already.
>> > > +      */
>> > > +     dmi_setup();
>> > > +
>> > > +     return 0;
>> > > +}
>> > > +core_initcall(riscv_dmi_init);
>> >
>> > Reviewed-by: Atish Patra <atishp@rivosinc.com>
Haibo Xu June 26, 2024, 3:46 p.m. UTC | #6
On Wed, Jun 26, 2024 at 11:03 PM Palmer Dabbelt <palmer@dabbelt.com> wrote:
>
> On Sun, 26 May 2024 02:17:40 PDT (-0700), xiaobo55x@gmail.com wrote:
> > kindly ping!
> >
> > Any more comments on this patch?
>
> Sorry I dropped the ball on this one, it's queued up for staging and
> should show up on for-next assuming it passes the tests.
>

Thanks!

> >
> > Thanks,
> > Haibo
> >
> > On Mon, Apr 29, 2024 at 10:22 PM Haibo Xu <xiaobo55x@gmail.com> wrote:
> >>
> >> Hi @Palmer,
> >>
> >> Could you please let me know whether this patch was OK for the next RISC-V PULL?
> >>
> >> Thanks,
> >> Haibo
> >>
> >> On Wed, Mar 20, 2024 at 3:46 AM Atish Patra <atishp@rivosinc.com> wrote:
> >> >
> >> > On 3/17/24 19:09, Haibo Xu wrote:
> >> > > Enable the dmi driver for riscv which would allow access the
> >> > > SMBIOS info through some userspace file(/sys/firmware/dmi/*).
> >> > >
> >> > > The change was based on that of arm64 and has been verified
> >> > > by dmidecode tool.
> >> > >
> >> > > Signed-off-by: Haibo Xu <haibo1.xu@intel.com>
> >> > > ---
> >> > > Changes since v1
> >> > >    - Change to use memremap/memunmap for dmi_(early)_remap/unmap
> >> > >      definition(suggested by Ard)
> >> > >    - Minor clean up for comments (Ard)
> >> > > ---
> >> > >   arch/riscv/Kconfig                   | 11 +++++++++++
> >> > >   arch/riscv/include/asm/dmi.h         | 24 ++++++++++++++++++++++++
> >> > >   drivers/firmware/efi/riscv-runtime.c | 13 +++++++++++++
> >> > >   3 files changed, 48 insertions(+)
> >> > >   create mode 100644 arch/riscv/include/asm/dmi.h
> >> > >
> >> > > diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
> >> > > index 8ebafe337eac..3639151cb4ef 100644
> >> > > --- a/arch/riscv/Kconfig
> >> > > +++ b/arch/riscv/Kconfig
> >> > > @@ -952,6 +952,17 @@ config EFI
> >> > >         allow the kernel to be booted as an EFI application. This
> >> > >         is only useful on systems that have UEFI firmware.
> >> > >
> >> > > +config DMI
> >> > > +     bool "Enable support for SMBIOS (DMI) tables"
> >> > > +     depends on EFI
> >> > > +     default y
> >> > > +     help
> >> > > +       This enables SMBIOS/DMI feature for systems.
> >> > > +
> >> > > +       This option is only useful on systems that have UEFI firmware.
> >> > > +       However, even with this option, the resultant kernel should
> >> > > +       continue to boot on existing non-UEFI platforms.
> >> > > +
> >> > >   config CC_HAVE_STACKPROTECTOR_TLS
> >> > >       def_bool $(cc-option,-mstack-protector-guard=tls -mstack-protector-guard-reg=tp -mstack-protector-guard-offset=0)
> >> > >
> >> > > diff --git a/arch/riscv/include/asm/dmi.h b/arch/riscv/include/asm/dmi.h
> >> > > new file mode 100644
> >> > > index 000000000000..ca7cce557ef7
> >> > > --- /dev/null
> >> > > +++ b/arch/riscv/include/asm/dmi.h
> >> > > @@ -0,0 +1,24 @@
> >> > > +/* SPDX-License-Identifier: GPL-2.0 */
> >> > > +/*
> >> > > + * Copyright (C) 2024 Intel Corporation
> >> > > + *
> >> > > + * based on arch/arm64/include/asm/dmi.h
> >> > > + *
> >> > > + * This file is subject to the terms and conditions of the GNU General Public
> >> > > + * License.  See the file "COPYING" in the main directory of this archive
> >> > > + * for more details.
> >> > > + */
> >> > > +
> >> > > +#ifndef __ASM_DMI_H
> >> > > +#define __ASM_DMI_H
> >> > > +
> >> > > +#include <linux/io.h>
> >> > > +#include <linux/slab.h>
> >> > > +
> >> > > +#define dmi_early_remap(x, l)                memremap(x, l, MEMREMAP_WB)
> >> > > +#define dmi_early_unmap(x, l)                memunmap(x)
> >> > > +#define dmi_remap(x, l)                      memremap(x, l, MEMREMAP_WB)
> >> > > +#define dmi_unmap(x)                 memunmap(x)
> >> > > +#define dmi_alloc(l)                 kzalloc(l, GFP_KERNEL)
> >> > > +
> >> > > +#endif
> >> > > diff --git a/drivers/firmware/efi/riscv-runtime.c b/drivers/firmware/efi/riscv-runtime.c
> >> > > index 09525fb5c240..c3bfb9e77e02 100644
> >> > > --- a/drivers/firmware/efi/riscv-runtime.c
> >> > > +++ b/drivers/firmware/efi/riscv-runtime.c
> >> > > @@ -152,3 +152,16 @@ void arch_efi_call_virt_teardown(void)
> >> > >   {
> >> > >       efi_virtmap_unload();
> >> > >   }
> >> > > +
> >> > > +static int __init riscv_dmi_init(void)
> >> > > +{
> >> > > +     /*
> >> > > +      * On riscv, DMI depends on UEFI, and dmi_setup() needs to
> >> > > +      * be called early because dmi_id_init(), which is an arch_initcall
> >> > > +      * itself, depends on dmi_scan_machine() having been called already.
> >> > > +      */
> >> > > +     dmi_setup();
> >> > > +
> >> > > +     return 0;
> >> > > +}
> >> > > +core_initcall(riscv_dmi_init);
> >> >
> >> > Reviewed-by: Atish Patra <atishp@rivosinc.com>
patchwork-bot+linux-riscv@kernel.org June 27, 2024, 5:50 p.m. UTC | #7
Hello:

This patch was applied to riscv/linux.git (for-next)
by Palmer Dabbelt <palmer@rivosinc.com>:

On Mon, 18 Mar 2024 10:09:16 +0800 you wrote:
> Enable the dmi driver for riscv which would allow access the
> SMBIOS info through some userspace file(/sys/firmware/dmi/*).
> 
> The change was based on that of arm64 and has been verified
> by dmidecode tool.
> 
> Signed-off-by: Haibo Xu <haibo1.xu@intel.com>
> 
> [...]

Here is the summary with links:
  - [v2] riscv: dmi: Add SMBIOS/DMI support
    https://git.kernel.org/riscv/c/d6ecd188937f

You are awesome, thank you!
diff mbox series

Patch

diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index 8ebafe337eac..3639151cb4ef 100644
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -952,6 +952,17 @@  config EFI
 	  allow the kernel to be booted as an EFI application. This
 	  is only useful on systems that have UEFI firmware.
 
+config DMI
+	bool "Enable support for SMBIOS (DMI) tables"
+	depends on EFI
+	default y
+	help
+	  This enables SMBIOS/DMI feature for systems.
+
+	  This option is only useful on systems that have UEFI firmware.
+	  However, even with this option, the resultant kernel should
+	  continue to boot on existing non-UEFI platforms.
+
 config CC_HAVE_STACKPROTECTOR_TLS
 	def_bool $(cc-option,-mstack-protector-guard=tls -mstack-protector-guard-reg=tp -mstack-protector-guard-offset=0)
 
diff --git a/arch/riscv/include/asm/dmi.h b/arch/riscv/include/asm/dmi.h
new file mode 100644
index 000000000000..ca7cce557ef7
--- /dev/null
+++ b/arch/riscv/include/asm/dmi.h
@@ -0,0 +1,24 @@ 
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (C) 2024 Intel Corporation
+ *
+ * based on arch/arm64/include/asm/dmi.h
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+
+#ifndef __ASM_DMI_H
+#define __ASM_DMI_H
+
+#include <linux/io.h>
+#include <linux/slab.h>
+
+#define dmi_early_remap(x, l)		memremap(x, l, MEMREMAP_WB)
+#define dmi_early_unmap(x, l)		memunmap(x)
+#define dmi_remap(x, l)			memremap(x, l, MEMREMAP_WB)
+#define dmi_unmap(x)			memunmap(x)
+#define dmi_alloc(l)			kzalloc(l, GFP_KERNEL)
+
+#endif
diff --git a/drivers/firmware/efi/riscv-runtime.c b/drivers/firmware/efi/riscv-runtime.c
index 09525fb5c240..c3bfb9e77e02 100644
--- a/drivers/firmware/efi/riscv-runtime.c
+++ b/drivers/firmware/efi/riscv-runtime.c
@@ -152,3 +152,16 @@  void arch_efi_call_virt_teardown(void)
 {
 	efi_virtmap_unload();
 }
+
+static int __init riscv_dmi_init(void)
+{
+	/*
+	 * On riscv, DMI depends on UEFI, and dmi_setup() needs to
+	 * be called early because dmi_id_init(), which is an arch_initcall
+	 * itself, depends on dmi_scan_machine() having been called already.
+	 */
+	dmi_setup();
+
+	return 0;
+}
+core_initcall(riscv_dmi_init);