On Wed, Nov 27, 2013 at 12:12 PM, Grant Likely
<grant.lik...@secretlab.ca> wrote:
> On Mon, 25 Nov 2013 13:07:23 +0100, Ard Biesheuvel
> <ard.biesheu...@linaro.org> wrote:
>> Hello all,
>>
>> Resending this patch to a slightly wider audience.
>>
>> The point of this patch is reworking the dmi_scan code slightly so it
>> can be reused on ARM and arm64.
>> There are no functional changes for x86 or IA-64, just one open
>> question, i.e., whether the non-EFI fallback probe should be performed
>> on IA-64 in the first place.
>>
>> If I could get acks for this patch please (if there are no
>> objections), I will propose it to be merged through the ARM and/or
>> arm64 trees as part of the complete series to enable SMBIOS.
>>
>> On 21 November 2013 12:40, Ard Biesheuvel <ard.biesheu...@linaro.org> wrote:
>> > This patch makes a couple of changes to the SMBIOS/DMI scanning
>> > code so it can be used on other archs (such as ARM and arm64):
>> > (a) wrap the calls to ioremap()/iounmap(), this allows the use of a
>> > flavor of ioremap() more suitable for random unaligned access;
>> > (b) allow the non-EFI fallback probe into hardcoded physical address
>> > 0xF0000 to be disabled.
>> >
>> > Signed-off-by: Ard Biesheuvel <ard.biesheu...@linaro.org>
>
> Looks good.
>
> Reviewed-by: Grant Likely <grant.lik...@linaro.org>
Actually, I have one thought here...\
>> > } else {
>> > - p = dmi_ioremap(0xF0000, 0x10000);
>> > +#ifdef DMI_SCAN_MACHINE_NON_EFI_FALLBACK
>> > + p = dmi_early_remap(0xF0000, 0x10000);
>> > if (p == NULL)
>> > goto error;
>> >
This is just ugly. #ifdef blocks inside of code is strongly
discouraged. Instead, you can change the } else { line to:
} else if IS_ENABLED(CONFIG_DMI_NON_EFI_FALLBACK) {
and then add an empty stanza to drivers/firmware/Kconfig:
config DMI_NON_EFI_FALLBACK
bool
And finally, make x86 and ia64 select it in arch/{ia64,x86}/Kconfig:
config DMI
bool
select DMI_NON_EFI_FALLBACK
default y
Which eliminates the DMI_SCAN_MACHINE_NON_EFI_FALLBACK #define from
the header files.
>> > @@ -510,12 +511,13 @@ void __init dmi_scan_machine(void)
>> > memcpy_fromio(buf + 16, q, 16);
>> > if (!dmi_present(buf)) {
>> > dmi_available = 1;
>> > - dmi_iounmap(p, 0x10000);
>> > + dmi_early_unmap(p, 0x10000);
>> > goto out;
>> > }
>> > memcpy(buf, buf + 16, 16);
>> > }
>> > - dmi_iounmap(p, 0x10000);
>> > + dmi_early_unmap(p, 0x10000);
>> > +#endif
>> > }
>> > error:
>> > pr_info("DMI not present or invalid.\n");
>> > @@ -787,13 +789,13 @@ int dmi_walk(void (*decode)(const struct dmi_header
>> > *, void *),
>> > if (!dmi_available)
>> > return -1;
>> >
>> > - buf = ioremap(dmi_base, dmi_len);
>> > + buf = dmi_remap(dmi_base, dmi_len);
>> > if (buf == NULL)
>> > return -1;
>> >
>> > dmi_table(buf, dmi_len, dmi_num, decode, private_data);
>> >
>> > - iounmap(buf);
>> > + dmi_unmap(buf);
>> > return 0;
>> > }
>> > EXPORT_SYMBOL_GPL(dmi_walk);
>> > --
>> > 1.8.3.2
>> >
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
>> the body of a message to majord...@vger.kernel.org
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>> Please read the FAQ at http://www.tux.org/lkml/
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
