Page MenuHomeFreeBSD
Files F148216344

D10967.diff
No OneTemporary
Actions

D10967.diff
View Options

Index: head/sys/dev/bhnd/cores/chipc/chipcreg.h
===================================================================
--- head/sys/dev/bhnd/cores/chipc/chipcreg.h
+++ head/sys/dev/bhnd/cores/chipc/chipcreg.h
@@ -280,7 +280,7 @@
#define CHIPC_PLL_TYPE1 0x2 /* 48MHz base, 3 dividers */
#define CHIPC_PLL_TYPE2 0x4 /* 48MHz, 4 dividers */
#define CHIPC_PLL_TYPE3 0x6 /* 25MHz, 2 dividers */
-#define CHIPC_PLL_TYPE4 0x8 /* 48MHz, 4 dividers */
+#define CHIPC_PLL_TYPE4 0x1 /* 48MHz, 4 dividers */
#define CHIPC_PLL_TYPE5 0x3 /* 25MHz, 4 dividers */
#define CHIPC_PLL_TYPE6 0x5 /* 100/200 or 120/240 only */
#define CHIPC_PLL_TYPE7 0x7 /* 25MHz, 4 dividers */
Index: head/sys/dev/bhnd/cores/chipc/pwrctl/bhnd_pwrctl_subr.c
===================================================================
--- head/sys/dev/bhnd/cores/chipc/pwrctl/bhnd_pwrctl_subr.c
+++ head/sys/dev/bhnd/cores/chipc/pwrctl/bhnd_pwrctl_subr.c
@@ -374,7 +374,7 @@
} else if (PWRCTL_QUIRK(sc, SLOWCLK_CTL)) {
div = bhnd_bus_read_4(sc->res, CHIPC_PLL_SLOWCLK_CTL);
div = CHIPC_GET_BITS(div, CHIPC_SCC_CD);
- div *= 4;
+ div = 4 * (div + 1);
} else if (PWRCTL_QUIRK(sc, INSTACLK_CTL)) {
if (max_freq) {
div = 1;
@@ -503,7 +503,10 @@
if (bhnd_get_hwrev(sc->chipc_dev) == 10)
return (ENODEV);
- scc = bhnd_bus_read_4(sc->res, CHIPC_PLL_SLOWCLK_CTL);
+ if (PWRCTL_QUIRK(sc, SLOWCLK_CTL))
+ scc = bhnd_bus_read_4(sc->res, CHIPC_PLL_SLOWCLK_CTL);
+ else
+ scc = bhnd_bus_read_4(sc->res, CHIPC_SYS_CLK_CTL);
switch (clock) {
case BHND_CLOCK_HT:
@@ -520,7 +523,10 @@
return (ENODEV);
}
- bhnd_bus_write_4(sc->res, CHIPC_PLL_SLOWCLK_CTL, scc);
+ if (PWRCTL_QUIRK(sc, SLOWCLK_CTL))
+ bhnd_bus_write_4(sc->res, CHIPC_PLL_SLOWCLK_CTL, scc);
+ else
+ bhnd_bus_write_4(sc->res, CHIPC_SYS_CLK_CTL, scc);
DELAY(CHIPC_PLL_DELAY);
break;
Index: head/sys/mips/broadcom/bcm_pmu.c
===================================================================
--- head/sys/mips/broadcom/bcm_pmu.c
+++ head/sys/mips/broadcom/bcm_pmu.c
@@ -208,7 +208,7 @@
uint64_t
bcm_get_alpfreq(struct bcm_platform *bp) {
if (!bcm_has_pmu(bp))
- panic("%s requires PMU\n", __FUNCTION__);
+ return (BHND_PMU_ALP_CLOCK);
return (bhnd_pmu_alp_clock(bcm_get_pmu(bp)));
}
@@ -217,7 +217,7 @@
uint64_t
bcm_get_ilpfreq(struct bcm_platform *bp) {
if (!bcm_has_pmu(bp))
- panic("%s requires PMU\n", __FUNCTION__);
+ return (BHND_PMU_ILP_CLOCK);
return (bhnd_pmu_ilp_clock(bcm_get_pmu(bp)));
}

File Metadata

Mime Type
text/plain
Expires
Tue, Mar 17, 2:06 PM (14 h, 22 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29828410
Default Alt Text
D10967.diff (2 KB)

Event Timeline