sync with OpenBSD -current
This commit is contained in:
parent
b9b2353a61
commit
a48b7fc94f
GPG Key ID:
F42C07F07E2E35B7
@ -1,153 +0,0 @@
|
|||||||
#!/usr/bin/env perl
|
|
||||||
|
|
||||||
$0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1;
|
|
||||||
push(@INC, "${dir}perlasm", "perlasm");
|
|
||||||
require "x86asm.pl";
|
|
||||||
|
|
||||||
&asm_init($ARGV[0],"x86cpuid");
|
|
||||||
|
|
||||||
for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); }
|
|
||||||
|
|
||||||
&function_begin("OPENSSL_ia32_cpuid");
|
|
||||||
&xor ("edx","edx");
|
|
||||||
&pushf ();
|
|
||||||
&pop ("eax");
|
|
||||||
&mov ("ecx","eax");
|
|
||||||
&xor ("eax",1<<21);
|
|
||||||
&push ("eax");
|
|
||||||
&popf ();
|
|
||||||
&pushf ();
|
|
||||||
&pop ("eax");
|
|
||||||
&xor ("ecx","eax");
|
|
||||||
&xor ("eax","eax");
|
|
||||||
&bt ("ecx",21);
|
|
||||||
&jnc (&label("nocpuid"));
|
|
||||||
&cpuid ();
|
|
||||||
&mov ("edi","eax"); # max value for standard query level
|
|
||||||
|
|
||||||
&xor ("eax","eax");
|
|
||||||
&cmp ("ebx",0x756e6547); # "Genu"
|
|
||||||
&setne (&LB("eax"));
|
|
||||||
&mov ("ebp","eax");
|
|
||||||
&cmp ("edx",0x49656e69); # "ineI"
|
|
||||||
&setne (&LB("eax"));
|
|
||||||
&or ("ebp","eax");
|
|
||||||
&cmp ("ecx",0x6c65746e); # "ntel"
|
|
||||||
&setne (&LB("eax"));
|
|
||||||
&or ("ebp","eax"); # 0 indicates Intel CPU
|
|
||||||
&jz (&label("intel"));
|
|
||||||
|
|
||||||
&cmp ("ebx",0x68747541); # "Auth"
|
|
||||||
&setne (&LB("eax"));
|
|
||||||
&mov ("esi","eax");
|
|
||||||
&cmp ("edx",0x69746E65); # "enti"
|
|
||||||
&setne (&LB("eax"));
|
|
||||||
&or ("esi","eax");
|
|
||||||
&cmp ("ecx",0x444D4163); # "cAMD"
|
|
||||||
&setne (&LB("eax"));
|
|
||||||
&or ("esi","eax"); # 0 indicates AMD CPU
|
|
||||||
&jnz (&label("intel"));
|
|
||||||
|
|
||||||
# AMD specific
|
|
||||||
&mov ("eax",0x80000000);
|
|
||||||
&cpuid ();
|
|
||||||
&cmp ("eax",0x80000001);
|
|
||||||
&jb (&label("intel"));
|
|
||||||
&mov ("esi","eax");
|
|
||||||
&mov ("eax",0x80000001);
|
|
||||||
&cpuid ();
|
|
||||||
&and ("ecx","\$IA32CAP_MASK1_AMD_XOP"); # isolate AMD XOP bit
|
|
||||||
&or ("ecx",1); # make sure ecx is not zero
|
|
||||||
&mov ("ebp","ecx");
|
|
||||||
|
|
||||||
&cmp ("esi",0x80000008);
|
|
||||||
&jb (&label("intel"));
|
|
||||||
|
|
||||||
&mov ("eax",0x80000008);
|
|
||||||
&cpuid ();
|
|
||||||
&movz ("esi",&LB("ecx")); # number of cores - 1
|
|
||||||
&inc ("esi"); # number of cores
|
|
||||||
|
|
||||||
&mov ("eax",1);
|
|
||||||
&xor ("ecx","ecx");
|
|
||||||
&cpuid ();
|
|
||||||
&bt ("edx","\$IA32CAP_BIT0_HT");
|
|
||||||
&jnc (&label("generic"));
|
|
||||||
&shr ("ebx",16);
|
|
||||||
&and ("ebx",0xff);
|
|
||||||
&cmp ("ebx","esi");
|
|
||||||
&ja (&label("generic"));
|
|
||||||
&xor ("edx","\$IA32CAP_MASK0_HT"); # clear hyper-threading bit
|
|
||||||
&jmp (&label("generic"));
|
|
||||||
|
|
||||||
&set_label("intel");
|
|
||||||
&cmp ("edi",4);
|
|
||||||
&mov ("edi",-1);
|
|
||||||
&jb (&label("nocacheinfo"));
|
|
||||||
|
|
||||||
&mov ("eax",4);
|
|
||||||
&mov ("ecx",0); # query L1D
|
|
||||||
&cpuid ();
|
|
||||||
&mov ("edi","eax");
|
|
||||||
&shr ("edi",14);
|
|
||||||
&and ("edi",0xfff); # number of cores -1 per L1D
|
|
||||||
|
|
||||||
&set_label("nocacheinfo");
|
|
||||||
&mov ("eax",1);
|
|
||||||
&xor ("ecx","ecx");
|
|
||||||
&cpuid ();
|
|
||||||
# force reserved bits to 0.
|
|
||||||
&and ("edx","\$~(IA32CAP_MASK0_INTELP4 | IA32CAP_MASK0_INTEL)");
|
|
||||||
&cmp ("ebp",0);
|
|
||||||
&jne (&label("notintel"));
|
|
||||||
# set reserved bit#30 on Intel CPUs
|
|
||||||
&or ("edx","\$IA32CAP_MASK0_INTEL");
|
|
||||||
&and (&HB("eax"),15); # family ID
|
|
||||||
&cmp (&HB("eax"),15); # P4?
|
|
||||||
&jne (&label("notintel"));
|
|
||||||
# set reserved bit#20 to engage RC4_CHAR
|
|
||||||
&or ("edx","\$IA32CAP_MASK0_INTELP4");
|
|
||||||
&set_label("notintel");
|
|
||||||
&bt ("edx","\$IA32CAP_BIT0_HT"); # test hyper-threading bit
|
|
||||||
&jnc (&label("generic"));
|
|
||||||
&xor ("edx","\$IA32CAP_MASK0_HT");
|
|
||||||
&cmp ("edi",0);
|
|
||||||
&je (&label("generic"));
|
|
||||||
|
|
||||||
&or ("edx","\$IA32CAP_MASK0_HT");
|
|
||||||
&shr ("ebx",16);
|
|
||||||
&cmp (&LB("ebx"),1); # see if cache is shared
|
|
||||||
&ja (&label("generic"));
|
|
||||||
&xor ("edx","\$IA32CAP_MASK0_HT"); # clear hyper-threading bit if not
|
|
||||||
|
|
||||||
&set_label("generic");
|
|
||||||
&and ("ebp","\$IA32CAP_MASK1_AMD_XOP"); # isolate AMD XOP flag
|
|
||||||
# force reserved bits to 0.
|
|
||||||
&and ("ecx","\$~IA32CAP_MASK1_AMD_XOP");
|
|
||||||
&mov ("esi","edx");
|
|
||||||
&or ("ebp","ecx"); # merge AMD XOP flag
|
|
||||||
|
|
||||||
&bt ("ecx","\$IA32CAP_BIT1_OSXSAVE"); # check OSXSAVE bit
|
|
||||||
&jnc (&label("clear_avx"));
|
|
||||||
&xor ("ecx","ecx");
|
|
||||||
&data_byte(0x0f,0x01,0xd0); # xgetbv
|
|
||||||
&and ("eax",6);
|
|
||||||
&cmp ("eax",6);
|
|
||||||
&je (&label("done"));
|
|
||||||
&cmp ("eax",2);
|
|
||||||
&je (&label("clear_avx"));
|
|
||||||
&set_label("clear_xmm");
|
|
||||||
# clear AESNI and PCLMULQDQ bits.
|
|
||||||
&and ("ebp","\$~(IA32CAP_MASK1_AESNI | IA32CAP_MASK1_PCLMUL)");
|
|
||||||
# clear FXSR.
|
|
||||||
&and ("esi","\$~IA32CAP_MASK0_FXSR");
|
|
||||||
&set_label("clear_avx");
|
|
||||||
# clear AVX, FMA3 and AMD XOP bits.
|
|
||||||
&and ("ebp","\$~(IA32CAP_MASK1_AVX | IA32CAP_MASK1_FMA3 | IA32CAP_MASK1_AMD_XOP)");
|
|
||||||
&set_label("done");
|
|
||||||
&mov ("eax","esi");
|
|
||||||
&mov ("edx","ebp");
|
|
||||||
&set_label("nocpuid");
|
|
||||||
&function_end("OPENSSL_ia32_cpuid");
|
|
||||||
|
|
||||||
&asm_finish();
|
|
||||||
@ -1,4 +1,4 @@
|
|||||||
/* $OpenBSD: sdhc_pci.c,v 1.26 2024/03/29 02:36:49 jsg Exp $ */
|
/* $OpenBSD: sdhc_pci.c,v 1.27 2024/10/19 21:10:22 hastings Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
|
* Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
|
||||||
@ -126,16 +126,6 @@ sdhc_pci_attach(struct device *parent, struct device *self, void *aux)
|
|||||||
PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_ENE_SDCARD)
|
PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_ENE_SDCARD)
|
||||||
sc->sc.sc_flags |= SDHC_F_NOPWR0;
|
sc->sc.sc_flags |= SDHC_F_NOPWR0;
|
||||||
|
|
||||||
/* Some Intel controllers break if set to 0V bus power. */
|
|
||||||
if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_INTEL &&
|
|
||||||
(PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_INTEL_100SERIES_LP_EMMC ||
|
|
||||||
PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_INTEL_APOLLOLAKE_EMMC ||
|
|
||||||
PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_INTEL_GLK_EMMC ||
|
|
||||||
PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_INTEL_JSL_EMMC ||
|
|
||||||
PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_INTEL_EHL_EMMC ||
|
|
||||||
PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_INTEL_ADL_N_EMMC))
|
|
||||||
sc->sc.sc_flags |= SDHC_F_NOPWR0;
|
|
||||||
|
|
||||||
/* Some RICOH controllers need to be bumped into the right mode. */
|
/* Some RICOH controllers need to be bumped into the right mode. */
|
||||||
if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_RICOH &&
|
if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_RICOH &&
|
||||||
(PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_RICOH_R5U822 ||
|
(PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_RICOH_R5U822 ||
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
/* $OpenBSD: sdhc.c,v 1.77 2024/08/06 15:03:36 patrick Exp $ */
|
/* $OpenBSD: sdhc.c,v 1.78 2024/10/19 21:10:03 hastings Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
|
* Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
|
||||||
@ -591,14 +591,9 @@ sdhc_bus_power(sdmmc_chipset_handle_t sch, u_int32_t ocr)
|
|||||||
|
|
||||||
s = splsdmmc();
|
s = splsdmmc();
|
||||||
|
|
||||||
/*
|
|
||||||
* Disable bus power before voltage change.
|
|
||||||
*/
|
|
||||||
if (!(hp->sc->sc_flags & SDHC_F_NOPWR0))
|
|
||||||
HWRITE1(hp, SDHC_POWER_CTL, 0);
|
|
||||||
|
|
||||||
/* If power is disabled, reset the host and return now. */
|
/* If power is disabled, reset the host and return now. */
|
||||||
if (ocr == 0) {
|
if (ocr == 0) {
|
||||||
|
HWRITE1(hp, SDHC_POWER_CTL, 0);
|
||||||
splx(s);
|
splx(s);
|
||||||
(void)sdhc_host_reset(hp);
|
(void)sdhc_host_reset(hp);
|
||||||
return 0;
|
return 0;
|
||||||
@ -620,6 +615,21 @@ sdhc_bus_power(sdmmc_chipset_handle_t sch, u_int32_t ocr)
|
|||||||
return EINVAL;
|
return EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Return if no change to powered bus voltage.
|
||||||
|
*/
|
||||||
|
if (HREAD1(hp, SDHC_POWER_CTL) ==
|
||||||
|
((vdd << SDHC_VOLTAGE_SHIFT) | SDHC_BUS_POWER)) {
|
||||||
|
splx(s);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Disable bus power before voltage change.
|
||||||
|
*/
|
||||||
|
if (!(hp->sc->sc_flags & SDHC_F_NOPWR0))
|
||||||
|
HWRITE1(hp, SDHC_POWER_CTL, 0);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Enable bus power. Wait at least 1 ms (or 74 clocks) plus
|
* Enable bus power. Wait at least 1 ms (or 74 clocks) plus
|
||||||
* voltage ramp until power rises.
|
* voltage ramp until power rises.
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user