openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] cell: set ARCH_SPARSEMEM_DEFAULT in Kconfig
  [POWERPC] Fix cell "new style" mapping and add debug
  [POWERPC] pseries: Force 4k update_flash block and list sizes
  [POWERPC] CPM_UART: Fix non-console initialisation
  [POWERPC] CPM_UART: Fix non-console transmit
  [POWERPC] Make sure initrd and dtb sections get into zImage correctly
This commit is contained in:
Linus Torvalds 2006-11-13 08:20:38 -08:00
parent eea2078eaf 36b600f264
commit 239fd45938
8 changed files with 88 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/Kconfig
View File

@ -740,7 +740,7 @@ config ARCH_SPARSEMEM_ENABLE
config ARCH_SPARSEMEM_DEFAULT config ARCH_SPARSEMEM_DEFAULT
def_bool y def_bool y
depends on SMP && PPC_PSERIES depends on (SMP && PPC_PSERIES) || PPC_CELL
config ARCH_POPULATES_NODE_MAP config ARCH_POPULATES_NODE_MAP
def_bool y def_bool y

4
arch/powerpc/boot/wrapper
View File

@ -179,11 +179,11 @@ if [ -z "$cacheit" ]; then
fi fi
if [ -n "$initrd" ]; then if [ -n "$initrd" ]; then
addsec $tmp "$initrd" initrd addsec $tmp "$initrd" $isection
fi fi
if [ -n "$dtb" ]; then if [ -n "$dtb" ]; then
addsec $tmp "$dtb" dtb addsec $tmp "$dtb" .kernel:dtb
fi fi
if [ "$platform" != "miboot" ]; then if [ "$platform" != "miboot" ]; then

5
arch/powerpc/boot/zImage.lds.S
View File

@ -21,6 +21,11 @@ SECTIONS
__got2_end = .; __got2_end = .;
} }
. = ALIGN(8);
_dtb_start = .;
.kernel:dtb : { *(.kernel:dtb) }
_dtb_end = .;
. = ALIGN(4096); . = ALIGN(4096);
_vmlinux_start = .; _vmlinux_start = .;
.kernel:vmlinux.strip : { *(.kernel:vmlinux.strip) } .kernel:vmlinux.strip : { *(.kernel:vmlinux.strip) }

47
arch/powerpc/kernel/rtas_flash.c
View File

@ -72,6 +72,10 @@
#define VALIDATE_BUF_SIZE 4096 #define VALIDATE_BUF_SIZE 4096
#define RTAS_MSG_MAXLEN 64 #define RTAS_MSG_MAXLEN 64
/* Quirk - RTAS requires 4k list length and block size */
#define RTAS_BLKLIST_LENGTH 4096
#define RTAS_BLK_SIZE 4096
struct flash_block { struct flash_block {
char *data; char *data;
unsigned long length; unsigned long length;
@ -83,7 +87,7 @@ struct flash_block {
* into a version/length and translate the pointers * into a version/length and translate the pointers
* to absolute. * to absolute.
*/ */
#define FLASH_BLOCKS_PER_NODE ((PAGE_SIZE - 16) / sizeof(struct flash_block)) #define FLASH_BLOCKS_PER_NODE ((RTAS_BLKLIST_LENGTH - 16) / sizeof(struct flash_block))
struct flash_block_list { struct flash_block_list {
unsigned long num_blocks; unsigned long num_blocks;
struct flash_block_list *next; struct flash_block_list *next;
@ -96,6 +100,9 @@ struct flash_block_list_header { /* just the header of flash_block_list */
static struct flash_block_list_header rtas_firmware_flash_list = {0, NULL}; static struct flash_block_list_header rtas_firmware_flash_list = {0, NULL};
/* Use slab cache to guarantee 4k alignment */
static kmem_cache_t *flash_block_cache = NULL;
#define FLASH_BLOCK_LIST_VERSION (1UL) #define FLASH_BLOCK_LIST_VERSION (1UL)
/* Local copy of the flash block list. /* Local copy of the flash block list.
@ -153,7 +160,7 @@ static int flash_list_valid(struct flash_block_list *flist)
return FLASH_IMG_NULL_DATA; return FLASH_IMG_NULL_DATA;
} }
block_size = f->blocks[i].length; block_size = f->blocks[i].length;
if (block_size <= 0 || block_size > PAGE_SIZE) { if (block_size <= 0 || block_size > RTAS_BLK_SIZE) {
return FLASH_IMG_BAD_LEN; return FLASH_IMG_BAD_LEN;
} }
image_size += block_size; image_size += block_size;
@ -177,9 +184,9 @@ static void free_flash_list(struct flash_block_list *f)
while (f) { while (f) {
for (i = 0; i < f->num_blocks; i++) for (i = 0; i < f->num_blocks; i++)
free_page((unsigned long)(f->blocks[i].data)); kmem_cache_free(flash_block_cache, f->blocks[i].data);
next = f->next; next = f->next;
free_page((unsigned long)f); kmem_cache_free(flash_block_cache, f);
f = next; f = next;
} }
} }
@ -278,6 +285,12 @@ static ssize_t rtas_flash_read(struct file *file, char __user *buf,
return msglen; return msglen;
} }
/* constructor for flash_block_cache */
void rtas_block_ctor(void *ptr, kmem_cache_t *cache, unsigned long flags)
{
memset(ptr, 0, RTAS_BLK_SIZE);
}
/* We could be much more efficient here. But to keep this function /* We could be much more efficient here. But to keep this function
* simple we allocate a page to the block list no matter how small the * simple we allocate a page to the block list no matter how small the
* count is. If the system is low on memory it will be just as well * count is. If the system is low on memory it will be just as well
@ -302,7 +315,7 @@ static ssize_t rtas_flash_write(struct file *file, const char __user *buffer,
* proc file * proc file
*/ */
if (uf->flist == NULL) { if (uf->flist == NULL) {
uf->flist = (struct flash_block_list *) get_zeroed_page(GFP_KERNEL); uf->flist = kmem_cache_alloc(flash_block_cache, GFP_KERNEL);
if (!uf->flist) if (!uf->flist)
return -ENOMEM; return -ENOMEM;
} }
@ -313,21 +326,21 @@ static ssize_t rtas_flash_write(struct file *file, const char __user *buffer,
next_free = fl->num_blocks; next_free = fl->num_blocks;
if (next_free == FLASH_BLOCKS_PER_NODE) { if (next_free == FLASH_BLOCKS_PER_NODE) {
/* Need to allocate another block_list */ /* Need to allocate another block_list */
fl->next = (struct flash_block_list *)get_zeroed_page(GFP_KERNEL); fl->next = kmem_cache_alloc(flash_block_cache, GFP_KERNEL);
if (!fl->next) if (!fl->next)
return -ENOMEM; return -ENOMEM;
fl = fl->next; fl = fl->next;
next_free = 0; next_free = 0;
} }
if (count > PAGE_SIZE) if (count > RTAS_BLK_SIZE)
count = PAGE_SIZE; count = RTAS_BLK_SIZE;
p = (char *)get_zeroed_page(GFP_KERNEL); p = kmem_cache_alloc(flash_block_cache, GFP_KERNEL);
if (!p) if (!p)
return -ENOMEM; return -ENOMEM;
if(copy_from_user(p, buffer, count)) { if(copy_from_user(p, buffer, count)) {
free_page((unsigned long)p); kmem_cache_free(flash_block_cache, p);
return -EFAULT; return -EFAULT;
} }
fl->blocks[next_free].data = p; fl->blocks[next_free].data = p;
@ -791,6 +804,16 @@ int __init rtas_flash_init(void)
goto cleanup; goto cleanup;
rtas_flash_term_hook = rtas_flash_firmware; rtas_flash_term_hook = rtas_flash_firmware;
flash_block_cache = kmem_cache_create("rtas_flash_cache",
RTAS_BLK_SIZE, RTAS_BLK_SIZE, 0,
rtas_block_ctor, NULL);
if (!flash_block_cache) {
printk(KERN_ERR "%s: failed to create block cache\n",
__FUNCTION__);
rc = -ENOMEM;
goto cleanup;
}
return 0; return 0;
cleanup: cleanup:
@ -805,6 +828,10 @@ int __init rtas_flash_init(void)
void __exit rtas_flash_cleanup(void) void __exit rtas_flash_cleanup(void)
{ {
rtas_flash_term_hook = NULL; rtas_flash_term_hook = NULL;
if (flash_block_cache)
kmem_cache_destroy(flash_block_cache);
remove_flash_pde(firmware_flash_pde); remove_flash_pde(firmware_flash_pde);
remove_flash_pde(firmware_update_pde); remove_flash_pde(firmware_update_pde);
remove_flash_pde(validate_pde); remove_flash_pde(validate_pde);

41
arch/powerpc/platforms/cell/spu_base.c
View File

@ -655,14 +655,19 @@ static int __init spu_map_interrupts(struct spu *spu, struct device_node *np)
for (i=0; i < 3; i++) { for (i=0; i < 3; i++) {
ret = of_irq_map_one(np, i, &oirq); ret = of_irq_map_one(np, i, &oirq);
if (ret) if (ret) {
pr_debug("spu_new: failed to get irq %d\n", i);
goto err; goto err;
}
ret = -EINVAL; ret = -EINVAL;
pr_debug(" irq %d no 0x%x on %s\n", i, oirq.specifier[0],
oirq.controller->full_name);
spu->irqs[i] = irq_create_of_mapping(oirq.controller, spu->irqs[i] = irq_create_of_mapping(oirq.controller,
oirq.specifier, oirq.size); oirq.specifier, oirq.size);
if (spu->irqs[i] == NO_IRQ) if (spu->irqs[i] == NO_IRQ) {
pr_debug("spu_new: failed to map it !\n");
goto err; goto err;
}
} }
return 0; return 0;
@ -681,7 +686,7 @@ static int spu_map_resource(struct device_node *node, int nr,
struct resource resource = { }; struct resource resource = { };
int ret; int ret;
ret = of_address_to_resource(node, 0, &resource); ret = of_address_to_resource(node, nr, &resource);
if (ret) if (ret)
goto out; goto out;
@ -704,22 +709,42 @@ static int __init spu_map_device(struct spu *spu, struct device_node *node)
ret = spu_map_resource(node, 0, (void __iomem**)&spu->local_store, ret = spu_map_resource(node, 0, (void __iomem**)&spu->local_store,
&spu->local_store_phys); &spu->local_store_phys);
if (ret) if (ret) {
pr_debug("spu_new: failed to map %s resource 0\n",
node->full_name);
goto out; goto out;
}
ret = spu_map_resource(node, 1, (void __iomem**)&spu->problem, ret = spu_map_resource(node, 1, (void __iomem**)&spu->problem,
&spu->problem_phys); &spu->problem_phys);
if (ret) if (ret) {
pr_debug("spu_new: failed to map %s resource 1\n",
node->full_name);
goto out_unmap; goto out_unmap;
}
ret = spu_map_resource(node, 2, (void __iomem**)&spu->priv2, ret = spu_map_resource(node, 2, (void __iomem**)&spu->priv2,
NULL); NULL);
if (ret) if (ret) {
pr_debug("spu_new: failed to map %s resource 2\n",
node->full_name);
goto out_unmap; goto out_unmap;
}
if (!firmware_has_feature(FW_FEATURE_LPAR)) if (!firmware_has_feature(FW_FEATURE_LPAR))
ret = spu_map_resource(node, 3, (void __iomem**)&spu->priv1, ret = spu_map_resource(node, 3, (void __iomem**)&spu->priv1,
NULL); NULL);
if (ret) if (ret) {
pr_debug("spu_new: failed to map %s resource 3\n",
node->full_name);
goto out_unmap; goto out_unmap;
}
pr_debug("spu_new: %s maps:\n", node->full_name);
pr_debug(" local store : 0x%016lx -> 0x%p\n",
spu->local_store_phys, spu->local_store);
pr_debug(" problem state : 0x%016lx -> 0x%p\n",
spu->problem_phys, spu->problem);
pr_debug(" priv2 : 0x%p\n", spu->priv2);
pr_debug(" priv1 : 0x%p\n", spu->priv1);
return 0; return 0;
out_unmap: out_unmap:

2
drivers/serial/cpm_uart/cpm_uart.h
View File

@ -88,7 +88,7 @@ extern struct uart_cpm_port cpm_uart_ports[UART_NR];
/* these are located in their respective files */ /* these are located in their respective files */
void cpm_line_cr_cmd(int line, int cmd); void cpm_line_cr_cmd(int line, int cmd);
int cpm_uart_init_portdesc(void); int __init cpm_uart_init_portdesc(void);
int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con); int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con);
void cpm_uart_freebuf(struct uart_cpm_port *pinfo); void cpm_uart_freebuf(struct uart_cpm_port *pinfo);

16
drivers/serial/cpm_uart/cpm_uart_core.c
View File

@ -195,10 +195,8 @@ static void cpm_uart_start_tx(struct uart_port *port)
if (cpm_uart_tx_pump(port) != 0) { if (cpm_uart_tx_pump(port) != 0) {
if (IS_SMC(pinfo)) { if (IS_SMC(pinfo)) {
smcp->smc_smcm |= SMCM_TX; smcp->smc_smcm |= SMCM_TX;
smcp->smc_smcmr |= SMCMR_TEN;
} else { } else {
sccp->scc_sccm |= UART_SCCM_TX; sccp->scc_sccm |= UART_SCCM_TX;
pinfo->sccp->scc_gsmrl |= SCC_GSMRL_ENT;
} }
} }
} }
@ -421,9 +419,10 @@ static int cpm_uart_startup(struct uart_port *port)
/* Startup rx-int */ /* Startup rx-int */
if (IS_SMC(pinfo)) { if (IS_SMC(pinfo)) {
pinfo->smcp->smc_smcm |= SMCM_RX; pinfo->smcp->smc_smcm |= SMCM_RX;
pinfo->smcp->smc_smcmr |= SMCMR_REN; pinfo->smcp->smc_smcmr |= (SMCMR_REN | SMCMR_TEN);
} else { } else {
pinfo->sccp->scc_sccm |= UART_SCCM_RX; pinfo->sccp->scc_sccm |= UART_SCCM_RX;
pinfo->sccp->scc_gsmrl |= (SCC_GSMRL_ENR | SCC_GSMRL_ENT);
} }
if (!(pinfo->flags & FLAG_CONSOLE)) if (!(pinfo->flags & FLAG_CONSOLE))
@ -1350,11 +1349,10 @@ static int cpm_uart_init(void) {
pr_info("cpm_uart: WARNING: no UART devices found on platform bus!\n"); pr_info("cpm_uart: WARNING: no UART devices found on platform bus!\n");
pr_info( pr_info(
"cpm_uart: the driver will guess configuration, but this mode is no longer supported.\n"); "cpm_uart: the driver will guess configuration, but this mode is no longer supported.\n");
#ifndef CONFIG_SERIAL_CPM_CONSOLE
ret = cpm_uart_init_portdesc(); /* Don't run this again, if the console driver did it already */
if (ret) if (cpm_uart_nr == 0)
return ret; cpm_uart_init_portdesc();
#endif
cpm_reg.nr = cpm_uart_nr; cpm_reg.nr = cpm_uart_nr;
ret = uart_register_driver(&cpm_reg); ret = uart_register_driver(&cpm_reg);
@ -1366,6 +1364,8 @@ static int cpm_uart_init(void) {
int con = cpm_uart_port_map[i]; int con = cpm_uart_port_map[i];
cpm_uart_ports[con].port.line = i; cpm_uart_ports[con].port.line = i;
cpm_uart_ports[con].port.flags = UPF_BOOT_AUTOCONF; cpm_uart_ports[con].port.flags = UPF_BOOT_AUTOCONF;
if (cpm_uart_ports[con].set_lineif)
cpm_uart_ports[con].set_lineif(&cpm_uart_ports[con]);
uart_add_one_port(&cpm_reg, &cpm_uart_ports[con].port); uart_add_one_port(&cpm_reg, &cpm_uart_ports[con].port);
} }

2
drivers/serial/cpm_uart/cpm_uart_cpm1.c
View File

@ -184,7 +184,7 @@ void cpm_uart_freebuf(struct uart_cpm_port *pinfo)
} }
/* Setup any dynamic params in the uart desc */ /* Setup any dynamic params in the uart desc */
int cpm_uart_init_portdesc(void) int __init cpm_uart_init_portdesc(void)
{ {
pr_debug("CPM uart[-]:init portdesc\n"); pr_debug("CPM uart[-]:init portdesc\n");