Attachment 155333 Details for Bug 197143 – Do not access peripheral before clock stabilization

[patch] Do not access peripheral before clock stabilization

patch-wpi72.diff (text/plain), 1000 bytes, created by Andriy Voskoboinyk on 2015-04-08 06:43:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andriy Voskoboinyk

Created: 2015-04-08 06:43:15 UTC

Size: 1000 bytes

patch

obsolete

>Index: sys/dev/wpi/if_wpi.c
>===================================================================
>--- sys/dev/wpi/if_wpi.c	(revision 280264)
>+++ sys/dev/wpi/if_wpi.c	(working copy)
>@@ -4905,10 +4905,6 @@
> 	/* Set FH wait threshold to max (HW bug under stress workaround). */
> 	WPI_SETBITS(sc, WPI_DBG_HPET_MEM, 0xffff0000);
> 
>-	/* Cleanup. */
>-	wpi_prph_write(sc, WPI_APMG_CLK_DIS, 0x00000400);
>-	wpi_prph_clrbits(sc, WPI_APMG_PS, 0x00000E00);
>-
> 	/* Retrieve PCIe Active State Power Management (ASPM). */
> 	reg = pci_read_config(sc->sc_dev, sc->sc_cap_off + 0x10, 1);
> 	/* Workaround for HW instability in PCIe L0->L0s->L1 transition. */
>@@ -4925,6 +4921,10 @@
> 
> 	if ((error = wpi_nic_lock(sc)) != 0)
> 		return error;
>+	/* Cleanup. */
>+	wpi_prph_write(sc, WPI_APMG_CLK_DIS, 0x00000400);
>+	wpi_prph_clrbits(sc, WPI_APMG_PS, 0x00000200);
>+
> 	/* Enable DMA and BSM (Bootstrap State Machine). */
> 	wpi_prph_write(sc, WPI_APMG_CLK_EN,
> 	    WPI_APMG_CLK_CTRL_DMA_CLK_RQT | WPI_APMG_CLK_CTRL_BSM_CLK_RQT);

Actions: View | Diff

Attachments on bug 197143: 152282 | 152662 | 152977 | 153911 | 153977 | 153983 | 153985 | 153999 | 154000 | 154002 | 154006 | 154007 | 154009 | 154010 | 154011 | 154013 | 154015 | 154016 | 154017 | 154019 | 154020 | 154021 | 154022 | 154024 | 154026 | 154030 | 154032 | 154033 | 154328 | 154329 | 154330 | 154332 | 154334 | 154335 | 154336 | 154337 | 154338 | 154340 | 154341 | 154343 | 154346 | 154347 | 154348 | 154349 | 154350 | 154351 | 154352 | 154353 | 154354 | 154355 | 154356 | 154357 | 154358 | 154359 | 154360 | 154361 | 154362 | 154363 | 154364 | 154365 | 154366 | 154368 | 154369 | 154370 | 154371 | 154372 | 154373 | 154374 | 154375 | 154378 | 154379 | 154380 | 154381 | 154382 | 154383 | 154384 | 155332 | 155333 | 156164 | 156165 | 156166 | 156167 | 156168 | 156169 | 156170 | 156171 | 156172 | 156173 | 156174 | 156175 | 156176 | 156177 | 156178 | 156179 | 156180 | 156181 | 156182 | 156183 | 156184 | 156185 | 156186 | 156187 | 156188 | 156189 | 156190 | 156191 | 156192 | 156193 | 156194 | 156195