Author: ian
Date: Thu May 15 16:59:47 2014
New Revision: 266159
URL: http://svnweb.freebsd.org/changeset/base/266159
Log:
MFC r261414, r261415, r261417, r261418, r261419
Don't call device_set_ivars() for the mmchs
Change the way pcpu and curthread are stored per-core
Invalidate cachelines for bounce pages on PREREAD too, there may still be
stale entries from a previous transfer.
Only use the CPU ID register if SMP is defined. Some non-MPCore armv6 cpu,
such as the one found in the RPi, don't have it, and just hang when we try
to access it.
Modified:
stable/10/sys/arm/arm/bcopyinout.S
stable/10/sys/arm/arm/bcopyinout_xscale.S
stable/10/sys/arm/arm/busdma_machdep-v6.c
stable/10/sys/arm/arm/copystr.S
stable/10/sys/arm/arm/fusu.S
stable/10/sys/arm/arm/genassym.c
stable/10/sys/arm/arm/machdep.c
stable/10/sys/arm/arm/mp_machdep.c
stable/10/sys/arm/arm/swtch.S
stable/10/sys/arm/arm/vfp.c
stable/10/sys/arm/include/asmacros.h
stable/10/sys/arm/include/pcpu.h
stable/10/sys/arm/ti/ti_mmchs.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/arm/arm/bcopyinout.S
==============================================================================
--- stable/10/sys/arm/arm/bcopyinout.S Thu May 15 16:51:45 2014
(r266158)
+++ stable/10/sys/arm/arm/bcopyinout.S Thu May 15 16:59:47 2014
(r266159)
@@ -57,7 +57,7 @@ __FBSDID("$FreeBSD$");
#ifdef _ARM_ARCH_6
#define GET_PCB(tmp) \
mrc p15, 0, tmp, c13, c0, 4; \
- add tmp, tmp, #(PC_CURPCB)
+ add tmp, tmp, #(TD_PCB)
#else
.Lcurpcb:
.word _C_LABEL(__pcpu) + PC_CURPCB
Modified: stable/10/sys/arm/arm/bcopyinout_xscale.S
==============================================================================
--- stable/10/sys/arm/arm/bcopyinout_xscale.S Thu May 15 16:51:45 2014
(r266158)
+++ stable/10/sys/arm/arm/bcopyinout_xscale.S Thu May 15 16:59:47 2014
(r266159)
@@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$");
#ifdef _ARM_ARCH_6
#define GET_PCB(tmp) \
mrc p15, 0, tmp, c13, c0, 4; \
- add tmp, tmp, #(PC_CURPCB)
+ add tmp, tmp, #(TD_PCB)
#else
.Lcurpcb:
.word _C_LABEL(__pcpu) + PC_CURPCB
Modified: stable/10/sys/arm/arm/busdma_machdep-v6.c
==============================================================================
--- stable/10/sys/arm/arm/busdma_machdep-v6.c Thu May 15 16:51:45 2014
(r266158)
+++ stable/10/sys/arm/arm/busdma_machdep-v6.c Thu May 15 16:59:47 2014
(r266159)
@@ -1220,6 +1220,17 @@ _bus_dmamap_sync(bus_dma_tag_t dmat, bus
dmat->bounce_zone->total_bounced++;
}
+ if (op & BUS_DMASYNC_PREREAD) {
+ bpage = STAILQ_FIRST(&map->bpages);
+ while (bpage != NULL) {
+ cpu_dcache_inv_range((vm_offset_t)bpage->vaddr,
+ bpage->datacount);
+ l2cache_inv_range((vm_offset_t)bpage->vaddr,
+ (vm_offset_t)bpage->busaddr,
+ bpage->datacount);
+ bpage = STAILQ_NEXT(bpage, links);
+ }
+ }
if (op & BUS_DMASYNC_POSTREAD) {
while (bpage != NULL) {
vm_offset_t startv;
Modified: stable/10/sys/arm/arm/copystr.S
==============================================================================
--- stable/10/sys/arm/arm/copystr.S Thu May 15 16:51:45 2014
(r266158)
+++ stable/10/sys/arm/arm/copystr.S Thu May 15 16:59:47 2014
(r266159)
@@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$");
#ifdef _ARM_ARCH_6
#define GET_PCB(tmp) \
mrc p15, 0, tmp, c13, c0, 4; \
- add tmp, tmp, #(PC_CURPCB)
+ add tmp, tmp, #(TD_PCB)
#else
.Lpcb:
.word _C_LABEL(__pcpu) + PC_CURPCB
Modified: stable/10/sys/arm/arm/fusu.S
==============================================================================
--- stable/10/sys/arm/arm/fusu.S Thu May 15 16:51:45 2014
(r266158)
+++ stable/10/sys/arm/arm/fusu.S Thu May 15 16:59:47 2014
(r266159)
@@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$");
#ifdef _ARM_ARCH_6
#define GET_PCB(tmp) \
mrc p15, 0, tmp, c13, c0, 4; \
- add tmp, tmp, #(PC_CURPCB)
+ add tmp, tmp, #(TD_PCB)
#else
.Lcurpcb:
.word _C_LABEL(__pcpu) + PC_CURPCB
Modified: stable/10/sys/arm/arm/genassym.c
==============================================================================
--- stable/10/sys/arm/arm/genassym.c Thu May 15 16:51:45 2014
(r266158)
+++ stable/10/sys/arm/arm/genassym.c Thu May 15 16:59:47 2014
(r266159)
@@ -140,3 +140,4 @@ ASSYM(TRAPFRAMESIZE, sizeof(struct trapf
ASSYM(MAXCOMLEN, MAXCOMLEN);
ASSYM(NIRQ, NIRQ);
+ASSYM(PCPU_SIZE, sizeof(struct pcpu));
Modified: stable/10/sys/arm/arm/machdep.c
==============================================================================
--- stable/10/sys/arm/arm/machdep.c Thu May 15 16:51:45 2014
(r266158)
+++ stable/10/sys/arm/arm/machdep.c Thu May 15 16:59:47 2014
(r266159)
@@ -874,7 +874,7 @@ void
pcpu0_init(void)
{
#if ARM_ARCH_6 || ARM_ARCH_7A || defined(CPU_MV_PJ4B)
- set_pcpu(pcpup);
+ set_curthread(&thread0);
#endif
pcpu_init(pcpup, 0, sizeof(struct pcpu));
PCPU_SET(curthread, &thread0);
Modified: stable/10/sys/arm/arm/mp_machdep.c
==============================================================================
--- stable/10/sys/arm/arm/mp_machdep.c Thu May 15 16:51:45 2014
(r266158)
+++ stable/10/sys/arm/arm/mp_machdep.c Thu May 15 16:59:47 2014
(r266159)
@@ -177,7 +177,6 @@ init_secondary(int cpu)
cpu_tlb_flushID();
pc = &__pcpu[cpu];
- set_pcpu(pc);
/*
* pcpu_init() updates queue, so it should not be executed in parallel
@@ -203,6 +202,7 @@ init_secondary(int cpu)
KASSERT(PCPU_GET(idlethread) != NULL, ("no idle thread"));
pc->pc_curthread = pc->pc_idlethread;
pc->pc_curpcb = pc->pc_idlethread->td_pcb;
+ set_curthread(pc->pc_idlethread);
#ifdef VFP
pc->pc_cpu = cpu;
Modified: stable/10/sys/arm/arm/swtch.S
==============================================================================
--- stable/10/sys/arm/arm/swtch.S Thu May 15 16:51:45 2014
(r266158)
+++ stable/10/sys/arm/arm/swtch.S Thu May 15 16:59:47 2014
(r266159)
@@ -88,17 +88,23 @@ __FBSDID("$FreeBSD$");
#define DOMAIN_CLIENT 0x01
-#ifdef _ARM_ARCH_6
-#define GET_PCPU(tmp) \
- mrc p15, 0, tmp, c13, c0, 4;
+#if defined(_ARM_ARCH_6) && defined(SMP)
+#define GET_PCPU(tmp, tmp2) \
+ mrc p15, 0, tmp, c0, c0, 5; \
+ and tmp, tmp, #0xf; \
+ ldr tmp2, .Lcurpcpu+4; \
+ mul tmp, tmp, tmp2; \
+ ldr tmp2, .Lcurpcpu; \
+ add tmp, tmp, tmp2;
#else
-.Lcurpcpu:
- .word _C_LABEL(__pcpu)
-#define GET_PCPU(tmp) \
+#define GET_PCPU(tmp, tmp2) \
ldr tmp, .Lcurpcpu
#endif
+.Lcurpcpu:
+ .word _C_LABEL(__pcpu)
+ .word PCPU_SIZE
.Lcpufuncs:
.word _C_LABEL(cpufuncs)
.Lblocked_lock:
@@ -112,7 +118,7 @@ ENTRY(cpu_throw)
* r5 = newtd
*/
- GET_PCPU(r7)
+ GET_PCPU(r7, r9)
#ifdef VFP
/*
@@ -191,10 +197,15 @@ ENTRY(cpu_throw)
ldr r13, [r7, #(PCB_SP)]
#endif
+ GET_PCPU(r6, r4)
+ /* Hook in a new pcb */
+ str r7, [r6, #PC_CURPCB]
/* We have a new curthread now so make a note it */
- GET_CURTHREAD_PTR(r6)
+ add r6, r6, #PC_CURTHREAD
str r5, [r6]
-
+#ifndef ARM_TP_ADDRESS
+ mcr p15, 0, r5, c13, c0, 4
+#endif
/* Set the new tp */
ldr r6, [r5, #(TD_MD + MD_TP)]
#ifdef ARM_TP_ADDRESS
@@ -207,9 +218,6 @@ ENTRY(cpu_throw)
#else
mcr p15, 0, r6, c13, c0, 3
#endif
- /* Hook in a new pcb */
- GET_PCPU(r6)
- str r7, [r6, #PC_CURPCB]
add sp, sp, #4;
ldmfd sp!, {r4-r7, pc}
@@ -231,11 +239,13 @@ ENTRY(cpu_switch)
/* Process is now on a processor. */
/* We have a new curthread now so make a note it */
- GET_CURTHREAD_PTR(r7)
- str r1, [r7]
+ GET_PCPU(r7, r2)
+ str r1, [r7, #PC_CURTHREAD]
+#ifndef ARM_TP_ADDRESS
+ mcr p15, 0, r1, c13, c0, 4
+#endif
/* Hook in a new pcb */
- GET_PCPU(r7)
ldr r2, [r1, #TD_PCB]
str r2, [r7, #PC_CURPCB]
@@ -315,7 +325,7 @@ ENTRY(cpu_switch)
* a future exception will bounce the backup settings in the fp unit.
* XXX vfp_store can't change r4
*/
- GET_PCPU(r7)
+ GET_PCPU(r7, r8)
ldr r8, [r7, #(PC_VFPCTHREAD)]
cmp r4, r8 /* old thread used vfp? */
bne 1f /* no, don't save */
@@ -440,7 +450,6 @@ ENTRY(cpu_switch)
#if defined(SCHED_ULE) && defined(SMP)
ldr r6, .Lblocked_lock
GET_CURTHREAD_PTR(r3)
-
1:
ldr r4, [r3, #TD_LOCK]
cmp r4, r6
@@ -516,7 +525,7 @@ ENTRY(savectx)
* registers and state, and modify the control as needed.
* a future exception will bounce the backup settings in the fp unit.
*/
- GET_PCPU(r7)
+ GET_PCPU(r7, r4)
ldr r4, [r7, #(PC_VFPCTHREAD)] /* vfp thread */
ldr r2, [r7, #(PC_CURTHREAD)] /* current thread */
cmp r4, r2
Modified: stable/10/sys/arm/arm/vfp.c
==============================================================================
--- stable/10/sys/arm/arm/vfp.c Thu May 15 16:51:45 2014 (r266158)
+++ stable/10/sys/arm/arm/vfp.c Thu May 15 16:59:47 2014 (r266159)
@@ -140,9 +140,11 @@ vfp_bounce(u_int addr, u_int insn, struc
u_int fpexc;
struct pcb *curpcb;
struct thread *vfptd;
+ int i;
if (!vfp_exists)
return 1; /* vfp does not exist */
+ i = disable_interrupts(I32_bit|F32_bit);
fpexc = fmrx(VFPEXC); /* read the vfp exception reg */
if (fpexc & VFPEXC_EN) {
vfptd = PCPU_GET(vfpcthread);
@@ -164,6 +166,7 @@ vfp_bounce(u_int addr, u_int insn, struc
fmxr(VFPEXC, fpexc); /* turn vfp hardware off */
if (vfptd == curthread) {
/* kill the process - we do not handle emulation */
+ restore_interrupts(i);
killproc(curthread->td_proc, "vfp emulation");
return 1;
}
@@ -173,7 +176,7 @@ vfp_bounce(u_int addr, u_int insn, struc
}
fpexc |= VFPEXC_EN;
fmxr(VFPEXC, fpexc); /* enable the vfp and repeat command */
- curpcb = PCPU_GET(curpcb);
+ curpcb = curthread->td_pcb;
/* If we were the last process to use the VFP, the process did not
* use a VFP on another processor, then the registers in the VFP
* will still be ours and are current. Eventually, we will make the
@@ -183,7 +186,8 @@ vfp_bounce(u_int addr, u_int insn, struc
#ifdef SMP
curpcb->pcb_vfpcpu = PCPU_GET(cpu);
#endif
- PCPU_SET(vfpcthread, PCPU_GET(curthread));
+ PCPU_SET(vfpcthread, curthread);
+ restore_interrupts(i);
return 0;
}
@@ -218,7 +222,6 @@ vfp_restore(struct vfp_state *vfpsave)
"ldr %0, [%1]\n" /* set old vfpscr */
"mcr p10, 7, %0, cr1, c0, 0\n"
: "=&r" (vfpscr) : "r" (vfpsave), "r" (is_d32) : "cc");
- PCPU_SET(vfpcthread, PCPU_GET(curthread));
}
}
@@ -237,7 +240,7 @@ vfp_store(struct vfp_state *vfpsave)
u_int tmp, vfpscr = 0;
tmp = fmrx(VFPEXC); /* Is the vfp enabled? */
- if (vfpsave && tmp & VFPEXC_EN) {
+ if (vfpsave && (tmp & VFPEXC_EN)) {
__asm __volatile("stc p11, c0, [%1], #128\n" /* d0-d15 */
"cmp %2, #0\n" /* -D16 or -D32? */
stclne" p11, c0, [%1], #128\n" /* d16-d31 */
@@ -265,6 +268,12 @@ vfp_discard()
{
u_int tmp = 0;
+ /*
+ * No need to protect the access to vfpcthread by disabling
+ * interrupts, since it's called from cpu_throw(), who is called
+ * with interrupts disabled.
+ */
+
PCPU_SET(vfpcthread, 0); /* permanent forget about reg */
tmp = fmrx(VFPEXC);
tmp &= ~VFPEXC_EN; /* turn off VFP hardware */
Modified: stable/10/sys/arm/include/asmacros.h
==============================================================================
--- stable/10/sys/arm/include/asmacros.h Thu May 15 16:51:45 2014
(r266158)
+++ stable/10/sys/arm/include/asmacros.h Thu May 15 16:59:47 2014
(r266159)
@@ -241,15 +241,15 @@ name:
#ifdef _ARM_ARCH_6
#define AST_LOCALS
#define GET_CURTHREAD_PTR(tmp) \
- mrc p15, 0, tmp, c13, c0, 4; \
- add tmp, tmp, #(PC_CURTHREAD)
+ mrc p15, 0, tmp, c13, c0, 4
#else
#define AST_LOCALS
;\
.Lcurthread: ;\
.word _C_LABEL(__pcpu) + PC_CURTHREAD
#define GET_CURTHREAD_PTR(tmp) \
- ldr tmp, .Lcurthread
+ ldr tmp, .Lcurthread; \
+ ldr tmp, [tmp]
#endif
#define DO_AST
\
@@ -262,7 +262,6 @@ name:
bne 2f /* Nope, get out now */ ;\
bic r4, r4, #(I32_bit|F32_bit) ;\
1: GET_CURTHREAD_PTR(r5) ;\
- ldr r5, [r5] ;\
ldr r1, [r5, #(TD_FLAGS)] ;\
and r1, r1, #(TDF_ASTPENDING|TDF_NEEDRESCHED) ;\
teq r1, #0x00000000 ;\
Modified: stable/10/sys/arm/include/pcpu.h
==============================================================================
--- stable/10/sys/arm/include/pcpu.h Thu May 15 16:51:45 2014
(r266158)
+++ stable/10/sys/arm/include/pcpu.h Thu May 15 16:59:47 2014
(r266159)
@@ -62,22 +62,36 @@ struct pcpu;
extern struct pcpu *pcpup;
#if ARM_ARCH_6 || ARM_ARCH_7A
/* or ARM_TP_ADDRESS mark REMOVE ME NOTE */
-static inline struct pcpu *
-get_pcpu(void)
+
+#define CPU_MASK (0xf)
+
+#ifndef SMP
+#define get_pcpu() (pcpup)
+#else
+#define get_pcpu() __extension__ ({ \
+ int id; \
+ __asm __volatile("mrc p15, 0, %0, c0, c0, 5" : "=r" (id)); \
+ (pcpup + (id & CPU_MASK)); \
+ })
+#endif
+
+static inline struct thread *
+get_curthread(void)
{
- void *pcpu;
+ void *ret;
- __asm __volatile("mrc p15, 0, %0, c13, c0, 4" : "=r" (pcpu));
- return (pcpu);
+ __asm __volatile("mrc p15, 0, %0, c13, c0, 4" : "=r" (ret));
+ return (ret);
}
static inline void
-set_pcpu(void *pcpu)
+set_curthread(struct thread *td)
{
- __asm __volatile("mcr p15, 0, %0, c13, c0, 4" : : "r" (pcpu));
+ __asm __volatile("mcr p15, 0, %0, c13, c0, 4" : : "r" (td));
}
+
static inline void *
get_tls(void)
{
@@ -93,6 +107,9 @@ set_tls(void *tls)
__asm __volatile("mcr p15, 0, %0, c13, c0, 3" : : "r" (tls));
}
+
+#define curthread get_curthread()
+
#else
#define get_pcpu() pcpup
#endif
Modified: stable/10/sys/arm/ti/ti_mmchs.c
==============================================================================
--- stable/10/sys/arm/ti/ti_mmchs.c Thu May 15 16:51:45 2014
(r266158)
+++ stable/10/sys/arm/ti/ti_mmchs.c Thu May 15 16:59:47 2014
(r266159)
@@ -1755,7 +1755,6 @@ ti_mmchs_attach(device_t dev)
device_add_child(dev, "mmc", 0);
- device_set_ivars(dev, &sc->host);
err = bus_generic_attach(dev);
out:
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
