Commit 4e608f26 authored by Anton Blanchard's avatar Anton Blanchard

Merge samba.org:/scratch/anton/linux-2.5

into samba.org:/scratch/anton/tmp3
parents d8475074 5705b765
...@@ -98,7 +98,7 @@ $(call gz-sec, $(required)): $(obj)/kernel-%.gz: % FORCE ...@@ -98,7 +98,7 @@ $(call gz-sec, $(required)): $(obj)/kernel-%.gz: % FORCE
$(obj)/kernel-initrd.gz: $(obj)/ramdisk.image.gz $(obj)/kernel-initrd.gz: $(obj)/ramdisk.image.gz
cp -f $(obj)/ramdisk.image.gz $@ cp -f $(obj)/ramdisk.image.gz $@
$(call src-sec, $(required) $(initrd)): $(obj)/kernel-%.c: $(obj)/kernel-%.gz $(call src-sec, $(required) $(initrd)): $(obj)/kernel-%.c: $(obj)/kernel-%.gz FORCE
touch $@ touch $@
$(call obj-sec, $(required) $(initrd)): $(obj)/kernel-%.o: $(obj)/kernel-%.c FORCE $(call obj-sec, $(required) $(initrd)): $(obj)/kernel-%.o: $(obj)/kernel-%.c FORCE
......
...@@ -1106,9 +1106,11 @@ SLB_NUM_ENTRIES = 64 ...@@ -1106,9 +1106,11 @@ SLB_NUM_ENTRIES = 64
oris r21,r23,2048 /* valid bit */ oris r21,r23,2048 /* valid bit */
rldimi r21,r22,0,52 /* Insert entry */ rldimi r21,r22,0,52 /* Insert entry */
isync /*
* No need for an isync before or after this slbmte. The exception
* we enter with and the rfid we exit with are context synchronizing .
*/
slbmte r20,r21 slbmte r20,r21
isync
/* All done -- return from exception. */ /* All done -- return from exception. */
mfsprg r20,3 /* Load the PACA pointer */ mfsprg r20,3 /* Load the PACA pointer */
......
...@@ -710,12 +710,6 @@ void create_tce_tables_for_busesLP(struct list_head *bus_list) ...@@ -710,12 +710,6 @@ void create_tce_tables_for_busesLP(struct list_head *bus_list)
for (ln=bus_list->next; ln != bus_list; ln=ln->next) { for (ln=bus_list->next; ln != bus_list; ln=ln->next) {
bus = pci_bus_b(ln); bus = pci_bus_b(ln);
busdn = PCI_GET_DN(bus); busdn = PCI_GET_DN(bus);
/* NOTE: there should never be a window declared on a bus when
* child devices also have a window. If this should ever be
* architected, we probably want children to have priority.
* In reality, the PHB containing ISA has the property, but otherwise
* it is the pci-bridges that have the property.
*/
dma_window = (u32 *)get_property(busdn, "ibm,dma-window", 0); dma_window = (u32 *)get_property(busdn, "ibm,dma-window", 0);
if (dma_window) { if (dma_window) {
/* Bussubno hasn't been copied yet. /* Bussubno hasn't been copied yet.
...@@ -724,6 +718,7 @@ void create_tce_tables_for_busesLP(struct list_head *bus_list) ...@@ -724,6 +718,7 @@ void create_tce_tables_for_busesLP(struct list_head *bus_list)
busdn->bussubno = bus->number; busdn->bussubno = bus->number;
create_pci_bus_tce_table((unsigned long)busdn); create_pci_bus_tce_table((unsigned long)busdn);
} }
/* look for a window on a bridge even if the PHB had one */
create_tce_tables_for_busesLP(&bus->children); create_tce_tables_for_busesLP(&bus->children);
} }
} }
......
...@@ -23,7 +23,8 @@ ...@@ -23,7 +23,8 @@
#include <asm/pmc.h> #include <asm/pmc.h>
int make_ste(unsigned long stab, unsigned long esid, unsigned long vsid); int make_ste(unsigned long stab, unsigned long esid, unsigned long vsid);
void make_slbe(unsigned long esid, unsigned long vsid, int large); void make_slbe(unsigned long esid, unsigned long vsid, int large,
int kernel_segment);
/* /*
* Build an entry for the base kernel segment and put it into * Build an entry for the base kernel segment and put it into
...@@ -45,7 +46,8 @@ void stab_initialize(unsigned long stab) ...@@ -45,7 +46,8 @@ void stab_initialize(unsigned long stab)
asm volatile("isync":::"memory"); asm volatile("isync":::"memory");
asm volatile("slbmte %0,%0"::"r" (0) : "memory"); asm volatile("slbmte %0,%0"::"r" (0) : "memory");
asm volatile("isync; slbia; isync":::"memory"); asm volatile("isync; slbia; isync":::"memory");
make_slbe(esid, vsid, 0); make_slbe(esid, vsid, 0, 1);
asm volatile("isync":::"memory");
#endif #endif
} else { } else {
asm volatile("isync; slbia; isync":::"memory"); asm volatile("isync; slbia; isync":::"memory");
...@@ -139,10 +141,13 @@ int make_ste(unsigned long stab, unsigned long esid, unsigned long vsid) ...@@ -139,10 +141,13 @@ int make_ste(unsigned long stab, unsigned long esid, unsigned long vsid)
/* /*
* Create a segment buffer entry for the given esid/vsid pair. * Create a segment buffer entry for the given esid/vsid pair.
*
* NOTE: A context syncronising instruction is required before and after
* this, in the common case we use exception entry and rfid.
*/ */
void make_slbe(unsigned long esid, unsigned long vsid, int large) void make_slbe(unsigned long esid, unsigned long vsid, int large,
int kernel_segment)
{ {
int kernel_segment = 0;
unsigned long entry, castout_entry; unsigned long entry, castout_entry;
union { union {
unsigned long word0; unsigned long word0;
...@@ -153,42 +158,15 @@ void make_slbe(unsigned long esid, unsigned long vsid, int large) ...@@ -153,42 +158,15 @@ void make_slbe(unsigned long esid, unsigned long vsid, int large)
slb_dword1 data; slb_dword1 data;
} vsid_data; } vsid_data;
if (REGION_ID(esid << SID_SHIFT) >= KERNEL_REGION_ID)
kernel_segment = 1;
/* /*
* Find an empty entry, if one exists. * Find an empty entry, if one exists. Must start at 0 because
* we use this code to load SLB entry 0 at boot.
*/ */
for (entry = 0; entry < naca->slb_size; entry++) { for (entry = 0; entry < naca->slb_size; entry++) {
asm volatile("slbmfee %0,%1" asm volatile("slbmfee %0,%1"
: "=r" (esid_data) : "r" (entry)); : "=r" (esid_data) : "r" (entry));
if (!esid_data.data.v) { if (!esid_data.data.v)
/* goto write_entry;
* Write the new SLB entry.
*/
vsid_data.word0 = 0;
vsid_data.data.vsid = vsid;
vsid_data.data.kp = 1;
if (large)
vsid_data.data.l = 1;
if (kernel_segment)
vsid_data.data.c = 1;
esid_data.word0 = 0;
esid_data.data.esid = esid;
esid_data.data.v = 1;
esid_data.data.index = entry;
/* slbie not needed as no previous mapping existed. */
/* Order update */
asm volatile("isync" : : : "memory");
asm volatile("slbmte %0,%1"
: : "r" (vsid_data),
"r" (esid_data));
/* Order update */
asm volatile("isync" : : : "memory");
return;
}
} }
/* /*
...@@ -211,13 +189,13 @@ void make_slbe(unsigned long esid, unsigned long vsid, int large) ...@@ -211,13 +189,13 @@ void make_slbe(unsigned long esid, unsigned long vsid, int large)
if (castout_entry >= naca->slb_size) if (castout_entry >= naca->slb_size)
castout_entry = 1; castout_entry = 1;
asm volatile("slbmfee %0,%1" : "=r" (esid_data) : "r" (entry)); asm volatile("slbmfee %0,%1" : "=r" (esid_data) : "r" (entry));
} while (esid_data.data.esid == GET_ESID((unsigned long)_get_SP()) && } while (esid_data.data.esid == GET_ESID((unsigned long)_get_SP()));
esid_data.data.v);
get_paca()->xStab_data.next_round_robin = castout_entry; get_paca()->xStab_data.next_round_robin = castout_entry;
/* slbie not needed as the previous mapping is still valid. */ /* slbie not needed as the previous mapping is still valid. */
write_entry:
/* /*
* Write the new SLB entry. * Write the new SLB entry.
*/ */
...@@ -234,10 +212,11 @@ void make_slbe(unsigned long esid, unsigned long vsid, int large) ...@@ -234,10 +212,11 @@ void make_slbe(unsigned long esid, unsigned long vsid, int large)
esid_data.data.v = 1; esid_data.data.v = 1;
esid_data.data.index = entry; esid_data.data.index = entry;
asm volatile("isync" : : : "memory"); /* Order update */ /*
asm volatile("slbmte %0,%1" * No need for an isync before or after this slbmte. The exception
: : "r" (vsid_data), "r" (esid_data)); * we enter with and the rfid we exit with are context synchronizing.
asm volatile("isync" : : : "memory" ); /* Order update */ */
asm volatile("slbmte %0,%1" : : "r" (vsid_data), "r" (esid_data));
} }
static inline void __ste_allocate(unsigned long esid, unsigned long vsid, static inline void __ste_allocate(unsigned long esid, unsigned long vsid,
...@@ -246,10 +225,10 @@ static inline void __ste_allocate(unsigned long esid, unsigned long vsid, ...@@ -246,10 +225,10 @@ static inline void __ste_allocate(unsigned long esid, unsigned long vsid,
if (cpu_has_slb()) { if (cpu_has_slb()) {
#ifndef CONFIG_PPC_ISERIES #ifndef CONFIG_PPC_ISERIES
if (REGION_ID(esid << SID_SHIFT) == KERNEL_REGION_ID) if (REGION_ID(esid << SID_SHIFT) == KERNEL_REGION_ID)
make_slbe(esid, vsid, 1); make_slbe(esid, vsid, 1, kernel_segment);
else else
#endif #endif
make_slbe(esid, vsid, 0); make_slbe(esid, vsid, 0, kernel_segment);
} else { } else {
unsigned char top_entry, stab_entry, *segments; unsigned char top_entry, stab_entry, *segments;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment