PERFORCE change 1199828 for review
John Baldwin
jhb at FreeBSD.org
Mon Sep 8 04:54:07 UTC 2014
http://p4web.freebsd.org/@@1199828?ac=10
Change 1199828 by jhb at jhb_ralph on 2014/09/04 18:25:40
IFC @1199824
Affected files ...
.. //depot/projects/smpng/sys/amd64/amd64/identcpu.c#56 delete
.. //depot/projects/smpng/sys/amd64/amd64/machdep.c#131 integrate
.. //depot/projects/smpng/sys/amd64/amd64/pmap.c#140 integrate
.. //depot/projects/smpng/sys/amd64/include/md_var.h#32 integrate
.. //depot/projects/smpng/sys/arm/altera/socfpga/files.socfpga#1 branch
.. //depot/projects/smpng/sys/arm/altera/socfpga/socfpga_common.c#1 branch
.. //depot/projects/smpng/sys/arm/altera/socfpga/socfpga_machdep.c#1 branch
.. //depot/projects/smpng/sys/arm/altera/socfpga/std.socfpga#1 branch
.. //depot/projects/smpng/sys/arm/arm/nexus.c#25 integrate
.. //depot/projects/smpng/sys/arm/at91/at91_pinctrl.c#2 integrate
.. //depot/projects/smpng/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c#6 integrate
.. //depot/projects/smpng/sys/arm/conf/DB-78XXX#18 integrate
.. //depot/projects/smpng/sys/arm/conf/DB-88F5XXX#17 integrate
.. //depot/projects/smpng/sys/arm/conf/DB-88F6XXX#19 integrate
.. //depot/projects/smpng/sys/arm/conf/DIGI-CCWMX53#7 integrate
.. //depot/projects/smpng/sys/arm/conf/DOCKSTAR#10 integrate
.. //depot/projects/smpng/sys/arm/conf/DREAMPLUG-1001#4 integrate
.. //depot/projects/smpng/sys/arm/conf/EA3250#8 integrate
.. //depot/projects/smpng/sys/arm/conf/EFIKA_MX#7 integrate
.. //depot/projects/smpng/sys/arm/conf/IMX53-QSB#6 integrate
.. //depot/projects/smpng/sys/arm/conf/IMX6#4 integrate
.. //depot/projects/smpng/sys/arm/conf/SOCKIT#1 branch
.. //depot/projects/smpng/sys/arm/conf/ZEDBOARD#8 integrate
.. //depot/projects/smpng/sys/arm/freescale/fsl_ocotp.c#2 integrate
.. //depot/projects/smpng/sys/arm/freescale/imx/files.imx51#6 integrate
.. //depot/projects/smpng/sys/arm/freescale/imx/files.imx53#7 integrate
.. //depot/projects/smpng/sys/arm/freescale/imx/files.imx6#6 integrate
.. //depot/projects/smpng/sys/arm/freescale/imx/imx51_ccm.c#8 integrate
.. //depot/projects/smpng/sys/arm/freescale/imx/imx51_iomux.c#5 integrate
.. //depot/projects/smpng/sys/arm/freescale/imx/imx51_iomuxvar.h#3 delete
.. //depot/projects/smpng/sys/arm/freescale/imx/imx6_anatop.c#6 integrate
.. //depot/projects/smpng/sys/arm/freescale/imx/imx6_ccm.c#4 integrate
.. //depot/projects/smpng/sys/arm/freescale/imx/imx6_iomux.c#1 branch
.. //depot/projects/smpng/sys/arm/freescale/imx/imx6_iomuxreg.h#1 branch
.. //depot/projects/smpng/sys/arm/freescale/imx/imx_ccmvar.h#2 integrate
.. //depot/projects/smpng/sys/arm/freescale/imx/imx_iomuxvar.h#1 branch
.. //depot/projects/smpng/sys/arm/freescale/imx/imx_sdhci.c#5 integrate
.. //depot/projects/smpng/sys/arm/freescale/vybrid/vf_sai.c#2 integrate
.. //depot/projects/smpng/sys/arm/include/asm.h#13 integrate
.. //depot/projects/smpng/sys/arm/mv/gpio.c#15 integrate
.. //depot/projects/smpng/sys/arm/rockchip/rk30xx_gpio.c#5 integrate
.. //depot/projects/smpng/sys/arm/ti/ti_sdhci.c#5 integrate
.. //depot/projects/smpng/sys/arm/xilinx/files.zynq7#3 integrate
.. //depot/projects/smpng/sys/boot/common/module.c#18 integrate
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/cubieboard2.dts#2 integrate
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/socfpga-sockit.dts#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/socfpga.dtsi#1 branch
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/sun4i-a10.dtsi#2 integrate
.. //depot/projects/smpng/sys/boot/fdt/dts/arm/sun7i-a20.dtsi#2 integrate
.. //depot/projects/smpng/sys/conf/files#303 integrate
.. //depot/projects/smpng/sys/conf/files.amd64#106 integrate
.. //depot/projects/smpng/sys/conf/files.i386#164 integrate
.. //depot/projects/smpng/sys/conf/files.pc98#122 integrate
.. //depot/projects/smpng/sys/dev/bce/if_bce.c#56 integrate
.. //depot/projects/smpng/sys/dev/cadence/if_cgem.c#4 integrate
.. //depot/projects/smpng/sys/dev/cadence/if_cgem_hw.h#2 integrate
.. //depot/projects/smpng/sys/dev/drm/drm_sysctl.c#13 integrate
.. //depot/projects/smpng/sys/dev/fdt/fdt_clock.c#1 branch
.. //depot/projects/smpng/sys/dev/fdt/fdt_clock.h#1 branch
.. //depot/projects/smpng/sys/dev/fdt/fdt_clock_if.m#1 branch
.. //depot/projects/smpng/sys/dev/fdt/fdt_common.c#12 integrate
.. //depot/projects/smpng/sys/dev/fdt/simplebus.c#13 integrate
.. //depot/projects/smpng/sys/dev/gpio/ofw_gpiobus.c#3 integrate
.. //depot/projects/smpng/sys/dev/mii/e1000phy.c#36 integrate
.. //depot/projects/smpng/sys/dev/mrsas/mrsas.h#2 integrate
.. //depot/projects/smpng/sys/dev/mrsas/mrsas_cam.c#2 integrate
.. //depot/projects/smpng/sys/dev/ofw/ofw_bus_subr.c#13 integrate
.. //depot/projects/smpng/sys/dev/ofw/ofw_console.c#38 integrate
.. //depot/projects/smpng/sys/dev/ofw/ofw_fdt.c#9 integrate
.. //depot/projects/smpng/sys/dev/ofw/ofwbus.c#4 integrate
.. //depot/projects/smpng/sys/dev/ofw/openfirm.c#26 integrate
.. //depot/projects/smpng/sys/dev/ofw/openfirm.h#18 integrate
.. //depot/projects/smpng/sys/dev/tsec/if_tsec_fdt.c#9 integrate
.. //depot/projects/smpng/sys/dev/usb/net/if_aue.c#25 integrate
.. //depot/projects/smpng/sys/dev/usb/quirk/usb_quirk.c#37 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdevs#193 integrate
.. //depot/projects/smpng/sys/dev/xen/blkfront/blkfront.c#23 integrate
.. //depot/projects/smpng/sys/i386/i386/identcpu.c#85 delete
.. //depot/projects/smpng/sys/i386/i386/initcpu.c#48 integrate
.. //depot/projects/smpng/sys/i386/i386/machdep.c#193 integrate
.. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#155 integrate
.. //depot/projects/smpng/sys/i386/i386/trap.c#144 integrate
.. //depot/projects/smpng/sys/i386/include/md_var.h#44 integrate
.. //depot/projects/smpng/sys/kern/kern_exit.c#169 integrate
.. //depot/projects/smpng/sys/kern/kern_proc.c#138 integrate
.. //depot/projects/smpng/sys/kern/kern_thread.c#132 integrate
.. //depot/projects/smpng/sys/kern/uipc_mbuf.c#76 integrate
.. //depot/projects/smpng/sys/kern/vfs_bio.c#159 integrate
.. //depot/projects/smpng/sys/mips/beri/beri_simplebus.c#3 integrate
.. //depot/projects/smpng/sys/net/if_vlan.c#88 integrate
.. //depot/projects/smpng/sys/netinet/ip_fastfwd.c#48 integrate
.. //depot/projects/smpng/sys/netinet/ip_output.c#141 integrate
.. //depot/projects/smpng/sys/netinet/raw_ip.c#107 integrate
.. //depot/projects/smpng/sys/netinet/tcp_reass.c#27 integrate
.. //depot/projects/smpng/sys/netinet/tcp_subr.c#144 integrate
.. //depot/projects/smpng/sys/netpfil/pf/pf.c#14 integrate
.. //depot/projects/smpng/sys/pc98/pc98/machdep.c#68 integrate
.. //depot/projects/smpng/sys/powerpc/ofw/ofw_pcibus.c#12 integrate
.. //depot/projects/smpng/sys/powerpc/powermac/macio.c#27 integrate
.. //depot/projects/smpng/sys/sys/cdefs.h#56 integrate
.. //depot/projects/smpng/sys/sys/mbuf.h#102 integrate
.. //depot/projects/smpng/sys/sys/param.h#194 integrate
.. //depot/projects/smpng/sys/sys/proc.h#233 integrate
.. //depot/projects/smpng/sys/sys/sdt.h#14 integrate
.. //depot/projects/smpng/sys/x86/x86/identcpu.c#2 integrate
.. //depot/projects/smpng/sys/x86/x86/tsc.c#13 integrate
Differences ...
==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#131 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/amd64/amd64/machdep.c 270828 2014-08-29 21:25:47Z jhb $");
+__FBSDID("$FreeBSD: head/sys/amd64/amd64/machdep.c 271076 2014-09-04 01:46:06Z jhb $");
#include "opt_atpic.h"
#include "opt_compat.h"
==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#140 (text+ko) ====
@@ -79,7 +79,7 @@
#define AMD64_NPT_AWARE
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/amd64/amd64/pmap.c 270151 2014-08-18 20:28:08Z alc $");
+__FBSDID("$FreeBSD: head/sys/amd64/amd64/pmap.c 270961 2014-09-02 04:11:20Z alc $");
/*
* Manages physical address maps.
@@ -2571,7 +2571,7 @@
* "kernel_vm_end" and the kernel page table as they were.
*
* The correctness of this action is based on the following
- * argument: vm_map_findspace() allocates contiguous ranges of the
+ * argument: vm_map_insert() allocates contiguous ranges of the
* kernel virtual address space. It calls this function if a range
* ends after "kernel_vm_end". If the kernel is mapped between
* "kernel_vm_end" and "addr", then the range cannot begin at
==== //depot/projects/smpng/sys/amd64/include/md_var.h#32 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: head/sys/amd64/include/md_var.h 262752 2014-03-04 21:35:57Z jkim $
+ * $FreeBSD: head/sys/amd64/include/md_var.h 271076 2014-09-04 01:46:06Z jhb $
*/
#ifndef _MACHINE_MD_VAR_H_
==== //depot/projects/smpng/sys/arm/arm/nexus.c#25 (text+ko) ====
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/arm/nexus.c 269959 2014-08-14 04:21:25Z imp $");
+__FBSDID("$FreeBSD: head/sys/arm/arm/nexus.c 270945 2014-09-01 18:51:01Z ian $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -341,7 +341,7 @@
phandle_t intr_offset;
int i, rv, interrupt, trig, pol;
- intr_offset = OF_xref_phandle(iparent);
+ intr_offset = OF_node_from_xref(iparent);
for (i = 0; i < icells; i++)
intr[i] = cpu_to_fdt32(intr[i]);
==== //depot/projects/smpng/sys/arm/at91/at91_pinctrl.c#2 (text+ko) ====
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/at91/at91_pinctrl.c 270025 2014-08-15 16:08:52Z imp $");
+__FBSDID("$FreeBSD: head/sys/arm/at91/at91_pinctrl.c 271104 2014-09-04 16:40:54Z imp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -136,10 +136,10 @@
"assuming direct parent\n");
iparent = OF_parent(node);
}
- if (OF_searchencprop(OF_xref_phandle(iparent),
+ if (OF_searchencprop(OF_node_from_xref(iparent),
"#interrupt-cells", &icells, sizeof(icells)) == -1) {
- device_printf(dev, "Missing #interrupt-cells property, "
- "assuming <1>\n");
+ device_printf(dev, "Missing #interrupt-cells property,"
+ " assuming <1>\n");
icells = 1;
}
if (icells < 1 || icells > nintr) {
@@ -388,19 +388,22 @@
OF_getprop(node, "status", status, sizeof(status));
OF_getprop(node, "name", name, sizeof(name));
if (strcmp(status, "okay") != 0) {
-// printf("pinctrl: omitting node %s since it isn't active\n", name);
+// printf("pinctrl: skipping node %s status %s\n", name,
+// status);
continue;
}
len = OF_getencprop(node, "pinctrl-0", pinctrl, sizeof(pinctrl));
if (len <= 0) {
-// printf("pinctrl: no pinctrl-0 property for node %s, omitting\n", name);
+// printf("pinctrl: skipping node %s no pinctrl-0\n",
+// name, status);
continue;
}
len /= sizeof(phandle_t);
printf("pinctrl: Found active node %s\n", name);
for (i = 0; i < len; i++) {
- scratch = OF_xref_phandle(pinctrl[i]);
- npins = OF_getencprop(scratch, "atmel,pins", pins, sizeof(pins));
+ scratch = OF_node_from_xref(pinctrl[i]);
+ npins = OF_getencprop(scratch, "atmel,pins", pins,
+ sizeof(pins));
if (npins <= 0) {
printf("We're doing it wrong %s\n", name);
continue;
@@ -408,29 +411,40 @@
memset(name, 0, sizeof(name));
OF_getprop(scratch, "name", name, sizeof(name));
npins /= (4 * 4);
- printf("----> need to cope with %d more pins for %s\n", npins, name);
+ printf("----> need to cope with %d more pins for %s\n",
+ npins, name);
for (j = 0; j < npins; j++) {
uint32_t unit = pins[j * 4];
uint32_t pin = pins[j * 4 + 1];
uint32_t periph = pins[j * 4 + 2];
uint32_t flags = pins[j * 4 + 3];
- uint32_t pio = (0xfffffff & sc->ranges[0].bus) + 0x200 * unit;
- printf("P%c%d %s %#x\n", unit + 'A', pin, periphs[periph],
- flags);
+ uint32_t pio;
+
+ pio = (0xfffffff & sc->ranges[0].bus) +
+ 0x200 * unit;
+ printf("P%c%d %s %#x\n", unit + 'A', pin,
+ periphs[periph], flags);
switch (periph) {
case 0:
at91_pio_use_gpio(pio, 1u << pin);
- at91_pio_gpio_pullup(pio, 1u << pin, !!(flags & 1));
- at91_pio_gpio_high_z(pio, 1u << pin, !!(flags & 2));
- at91_pio_gpio_set_deglitch(pio, 1u << pin, !!(flags & 4));
- // at91_pio_gpio_pulldown(pio, 1u << pin, !!(flags & 8));
- // at91_pio_gpio_dis_schmidt(pio, 1u << pin, !!(flags & 16));
+ at91_pio_gpio_pullup(pio, 1u << pin,
+ !!(flags & 1));
+ at91_pio_gpio_high_z(pio, 1u << pin,
+ !!(flags & 2));
+ at91_pio_gpio_set_deglitch(pio,
+ 1u << pin, !!(flags & 4));
+// at91_pio_gpio_pulldown(pio, 1u << pin,
+// !!(flags & 8));
+// at91_pio_gpio_dis_schmidt(pio,
+// 1u << pin, !!(flags & 16));
break;
case 1:
- at91_pio_use_periph_a(pio, 1u << pin, flags);
+ at91_pio_use_periph_a(pio, 1u << pin,
+ flags);
break;
case 2:
- at91_pio_use_periph_b(pio, 1u << pin, flags);
+ at91_pio_use_periph_b(pio, 1u << pin,
+ flags);
break;
}
}
@@ -493,8 +507,8 @@
static devclass_t at91_pinctrl_devclass;
-EARLY_DRIVER_MODULE(at91_pinctrl, simplebus, at91_pinctrl_driver, at91_pinctrl_devclass,
- NULL, NULL, BUS_PASS_BUS);
+EARLY_DRIVER_MODULE(at91_pinctrl, simplebus, at91_pinctrl_driver,
+ at91_pinctrl_devclass, NULL, NULL, BUS_PASS_BUS);
/*
* dummy driver to force pass BUS_PASS_PINMUX to happen.
@@ -520,5 +534,5 @@
static devclass_t at91_pingroup_devclass;
-EARLY_DRIVER_MODULE(at91_pingroup, at91_pinctrl, at91_pingroup_driver, at91_pingroup_devclass,
- NULL, NULL, BUS_PASS_PINMUX);
+EARLY_DRIVER_MODULE(at91_pingroup, at91_pinctrl, at91_pingroup_driver,
+ at91_pingroup_devclass, NULL, NULL, BUS_PASS_PINMUX);
==== //depot/projects/smpng/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c#6 (text+ko) ====
@@ -25,7 +25,7 @@
*
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c 261410 2014-02-02 19:17:28Z ian $");
+__FBSDID("$FreeBSD: head/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c 270948 2014-09-01 19:20:34Z ian $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -42,6 +42,7 @@
#include <sys/queue.h>
#include <sys/resource.h>
#include <sys/rman.h>
+#include <sys/sysctl.h>
#include <sys/taskqueue.h>
#include <sys/time.h>
#include <sys/timetc.h>
==== //depot/projects/smpng/sys/arm/conf/DB-78XXX#18 (text+ko) ====
@@ -1,7 +1,7 @@
#
# Custom kernel for Marvell DB-78xx boards.
#
-# $FreeBSD: head/sys/arm/conf/DB-78XXX 263301 2014-03-18 14:41:18Z imp $
+# $FreeBSD: head/sys/arm/conf/DB-78XXX 271050 2014-09-03 19:37:41Z ian $
#
ident DB-88F78XX
@@ -44,7 +44,7 @@
options ALT_BREAK_TO_DEBUGGER
options DDB
#options DEADLKRES # Enable the deadlock resolver
-options DIAGNOSTIC
+#options DIAGNOSTIC
#options INVARIANTS # Enable calls of extra sanity checking
#options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS
options KDB
==== //depot/projects/smpng/sys/arm/conf/DB-88F5XXX#17 (text+ko) ====
@@ -1,7 +1,7 @@
#
# Custom kernel for Marvell DB-88F5xxx boards.
#
-# $FreeBSD: head/sys/arm/conf/DB-88F5XXX 263301 2014-03-18 14:41:18Z imp $
+# $FreeBSD: head/sys/arm/conf/DB-88F5XXX 271050 2014-09-03 19:37:41Z ian $
#
ident DB-88F5XXX
@@ -43,7 +43,7 @@
options ALT_BREAK_TO_DEBUGGER
options DDB
#options DEADLKRES # Enable the deadlock resolver
-options DIAGNOSTIC
+#options DIAGNOSTIC
#options INVARIANTS # Enable calls of extra sanity checking
#options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS
options KDB
==== //depot/projects/smpng/sys/arm/conf/DB-88F6XXX#19 (text+ko) ====
@@ -1,7 +1,7 @@
#
# Custom kernel for Marvell DB-88F6xxx boards.
#
-# $FreeBSD: head/sys/arm/conf/DB-88F6XXX 263301 2014-03-18 14:41:18Z imp $
+# $FreeBSD: head/sys/arm/conf/DB-88F6XXX 271050 2014-09-03 19:37:41Z ian $
#
ident DB-88F6XXX
@@ -44,7 +44,7 @@
options ALT_BREAK_TO_DEBUGGER
options DDB
#options DEADLKRES # Enable the deadlock resolver
-options DIAGNOSTIC
+#options DIAGNOSTIC
#options INVARIANTS # Enable calls of extra sanity checking
#options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS
options KDB
==== //depot/projects/smpng/sys/arm/conf/DIGI-CCWMX53#7 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: head/sys/arm/conf/DIGI-CCWMX53 270912 2014-09-01 03:49:21Z imp $
+# $FreeBSD: head/sys/arm/conf/DIGI-CCWMX53 271101 2014-09-04 14:59:27Z ian $
ident DIGI-CCWMX53
@@ -120,8 +120,6 @@
device imxata
options ATA_STATIC_ID # Static device numbering
-device iomux # IO Multiplexor
-
device gpio
device gpioled
==== //depot/projects/smpng/sys/arm/conf/DOCKSTAR#10 (text+ko) ====
@@ -1,7 +1,7 @@
#
# Custom kernel for Seagate DockStar (Marvell SheevaPlug based) devices.
#
-# $FreeBSD: head/sys/arm/conf/DOCKSTAR 263301 2014-03-18 14:41:18Z imp $
+# $FreeBSD: head/sys/arm/conf/DOCKSTAR 271050 2014-09-03 19:37:41Z ian $
#
# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
#
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: head/sys/arm/conf/DOCKSTAR 263301 2014-03-18 14:41:18Z imp $
+# $FreeBSD: head/sys/arm/conf/DOCKSTAR 271050 2014-09-03 19:37:41Z ian $
#
ident DOCKSTAR
@@ -145,7 +145,7 @@
options ALT_BREAK_TO_DEBUGGER
options DDB
options KDB
-options DIAGNOSTIC
+#options DIAGNOSTIC
options INVARIANTS # Enable calls of extra sanity checking
options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS
#options WITNESS # Enable checks to detect deadlocks and cycles
==== //depot/projects/smpng/sys/arm/conf/DREAMPLUG-1001#4 (text+ko) ====
@@ -18,7 +18,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: head/sys/arm/conf/DREAMPLUG-1001 263301 2014-03-18 14:41:18Z imp $
+# $FreeBSD: head/sys/arm/conf/DREAMPLUG-1001 271050 2014-09-03 19:37:41Z ian $
#
ident DREAMPLUG-1001
@@ -153,7 +153,7 @@
options ALT_BREAK_TO_DEBUGGER
options DDB
options KDB
-options DIAGNOSTIC
+#options DIAGNOSTIC
options INVARIANTS # Enable calls of extra sanity checking
options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS
#options WITNESS # Enable checks to detect deadlocks and cycles
==== //depot/projects/smpng/sys/arm/conf/EA3250#8 (text+ko) ====
@@ -1,7 +1,7 @@
#
# Custom kernel for EA3250 boards.
#
-# $FreeBSD: head/sys/arm/conf/EA3250 263301 2014-03-18 14:41:18Z imp $
+# $FreeBSD: head/sys/arm/conf/EA3250 271050 2014-09-03 19:37:41Z ian $
#
ident EA3250
@@ -44,7 +44,7 @@
options ALT_BREAK_TO_DEBUGGER
options DDB
#options DEADLKRES # Enable the deadlock resolver
-options DIAGNOSTIC
+#options DIAGNOSTIC
#options INVARIANTS # Enable calls of extra sanity checking
#options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS
options KDB
==== //depot/projects/smpng/sys/arm/conf/EFIKA_MX#7 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: head/sys/arm/conf/EFIKA_MX 270912 2014-09-01 03:49:21Z imp $
+# $FreeBSD: head/sys/arm/conf/EFIKA_MX 271101 2014-09-04 14:59:27Z ian $
ident EFIKA_MX
@@ -116,8 +116,6 @@
device imxata
options ATA_STATIC_ID # Static device numbering
-device iomux # IO Multiplexor
-
device gpio
device gpioled
==== //depot/projects/smpng/sys/arm/conf/IMX53-QSB#6 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: head/sys/arm/conf/IMX53-QSB 270912 2014-09-01 03:49:21Z imp $
+# $FreeBSD: head/sys/arm/conf/IMX53-QSB 271101 2014-09-04 14:59:27Z ian $
ident IMX53-QSB
@@ -119,8 +119,6 @@
#device imxata
#options ATA_STATIC_ID # Static device numbering
-device iomux # IO Multiplexor
-
device gpio
device gpioled
==== //depot/projects/smpng/sys/arm/conf/IMX6#4 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: head/sys/arm/conf/IMX6 270912 2014-09-01 03:49:21Z imp $
+# $FreeBSD: head/sys/arm/conf/IMX6 271101 2014-09-04 14:59:27Z ian $
ident IMX6
include "../freescale/imx/std.imx6"
@@ -80,7 +80,6 @@
device ether # Ethernet support
device miibus # Required for ethernet
device bpf # Berkeley packet filter (required for DHCP)
-#device iomux # IO Multiplexor
# General-purpose input/output
device gpio
==== //depot/projects/smpng/sys/arm/conf/ZEDBOARD#8 (text+ko) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: head/sys/arm/conf/ZEDBOARD 270912 2014-09-01 03:49:21Z imp $
+# $FreeBSD: head/sys/arm/conf/ZEDBOARD 271046 2014-09-03 17:51:03Z ian $
ident ZEDBOARD
@@ -72,8 +72,9 @@
device loop
device random
device ether
-device if_cgem # Zynq-7000 gig ethernet device
+device cgem # Zynq-7000 gig ethernet device
device mii
+device e1000phy
device pty
device uart
device gpio
==== //depot/projects/smpng/sys/arm/freescale/fsl_ocotp.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/freescale/fsl_ocotp.c 261957 2014-02-16 03:30:22Z ian $");
+__FBSDID("$FreeBSD: head/sys/arm/freescale/fsl_ocotp.c 270955 2014-09-02 02:54:55Z ian $");
/*
* Access to the Freescale i.MX6 On-Chip One-Time-Programmable Memory
@@ -200,5 +200,6 @@
static devclass_t ocotp_devclass;
-DRIVER_MODULE(ocotp, simplebus, ocotp_driver, ocotp_devclass, 0, 0);
+EARLY_DRIVER_MODULE(ocotp, simplebus, ocotp_driver, ocotp_devclass, 0, 0,
+ BUS_PASS_CPU + BUS_PASS_ORDER_FIRST);
==== //depot/projects/smpng/sys/arm/freescale/imx/files.imx51#6 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: head/sys/arm/freescale/imx/files.imx51 268973 2014-07-22 03:59:14Z br $
+# $FreeBSD: head/sys/arm/freescale/imx/files.imx51 271100 2014-09-04 14:57:04Z ian $
arm/arm/bus_space_asm_generic.S standard
arm/arm/bus_space_generic.c standard
arm/arm/cpufunc_asm_armv5.S standard
@@ -19,7 +19,7 @@
arm/freescale/imx/tzic.c standard
# IOMUX - external pins multiplexor
-arm/freescale/imx/imx51_iomux.c optional iomux
+arm/freescale/imx/imx51_iomux.c standard
# GPIO
arm/freescale/imx/imx_gpio.c optional gpio
==== //depot/projects/smpng/sys/arm/freescale/imx/files.imx53#7 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: head/sys/arm/freescale/imx/files.imx53 268973 2014-07-22 03:59:14Z br $
+# $FreeBSD: head/sys/arm/freescale/imx/files.imx53 271100 2014-09-04 14:57:04Z ian $
arm/arm/bus_space_asm_generic.S standard
arm/arm/bus_space_generic.c standard
arm/arm/cpufunc_asm_armv5.S standard
@@ -22,7 +22,7 @@
arm/freescale/imx/tzic.c standard
# IOMUX - external pins multiplexor
-arm/freescale/imx/imx51_iomux.c optional iomux
+arm/freescale/imx/imx51_iomux.c standard
# GPIO
arm/freescale/imx/imx_gpio.c optional gpio
==== //depot/projects/smpng/sys/arm/freescale/imx/files.imx6#6 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: head/sys/arm/freescale/imx/files.imx6 268977 2014-07-22 04:39:32Z br $
+# $FreeBSD: head/sys/arm/freescale/imx/files.imx6 271100 2014-09-04 14:57:04Z ian $
#
# Standard ARM support.
@@ -19,11 +19,12 @@
arm/arm/mpcore_timer.c standard
arm/freescale/fsl_ocotp.c standard
arm/freescale/imx/imx6_anatop.c standard
-arm/freescale/imx/imx_common.c standard
arm/freescale/imx/imx6_ccm.c standard
+arm/freescale/imx/imx6_iomux.c standard
arm/freescale/imx/imx6_machdep.c standard
arm/freescale/imx/imx6_mp.c optional smp
arm/freescale/imx/imx6_pl310.c standard
+arm/freescale/imx/imx_common.c standard
arm/freescale/imx/imx_machdep.c standard
arm/freescale/imx/imx_gpt.c standard
arm/freescale/imx/imx_gpio.c optional gpio
@@ -51,6 +52,4 @@
#
# Not ready yet...
#
-#arm/freescale/imx/imx51_iomux.c optional iomux
-#dev/ata/chipsets/ata-fsl.c optional imxata
#arm/freescale/imx/imx51_ipuv3.c optional sc
==== //depot/projects/smpng/sys/arm/freescale/imx/imx51_ccm.c#8 (text+ko) ====
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/freescale/imx/imx51_ccm.c 264977 2014-04-26 16:48:09Z ian $");
+__FBSDID("$FreeBSD: head/sys/arm/freescale/imx/imx51_ccm.c 271055 2014-09-03 21:45:39Z ian $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -580,3 +580,10 @@
return (imx51_get_clock(IMX51CLK_UART_CLK_ROOT));
}
+
+uint32_t
+imx_ccm_ahb_hz(void)
+{
+
+ return (imx51_get_clock(IMX51CLK_AHB_CLK_ROOT));
+}
==== //depot/projects/smpng/sys/arm/freescale/imx/imx51_iomux.c#5 (text+ko) ====
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/freescale/imx/imx51_iomux.c 261410 2014-02-02 19:17:28Z ian $");
+__FBSDID("$FreeBSD: head/sys/arm/freescale/imx/imx51_iomux.c 271100 2014-09-04 14:57:04Z ian $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -74,8 +74,8 @@
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
-#include <arm/freescale/imx/imx51_iomuxvar.h>
-#include <arm/freescale/imx/imx51_iomuxreg.h>
+#include <arm/freescale/imx/imx_iomuxvar.h>
+#include "imx51_iomuxreg.h"
#define IOMUX_WRITE(_sc, _r, _v) \
@@ -176,45 +176,58 @@
iomux_set_pad_sub(iomuxsc, pin, config);
}
-#ifdef notyet
-void
-iomux_set_input(unsigned int input, unsigned int config)
+static uint32_t
+iomux_get_pad_config_sub(struct iomux_softc *sc, uint32_t pin)
+{
+ bus_size_t pad_reg = IOMUX_PIN_TO_PAD_ADDRESS(pin);
+ uint32_t result;
+
+ result = IOMUX_READ(sc, pad_reg);
+
+ return(result);
+}
+
+unsigned int
+iomux_get_pad_config(unsigned int pin)
+{
+
+ return(iomux_get_pad_config_sub(iomuxsc, pin));
+}
+
+uint32_t
+imx_iomux_gpr_get(u_int regnum)
{
- bus_size_t input_ctl_reg = input;
- bus_space_write_4(iomuxsc->iomux_memt, iomuxsc->iomux_memh,
- input_ctl_reg, config);
+ KASSERT(iomuxsc != NULL, ("imx_iomux_gpr_get() called before attach"));
+ KASSERT(regnum >= 0 && regnum <= 1,
+ ("imx_iomux_gpr_get bad regnum %u", regnum));
+ return (IOMUX_READ(iomuxsc, IOMUXC_GPR0 + regnum));
}
-#endif
void
-iomux_mux_config(const struct iomux_conf *conflist)
+imx_iomux_gpr_set(u_int regnum, uint32_t val)
{
- int i;
- if (iomuxsc == NULL)
- return;
- for (i = 0; conflist[i].pin != IOMUX_CONF_EOT; i++) {
- iomux_set_pad_sub(iomuxsc, conflist[i].pin, conflist[i].pad);
- iomux_set_function_sub(iomuxsc, conflist[i].pin,
- conflist[i].mux);
- }
+ KASSERT(iomuxsc != NULL, ("imx_iomux_gpr_set() called before attach"));
+ KASSERT(regnum >= 0 && regnum <= 1,
+ ("imx_iomux_gpr_set bad regnum %u", regnum));
+ IOMUX_WRITE(iomuxsc, IOMUXC_GPR0 + regnum, val);
}
-#ifdef notyet
void
-iomux_input_config(const struct iomux_input_conf *conflist)
+imx_iomux_gpr_set_masked(u_int regnum, uint32_t clrbits, uint32_t setbits)
{
- int i;
+ uint32_t val;
+
+ KASSERT(iomuxsc != NULL,
+ ("imx_iomux_gpr_set_masked called before attach"));
+ KASSERT(regnum >= 0 && regnum <= 1,
+ ("imx_iomux_gpr_set_masked bad regnum %u", regnum));
- if (iomuxsc == NULL)
- return;
- for (i = 0; conflist[i].inout != -1; i++) {
- iomux_set_inout(iomuxsc, conflist[i].inout,
- conflist[i].inout_mode);
- }
+ val = IOMUX_READ(iomuxsc, IOMUXC_GPR0 + regnum);
+ val = (val & ~clrbits) | setbits;
+ IOMUX_WRITE(iomuxsc, IOMUXC_GPR0 + regnum, val);
}
-#endif
static device_method_t imx_iomux_methods[] = {
DEVMETHOD(device_probe, iomux_probe),
@@ -232,5 +245,5 @@
static devclass_t imx_iomux_devclass;
EARLY_DRIVER_MODULE(imx_iomux, simplebus, imx_iomux_driver,
- imx_iomux_devclass, 0, 0, BUS_PASS_BUS - 1);
+ imx_iomux_devclass, 0, 0, BUS_PASS_CPU + BUS_PASS_ORDER_LATE);
==== //depot/projects/smpng/sys/arm/freescale/imx/imx6_anatop.c#6 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/freescale/imx/imx6_anatop.c 270065 2014-08-16 20:44:45Z ian $");
+__FBSDID("$FreeBSD: head/sys/arm/freescale/imx/imx6_anatop.c 270956 2014-09-02 02:56:43Z ian $");
/*
* Analog PLL and power regulator driver for Freescale i.MX6 family of SoCs.
@@ -88,6 +88,8 @@
struct imx6_anatop_softc {
device_t dev;
struct resource *res[2];
+ struct intr_config_hook
+ intr_setup_hook;
uint32_t cpu_curmhz;
uint32_t cpu_curmv;
uint32_t cpu_minmhz;
@@ -610,10 +612,22 @@
"Throttle CPU when exceeding this temperature");
}
+static void
+intr_setup(void *arg)
+{
+ struct imx6_anatop_softc *sc;
+
+ sc = arg;
+ bus_setup_intr(sc->dev, sc->res[IRQRES], INTR_TYPE_MISC | INTR_MPSAFE,
+ tempmon_intr, NULL, sc, &sc->temp_intrhand);
+ config_intrhook_disestablish(&sc->intr_setup_hook);
+}
+
static int
imx6_anatop_detach(device_t dev)
{
+ /* This device can never detach. */
return (EBUSY);
}
@@ -633,10 +647,9 @@
goto out;
}
- err = bus_setup_intr(dev, sc->res[IRQRES], INTR_TYPE_MISC | INTR_MPSAFE,
- tempmon_intr, NULL, sc, &sc->temp_intrhand);
- if (err != 0)
- goto out;
+ sc->intr_setup_hook.ich_func = intr_setup;
+ sc->intr_setup_hook.ich_arg = sc;
+ config_intrhook_establish(&sc->intr_setup_hook);
SYSCTL_ADD_UINT(device_get_sysctl_ctx(sc->dev),
SYSCTL_CHILDREN(device_get_sysctl_tree(sc->dev)),
@@ -713,5 +726,6 @@
static devclass_t imx6_anatop_devclass;
-DRIVER_MODULE(imx6_anatop, simplebus, imx6_anatop_driver, imx6_anatop_devclass, 0, 0);
+EARLY_DRIVER_MODULE(imx6_anatop, simplebus, imx6_anatop_driver,
+ imx6_anatop_devclass, 0, 0, BUS_PASS_CPU + BUS_PASS_ORDER_FIRST + 1);
==== //depot/projects/smpng/sys/arm/freescale/imx/imx6_ccm.c#4 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/freescale/imx/imx6_ccm.c 264977 2014-04-26 16:48:09Z ian $");
+__FBSDID("$FreeBSD: head/sys/arm/freescale/imx/imx6_ccm.c 271055 2014-09-03 21:45:39Z ian $");
/*
* Clocks and power control driver for Freescale i.MX6 family of SoCs.
@@ -238,6 +238,12 @@
return (80000000);
}
+uint32_t
+imx_ccm_ahb_hz(void)
+{
+ return (132000000);
+}
+
static device_method_t ccm_methods[] = {
/* Device interface */
DEVMETHOD(device_probe, ccm_probe),
==== //depot/projects/smpng/sys/arm/freescale/imx/imx_ccmvar.h#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: head/sys/arm/freescale/imx/imx_ccmvar.h 264977 2014-04-26 16:48:09Z ian $
+ * $FreeBSD: head/sys/arm/freescale/imx/imx_ccmvar.h 271055 2014-09-03 21:45:39Z ian $
*/
#ifndef IMX_CCMVAR_H
@@ -47,6 +47,7 @@
uint32_t imx_ccm_perclk_hz(void);
uint32_t imx_ccm_sdhci_hz(void);
uint32_t imx_ccm_uart_hz(void);
+uint32_t imx_ccm_ahb_hz(void);
void imx_ccm_usb_enable(device_t _usbdev);
void imx_ccm_usbphy_enable(device_t _phydev);
==== //depot/projects/smpng/sys/arm/freescale/imx/imx_sdhci.c#5 (text+ko) ====
@@ -25,7 +25,7 @@
*
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/freescale/imx/imx_sdhci.c 267171 2014-06-06 16:37:42Z kevlo $");
+__FBSDID("$FreeBSD: head/sys/arm/freescale/imx/imx_sdhci.c 270948 2014-09-01 19:20:34Z ian $");
/*
* SDHCI driver glue for Freescale i.MX SoC family.
@@ -45,6 +45,7 @@
#include <sys/mutex.h>
#include <sys/resource.h>
#include <sys/rman.h>
+#include <sys/sysctl.h>
#include <sys/taskqueue.h>
#include <sys/time.h>
==== //depot/projects/smpng/sys/arm/freescale/vybrid/vf_sai.c#2 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/freescale/vybrid/vf_sai.c 261987 2014-02-16 19:21:44Z br $");
+__FBSDID("$FreeBSD: head/sys/arm/freescale/vybrid/vf_sai.c 270945 2014-09-01 18:51:01Z ian $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -430,7 +430,7 @@
OF_getprop(node, "edma-mux-group", &dts_value, len);
edma_mux_group = fdt32_to_cpu(dts_value);
OF_getprop(node, "edma-controller", &dts_value, len);
- edma_node = OF_xref_phandle(fdt32_to_cpu(dts_value));
+ edma_node = OF_node_from_xref(fdt32_to_cpu(dts_value));
if ((len = OF_getproplen(edma_node, "device-id")) <= 0) {
return (ENXIO);
==== //depot/projects/smpng/sys/arm/include/asm.h#13 (text+ko) ====
@@ -33,7 +33,7 @@
*
* from: @(#)asm.h 5.5 (Berkeley) 5/7/91
*
- * $FreeBSD: head/sys/arm/include/asm.h 269390 2014-08-01 18:24:44Z ian $
+ * $FreeBSD: head/sys/arm/include/asm.h 270930 2014-09-01 14:57:04Z ian $
*/
#ifndef _MACHINE_ASM_H_
@@ -53,7 +53,7 @@
# define _ALIGN_TEXT .align 0
#endif
-#ifdef __ARM_EABI__
+#if defined(__ARM_EABI__) && !defined(_STANDALONE)
#define STOP_UNWINDING .cantunwind
#define _FNSTART .fnstart
#define _FNEND .fnend
==== //depot/projects/smpng/sys/arm/mv/gpio.c#15 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/mv/gpio.c 265854 2014-05-10 20:31:05Z andrew $");
+__FBSDID("$FreeBSD: head/sys/arm/mv/gpio.c 270945 2014-09-01 18:51:01Z ian $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -642,7 +642,7 @@
* contain a ref. to a node defining GPIO
* controller.
*/
- ctrl = OF_xref_phandle(fdt32_to_cpu(gpios[0]));
+ ctrl = OF_node_from_xref(fdt32_to_cpu(gpios[0]));
if (fdt_is_compatible(ctrl, e->compat))
/* Call a handler. */
==== //depot/projects/smpng/sys/arm/rockchip/rk30xx_gpio.c#5 (text+ko) ====
@@ -27,7 +27,7 @@
*
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/rockchip/rk30xx_gpio.c 265853 2014-05-10 20:26:49Z andrew $");
+__FBSDID("$FreeBSD: head/sys/arm/rockchip/rk30xx_gpio.c 270945 2014-09-01 18:51:01Z ian $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -656,7 +656,7 @@
* contain a ref. to a node defining GPIO
* controller.
*/
- ctrl = OF_xref_phandle(fdt32_to_cpu(gpios[0]));
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list