lkml.org 
[lkml]   [2020]   [May]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH v3 2/2] drivers/irqchip: Use new macro ACPI_DECLARE_SUBTABLE_PROBE_ENTRY
Hi Oscar,

On 2020-05-29 18:18, Oscar Carter wrote:
> In an effort to enable -Wcast-function-type in the top-level Makefile
> to
> support Control Flow Integrity builds, there are the need to remove all
> the function callback casts.
>
> To do this, modify the IRQCHIP_ACPI_DECLARE macro to use the new
> defined
> macro ACPI_DECLARE_SUBTABLE_PROBE_ENTRY instead of the macro
> ACPI_DECLARE_PROBE_ENTRY. This is necessary to be able to initialize
> the
> the acpi_probe_entry struct using the probe_subtbl field instead of the
> probe_table field and avoid function cast mismatches.
>
> Also, modify the prototype of the functions used by the invocation of
> the
> IRQCHIP_ACPI_DECLARE macro to match all the parameters.
>
> Co-developed-by: Marc Zyngier <maz@kernel.org>
> Signed-off-by: Marc Zyngier <maz@kernel.org>
> Signed-off-by: Oscar Carter <oscar.carter@gmx.com>
> ---
> drivers/irqchip/irq-gic-v3.c | 2 +-
> drivers/irqchip/irq-gic.c | 2 +-
> include/linux/irqchip.h | 5 +++--
> 3 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/irqchip/irq-gic-v3.c
> b/drivers/irqchip/irq-gic-v3.c
> index d7006ef18a0d..3870e9d4d3a8 100644
> --- a/drivers/irqchip/irq-gic-v3.c
> +++ b/drivers/irqchip/irq-gic-v3.c
> @@ -2117,7 +2117,7 @@ static void __init gic_acpi_setup_kvm_info(void)
> }
>
> static int __init
> -gic_acpi_init(struct acpi_subtable_header *header, const unsigned long
> end)
> +gic_acpi_init(union acpi_subtable_headers *header, const unsigned long
> end)
> {
> struct acpi_madt_generic_distributor *dist;
> struct fwnode_handle *domain_handle;
> diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
> index 30ab623343d3..fc431857ce90 100644
> --- a/drivers/irqchip/irq-gic.c
> +++ b/drivers/irqchip/irq-gic.c
> @@ -1593,7 +1593,7 @@ static void __init gic_acpi_setup_kvm_info(void)
> gic_set_kvm_info(&gic_v2_kvm_info);
> }
>
> -static int __init gic_v2_acpi_init(struct acpi_subtable_header
> *header,
> +static int __init gic_v2_acpi_init(union acpi_subtable_headers
> *header,
> const unsigned long end)
> {
> struct acpi_madt_generic_distributor *dist;
> diff --git a/include/linux/irqchip.h b/include/linux/irqchip.h
> index 950e4b2458f0..447f22880a69 100644
> --- a/include/linux/irqchip.h
> +++ b/include647b532275bbe/linux/irqchip.h
> @@ -39,8 +39,9 @@
> * @fn: initialization function
> */
> #define IRQCHIP_ACPI_DECLARE(name, subtable, validate, data, fn) \
> - ACPI_DECLARE_PROBE_ENTRY(irqchip, name, ACPI_SIG_MADT, \
> - subtable, validate, data, fn)
> + ACPI_DECLARE_SUBTABLE_PROBE_ENTRY(irqchip, name, \
> + ACPI_SIG_MADT, subtable, \
> + validate, data, fn)
>
> #ifdef CONFIG_IRQCHIP
> void irqchip_init(void);
> --
> 2.20.1

I can't help but notice that you have left the cast in
ACPI_DECLARE_PROBE_ENTRY, which should definitely go. Probably worth a
third patch.

Thanks,

M.

--
Jazz is not dead. It just smells funny...

\
 
 \ /
  Last update: 2020-05-30 11:35    [W:0.040 / U:3.336 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site