On Mon, Aug 17, 2020 at 12:57:58PM +0200, Mark Kettenis wrote: > > > Date: Sun, 16 Aug 2020 19:32:03 +0200 (CEST) > > From: Mark Kettenis <mark.kette...@xs4all.nl> > > > > The diff below adds support for higher speeds as supported by UHS-I SD > > cards to the generic sdmmc(4) layer. The diff in itself does not > > enable the use of those modes. That needs separate changes to the > > SD/MMC controller drivers. I have such a diff for amlmmc(4) that > > allows me to use SDR50 mode. > > > > However, to make sure this diff doesn't break existing lower speed > > modes I'd appreciate tests on a variety of hardware. So if sdmmc(4) > > shows up in your dmesg, please test this by exercising your (u)SD or > > (e)MMC cards. > > > > Thanks, > > > > Mark > > Previous diff didn't build properly on amd64. Here is a new diff.
Tested on the GPD Pocket, no problems seen. OpenBSD 6.7-current (GENERIC.MP) #0: Tue Aug 18 16:08:43 CST 2020 ke...@gpdpocket.kevlo.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP real mem = 8477282304 (8084MB) avail mem = 8213426176 (7832MB) random: good seed from bootblocks mpath0 at root scsibus0 at mpath0: 256 targets mainbus0 at root bios0 at mainbus0: SMBIOS rev. 3.0 @ 0x7b8de000 (51 entries) bios0: vendor American Megatrends Inc. version "5.11" date 08/07/2017 bios0: Default string Default string acpi0 at bios0: ACPI 5.0 acpi0: sleep states S0 S4 S5 acpi0: tables DSDT FACP APIC FPDT FIDT MCFG SSDT SSDT SSDT UEFI SSDT HPET SSDT SSDT SSDT LPIT BCFG PRAM BGRT TPM2 CSRT WDAT SSDT SSDT SSDT acpi0: wakeup devices acpitimer0 at acpi0: 3579545 Hz, 24 bits acpimadt0 at acpi0 addr 0xfee00000: PC-AT compat cpu0 at mainbus0: apid 0 (boot processor) cpu0: Intel(R) Atom(TM) x7-Z8750 CPU @ 1.60GHz, 1600.40 MHz, 06-4c-04 cpu0: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,SSE4.1,SSE4.2,MOVBE,POPCNT,DEADLINE,AES,RDRAND,NXE,RDTSCP,LONG,LAHF,3DNOWP,PERF,ITSC,TSC_ADJUST,SMEP,ERMS,MD_CLEAR,IBRS,IBPB,STIBP,SENSOR,ARAT,MELTDOWN cpu0: 1MB 64b/line 16-way L2 cache cpu0: smt 0, core 0, package 0 mtrr: Pentium Pro MTRR support, 8 var ranges, 88 fixed ranges cpu0: apic clock running at 79MHz cpu0: mwait min=64, max=64, C-substates=0.2.0.0.0.0.3.3, IBE cpu1 at mainbus0: apid 2 (application processor) cpu1: Intel(R) Atom(TM) x7-Z8750 CPU @ 1.60GHz, 1599.94 MHz, 06-4c-04 cpu1: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,SSE4.1,SSE4.2,MOVBE,POPCNT,DEADLINE,AES,RDRAND,NXE,RDTSCP,LONG,LAHF,3DNOWP,PERF,ITSC,TSC_ADJUST,SMEP,ERMS,MD_CLEAR,IBRS,IBPB,STIBP,SENSOR,ARAT,MELTDOWN cpu1: 1MB 64b/line 16-way L2 cache cpu1: smt 0, core 1, package 0 cpu2 at mainbus0: apid 4 (application processor) cpu2: Intel(R) Atom(TM) x7-Z8750 CPU @ 1.60GHz, 1599.96 MHz, 06-4c-04 cpu2: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,SSE4.1,SSE4.2,MOVBE,POPCNT,DEADLINE,AES,RDRAND,NXE,RDTSCP,LONG,LAHF,3DNOWP,PERF,ITSC,TSC_ADJUST,SMEP,ERMS,MD_CLEAR,IBRS,IBPB,STIBP,SENSOR,ARAT,MELTDOWN cpu2: 1MB 64b/line 16-way L2 cache cpu2: smt 0, core 2, package 0 cpu3 at mainbus0: apid 6 (application processor) cpu3: Intel(R) Atom(TM) x7-Z8750 CPU @ 1.60GHz, 1599.95 MHz, 06-4c-04 cpu3: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,SSE4.1,SSE4.2,MOVBE,POPCNT,DEADLINE,AES,RDRAND,NXE,RDTSCP,LONG,LAHF,3DNOWP,PERF,ITSC,TSC_ADJUST,SMEP,ERMS,MD_CLEAR,IBRS,IBPB,STIBP,SENSOR,ARAT,MELTDOWN cpu3: 1MB 64b/line 16-way L2 cache cpu3: smt 0, core 3, package 0 ioapic0 at mainbus0: apid 1 pa 0xfec00000, version 20, 115 pins acpimcfg0 at acpi0 acpimcfg0: addr 0xe0000000, bus 0-255 acpihpet0 at acpi0: 14318179 Hz acpiprt0 at acpi0: bus 0 (PCI0) acpiprt1 at acpi0: bus 1 (RP01) acpiprt2 at acpi0: bus -1 (RP02) acpiprt3 at acpi0: bus -1 (RP03) acpiprt4 at acpi0: bus -1 (RP04) acpicpu0 at acpi0: C3(10@1000 mwait.1@0x64), C2(10@500 mwait.1@0x58), C1(1000@1 mwait.1), PSS acpicpu1 at acpi0: C3(10@1000 mwait.1@0x64), C2(10@500 mwait.1@0x58), C1(1000@1 mwait.1), PSS acpicpu2 at acpi0: C3(10@1000 mwait.1@0x64), C2(10@500 mwait.1@0x58), C1(1000@1 mwait.1), PSS acpicpu3 at acpi0: C3(10@1000 mwait.1@0x64), C2(10@500 mwait.1@0x58), C1(1000@1 mwait.1), PSS acpipwrres0 at acpi0: ID3C, resource for ISP3 acpipwrres1 at acpi0: WWPR, resource for HS03, MDM1 acpipwrres2 at acpi0: WWPR, resource for HS13, MDM1 acpipwrres3 at acpi0: WWPR, resource for SSC1, MDM3 acpipwrres4 at acpi0: WWPR, resource for SSCW, MDM3 acpipwrres5 at acpi0: WWPR, resource for HSC1, MDM2 acpipwrres6 at acpi0: WWPR, resource for HSC3, MDM4 acpipwrres7 at acpi0: CLK3, resource for RTK1, RTKA acpipwrres8 at acpi0: CLK4 acpipwrres9 at acpi0: CLK2, resource for NFC2 acpipwrres10 at acpi0: CLK1 acpipwrres11 at acpi0: CLK0, resource for CA10, CAM9, CAM3 acpipwrres12 at acpi0: CLK1, resource for CAM4 acpipwrres13 at acpi0: USBC, resource for XHC1, OTG1 acpipwrres14 at acpi0: P28X acpipwrres15 at acpi0: P18X acpipwrres16 at acpi0: P12X acpipwrres17 at acpi0: P28P acpipwrres18 at acpi0: P18P acpipwrres19 at acpi0: P19X acpipwrres20 at acpi0: P06X acpipwrres21 at acpi0: P12A acpipwrres22 at acpi0: P28T acpipwrres23 at acpi0: P18D acpipwrres24 at acpi0: P18T acpipwrres25 at acpi0: P3P3 acpipwrres26 at acpi0: P12T acpipwrres27 at acpi0: P28W acpipwrres28 at acpi0: P18W acpipwrres29 at acpi0: P12W acpipwrres30 at acpi0: P33W acpipwrres31 at acpi0: P33X acpipwrres32 at acpi0: P4BW acpitz0 at acpi0: critical temperature is 90 degC "INT33A4" at acpi0 not configured "INT33BD" at acpi0 not configured chvgpio0 at acpi0 GPO1 uid 2 addr 0xfed88000/0x8000 irq 48, 59 pins chvgpio1 at acpi0 GPO3 uid 4 addr 0xfed98000/0x8000 irq 91, 55 pins dwiic0 at acpi0 I2C7 addr 0xa1a26000/0x1000 irq 38 iic0 at dwiic0 "INT34D3" at iic0 addr 0x6e not configured dwiic1 at acpi0 I2C1 addr 0xa1a32000/0x1000 irq 32 iic1 at dwiic1 "INT33FE" at iic0 addr 0x54 not configured chvgpio2 at acpi0 GPO0 uid 1 addr 0xfed80000/0x8000 irq 49, 56 pins chvgpio3 at acpi0 GPO2 uid 3 addr 0xfed90000/0x8000 irq 50, 24 pins acpipci0 at acpi0 PCI0: 0x00000000 0x00000011 0x00000001 extent `acpipci0 pcibus' (0x0 - 0xff), flags=0 extent `acpipci0 pciio' (0x0 - 0xffffffff), flags=0 0x70 - 0x77 0xcf8 - 0xcff 0x10000 - 0xffffffff extent `acpipci0 pcimem' (0x0 - 0xffffffffffffffff), flags=0 0x0 - 0x9ffff 0x100000 - 0x1fffffff 0x20200000 - 0x7cd00000 0x7ed00001 - 0x7fffffff 0xe0000000 - 0xffffffffffffffff sdhc0 at acpi0 SDHA addr 0xa1a3a000/0x1000 irq 45 sdhc0: SDHC 3.0, 200 MHz base clock sdmmc0 at sdhc0: 8-bit, sd high-speed, mmc high-speed, ddr52, dma sdhc1 at acpi0 SDHB addr 0xa1a38000/0x1000 irq 46 sdhc1: SDHC 3.0, 200 MHz base clock sdmmc1 at sdhc1: 4-bit, sd high-speed, mmc high-speed, ddr52, dma sdhc2 at acpi0 SHC1 addr 0xa1a36000/0x1000 irq 47, gpio aml_rwgen: unregistered RegionSpace 0x8f sdhc2: SDHC 3.0, 200 MHz base clock sdmmc2 at sdhc2: 4-bit, sd high-speed, mmc high-speed, ddr52, dma "INTL9C60" at acpi0 not configured "INTL9C60" at acpi0 not configured "8086228A" at acpi0 not configured "BCM2E7E" at acpi0 not configured "8086228A" at acpi0 not configured "8086228E" at acpi0 not configured "8086228E" at acpi0 not configured "8086228E" at acpi0 not configured dwiic2 at acpi0 I2C2 addr 0xa1a30000/0x1000 irq 33 iic2 at dwiic2 "10EC5645" at iic2 addr 0x1a not configured dwiic3 at acpi0 I2C3 addr 0xa1a2e000/0x1000 irq 34 iic3 at dwiic3 dwiic4 at acpi0 I2C4 addr 0xa1a2c000/0x1000 irq 35 iic4 at dwiic4 dwiic5 at acpi0 I2C5 addr 0xa1a2a000/0x1000 irq 36 iic5 at dwiic5 dwiic6 at acpi0 I2C6 addr 0xa1a28000/0x1000 irq 37 iic6 at dwiic6 "GDIX1001" at iic6 addr 0x14 not configured "808622A8" at acpi0 not configured acpihid0 at acpi0: HIDDacpihid0: exec of HEBC failed acpihid0: exec of HEBC failed acpicmos0 at acpi0 acpibtn0 at acpi0: LID0 "FAN02501" at acpi0 not configured acpibtn1 at acpi0: PWRB chvgpio4 at acpi0 GPO4 uid 5 "ACPI0011" at acpi0 not configured "ACPI000C" at acpi0 not configured acpiac0 at acpi0: AC unit online "MSFT0101" at acpi0 not configured "INT3400" at acpi0 not configured "INT3407" at acpi0 not configured "INT3403" at acpi0 not configured "INT3403" at acpi0 not configured "INT3403" at acpi0 not configured "INT3409" at acpi0 not configured "INT3406" at acpi0 not configured "INT3403" at acpi0 not configured "USBC000" at acpi0 not configured acpivideo0 at acpi0: GFX0 acpivout0 at acpivideo0: DD01 acpivout1 at acpivideo0: DD02 acpivout2 at acpivideo0: DD03 acpivout3 at acpivideo0: DD04 acpivout4 at acpivideo0: DD05 acpivout5 at acpivideo0: DD06 acpivout6 at acpivideo0: DD07 acpivout7 at acpivideo0: DD08 cpu0: using VERW MDS workaround cpu0: Enhanced SpeedStep 1600 MHz: speeds: 1601, 1600, 1520, 1440, 1360, 1280, 1200, 1120, 1040, 960, 880, 800, 720, 640, 560, 480 MHz pci0 at mainbus0 bus 0 pchb0 at pci0 dev 0 function 0 "Intel Braswell Host" rev 0x34 inteldrm0 at pci0 dev 2 function 0 "Intel HD Graphics" rev 0x34 drm0 at inteldrm0 inteldrm0: msi, CHERRYVIEW, gen 8 "Intel Braswell Power" rev 0x34 at pci0 dev 11 function 0 not configured xhci0 at pci0 dev 20 function 0 "Intel Braswell xHCI" rev 0x34: msi, xHCI 1.0 usb0 at xhci0: USB revision 3.0 uhub0 at usb0 configuration 1 interface 0 "Intel xHCI root hub" rev 3.00/1.00 addr 1 "Intel Braswell TXE" rev 0x34 at pci0 dev 26 function 0 not configured ppb0 at pci0 dev 28 function 0 "Intel Braswell PCIE" rev 0x34: msi pci1 at ppb0 bus 1 bwfm0 at pci1 dev 0 function 0 "Broadcom BCM4356" rev 0x02: msi pcib0 at pci0 dev 31 function 0 "Intel Braswell PCU LPC" rev 0x34 isa0 at pcib0 isadma0 at isa0 com0 at isa0 port 0x3f8/8 irq 4: ns16550a, 16 byte fifo pcppi0 at isa0 port 0x61 spkr0 at pcppi0 vmm0 at mainbus0: VMX/EPT (using slow L1TF mitigation) efifb at mainbus0 not configured sdmmc1: can't enable card scsibus1 at sdmmc0: 2 targets, initiator 0 sd0 at scsibus1 targ 1 lun 0: <Samsung, DJNB4R, 0000> removable sd0: 119276MB, 512 bytes/sector, 244277248 sectors uhidev0 at uhub0 port 2 configuration 1 interface 0 "SINO WEALTH Gaming Keyboard" rev 1.10/1.00 addr 2 uhidev0: iclass 3/1 ukbd0 at uhidev0: 8 variable keys, 6 key codes wskbd0 at ukbd0: console keyboard uhidev1 at uhub0 port 2 configuration 1 interface 1 "SINO WEALTH Gaming Keyboard" rev 1.10/1.00 addr 2 uhidev1: iclass 3/0, 39 report ids uhid0 at uhidev1 reportid 5: input=0, output=0, feature=5 ums0 at uhidev1 reportid 35: 3 buttons, Z dir wsmouse0 at ums0 mux 0 uhid1 at uhidev1 reportid 37: input=1, output=0, feature=0 uhid2 at uhidev1 reportid 38: input=6, output=0, feature=0 uhid3 at uhidev1 reportid 39: input=1, output=0, feature=0 ugen0 at uhub0 port 3 "Broadcom Corp BCM2045A0" rev 2.00/1.12 addr 3 vscsi0 at root scsibus2 at vscsi0: 256 targets softraid0 at root scsibus3 at softraid0: 256 targets root on sd0a (48e43045c42d5205.a) swap on sd0b dump on sd0b intel_dsi_vbt_gpio_init: stub drm:pid0:pwm_setup_backlight *ERROR* [drm] *ERROR* Failed to get the SoC PWM chip inteldrm0: 1200x1920, 32bpp wsdisplay0 at inteldrm0 mux 1: console (std, vt100 emulation), using wskbd0 wsdisplay0: screen 1-5 added (std, vt100 emulation) bwfm0: address b0:f1:ec:ed:e5:2c