On Sat, Nov 10, 2018 at 03:45:41PM +0000, Ben Pye wrote:
> On Sat, Nov 10, 2018 at 06:30:37AM +0000, Ben Pye wrote:
> > On Wed, Nov 07, 2018 at 05:33:13PM +0100, Mark Kettenis wrote:
> > > > From: Ben Pye <[email protected]>
> > > > Content-Type: text/plain; charset="utf-8"
> > > >
> > > > I have been attempting to run OpenBSD on my HP Chromebook 13, it's a
> > > > Skylake device with eMMC storage. Previously sdhc attempted to set the
> > > > same bus voltage multiple times, and after the first, successful,
> > > > attempt it would break resulting in all later commands timing out. This
> > > > patch changes sdhc such that it only sets the voltage if the request is
> > > > for a different level, this is the behaviour FreeBSD has.
> > >
> > > That makes sense. We'll need to test this on more hardware. And
> > > maybe we need to reset hp->vdd in some places (suspend/resume, resets).
> >
> > As you suspected suspend/resume isn't working with this current patch. At
> > least for my hardware I need to restore the bus_power setting on resume
> > in addition to the other registers. This seems to get the eMMC device
> > back up.
>
> I have included the new patch to get the device attached after suspend
> below. I believe if you are not using softraid over this device then
> this should be sufficient to get working suspend/resume. Unfortunately
> softraid does not handle the detach and reattach of sd0, though I am now
> convinced that it's really a seperate issue.
>
Thanks for this, Ben. I am running this on my chromebook 13. I've added
the device ids for the mmc to pcidevs as well.
OK?
Index: sys/dev/pci/pcidevs
===================================================================
RCS file: /cvs/src/sys/dev/pci/pcidevs,v
retrieving revision 1.1866
diff -u -p -u -r1.1866 pcidevs
--- sys/dev/pci/pcidevs 8 Nov 2018 06:54:13 -0000 1.1866
+++ sys/dev/pci/pcidevs 10 Nov 2018 17:10:16 -0000
@@ -5108,6 +5108,7 @@ product INTEL 100SERIES_LP_PCIE_12 0x9d1
product INTEL 100SERIES_LP_PMC 0x9d21 100 Series PMC
product INTEL 100SERIES_LP_SMB 0x9d23 100 Series SMBus
product INTEL 100SERIES_LP_SPI 0x9d24 100 Series SPI
+product INTEL 100SERIES_LP_EMMC 0x9d2b 100 Series eMMC
product INTEL 100SERIES_LP_UART_1 0x9d27 100 Series UART
product INTEL 100SERIES_LP_UART_2 0x9d28 100 Series UART
product INTEL 100SERIES_LP_XHCI 0x9d2f 100 Series xHCI
Index: sys/dev/pci/pcidevs.h
===================================================================
RCS file: /cvs/src/sys/dev/pci/pcidevs.h,v
retrieving revision 1.1859
diff -u -p -u -r1.1859 pcidevs.h
--- sys/dev/pci/pcidevs.h 8 Nov 2018 06:55:06 -0000 1.1859
+++ sys/dev/pci/pcidevs.h 10 Nov 2018 17:10:18 -0000
@@ -5113,6 +5113,7 @@
#define PCI_PRODUCT_INTEL_100SERIES_LP_PMC 0x9d21 /* 100
Series PMC */
#define PCI_PRODUCT_INTEL_100SERIES_LP_SMB 0x9d23 /* 100
Series SMBus */
#define PCI_PRODUCT_INTEL_100SERIES_LP_SPI 0x9d24 /* 100
Series SPI */
+#define PCI_PRODUCT_INTEL_100SERIES_LP_EMMC 0x9d2b /* 100
Series eMMC */
#define PCI_PRODUCT_INTEL_100SERIES_LP_UART_1 0x9d27 /* 100
Series UART */
#define PCI_PRODUCT_INTEL_100SERIES_LP_UART_2 0x9d28 /* 100
Series UART */
#define PCI_PRODUCT_INTEL_100SERIES_LP_XHCI 0x9d2f /* 100
Series xHCI */
Index: sys/dev/pci/pcidevs_data.h
===================================================================
RCS file: /cvs/src/sys/dev/pci/pcidevs_data.h,v
retrieving revision 1.1854
diff -u -p -u -r1.1854 pcidevs_data.h
--- sys/dev/pci/pcidevs_data.h 8 Nov 2018 06:55:06 -0000 1.1854
+++ sys/dev/pci/pcidevs_data.h 10 Nov 2018 17:10:19 -0000
@@ -17936,6 +17936,10 @@ static const struct pci_known_product pc
"100 Series SPI",
},
{
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_100SERIES_LP_EMMC,
+ "100 Series eMMC",
+ },
+ {
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_100SERIES_LP_UART_1,
"100 Series UART",
},
Index: sys/dev/sdmmc/sdhc.c
===================================================================
RCS file: /cvs/src/sys/dev/sdmmc/sdhc.c,v
retrieving revision 1.61
diff -u -p -u -r1.61 sdhc.c
--- sys/dev/sdmmc/sdhc.c 6 Sep 2018 10:15:17 -0000 1.61
+++ sys/dev/sdmmc/sdhc.c 10 Nov 2018 17:10:19 -0000
@@ -53,6 +53,8 @@ struct sdhc_host {
u_int8_t regs[14]; /* host controller state */
u_int16_t intr_status; /* soft interrupt status */
u_int16_t intr_error_status; /* soft error status */
+ u_int8_t vdd; /* current vdd */
+ u_int8_t save_vdd; /* vdd before suspend */
bus_dmamap_t adma_map;
bus_dma_segment_t adma_segs[1];
@@ -364,6 +366,7 @@ sdhc_activate(struct device *self, int a
/* Save the host controller state. */
for (n = 0; n < sc->sc_nhosts; n++) {
hp = sc->sc_host[n];
+ hp->save_vdd = hp->vdd;
for (i = 0; i < sizeof hp->regs; i++)
hp->regs[i] = HREAD1(hp, i);
}
@@ -373,6 +376,7 @@ sdhc_activate(struct device *self, int a
for (n = 0; n < sc->sc_nhosts; n++) {
hp = sc->sc_host[n];
(void)sdhc_host_reset(hp);
+ sdhc_bus_power(hp, hp->save_vdd);
for (i = 0; i < sizeof hp->regs; i++)
HWRITE1(hp, i, hp->regs[i]);
}
@@ -420,6 +424,8 @@ sdhc_host_reset(sdmmc_chipset_handle_t s
s = splsdmmc();
+ hp->vdd = 0;
+
/* Disable all interrupts. */
HWRITE2(hp, SDHC_NINTR_SIGNAL_EN, 0);
@@ -489,6 +495,14 @@ sdhc_bus_power(sdmmc_chipset_handle_t sc
struct sdhc_host *hp = sch;
u_int8_t vdd;
int s;
+
+ /*
+ * If the requested vdd is the same as current vdd return.
+ */
+ if (hp->vdd == ocr)
+ return 0;
+
+ hp->vdd = ocr;
s = splsdmmc();
