The kzalloc() function has a 2-factor argument form, kcalloc(). This
patch replaces cases of:
kzalloc(a * b, gfp)
with:
kcalloc(a * b, gfp)
as well as handling cases of:
kzalloc(a * b * c, gfp)
with:
kzalloc(array3_size(a, b, c), gfp)
as it's slightly less ugly than:
kzalloc_array(array_size(a, b), c, gfp)
This does, however, attempt to ignore constant size factors like:
kzalloc(4 * 1024, gfp)
though any constants defined via macros get caught up in the conversion.
Any factors with a sizeof() of "unsigned char", "char", and "u8" were
dropped, since they're redundant.
The Coccinelle script used for this was:
// Fix redundant parens around sizeof().
@@
type TYPE;
expression THING, E;
@@
(
kzalloc(
- (sizeof(TYPE)) * E
+ sizeof(TYPE) * E
, ...)
|
kzalloc(
- (sizeof(THING)) * E
+ sizeof(THING) * E
, ...)
)
// Drop single-byte sizes and redundant parens.
@@
expression COUNT;
typedef u8;
typedef __u8;
@@
(
kzalloc(
- sizeof(u8) * (COUNT)
+ COUNT
, ...)
|
kzalloc(
- sizeof(__u8) * (COUNT)
+ COUNT
, ...)
|
kzalloc(
- sizeof(char) * (COUNT)
+ COUNT
, ...)
|
kzalloc(
- sizeof(unsigned char) * (COUNT)
+ COUNT
, ...)
|
kzalloc(
- sizeof(u8) * COUNT
+ COUNT
, ...)
|
kzalloc(
- sizeof(__u8) * COUNT
+ COUNT
, ...)
|
kzalloc(
- sizeof(char) * COUNT
+ COUNT
, ...)
|
kzalloc(
- sizeof(unsigned char) * COUNT
+ COUNT
, ...)
)
// 2-factor product with sizeof(type/expression) and identifier or constant.
@@
type TYPE;
expression THING;
identifier COUNT_ID;
constant COUNT_CONST;
@@
(
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * (COUNT_ID)
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * COUNT_ID
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * (COUNT_CONST)
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * COUNT_CONST
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * (COUNT_ID)
+ COUNT_ID, sizeof(THING)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * COUNT_ID
+ COUNT_ID, sizeof(THING)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * (COUNT_CONST)
+ COUNT_CONST, sizeof(THING)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * COUNT_CONST
+ COUNT_CONST, sizeof(THING)
, ...)
)
// 2-factor product, only identifiers.
@@
identifier SIZE, COUNT;
@@
- kzalloc
+ kcalloc
(
- SIZE * COUNT
+ COUNT, SIZE
, ...)
// 3-factor product with 1 sizeof(type) or sizeof(expression), with
// redundant parens removed.
@@
expression THING;
identifier STRIDE, COUNT;
type TYPE;
@@
(
kzalloc(
- sizeof(TYPE) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kzalloc(
- sizeof(TYPE) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kzalloc(
- sizeof(TYPE) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kzalloc(
- sizeof(TYPE) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kzalloc(
- sizeof(THING) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kzalloc(
- sizeof(THING) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kzalloc(
- sizeof(THING) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kzalloc(
- sizeof(THING) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
)
// 3-factor product with 2 sizeof(variable), with redundant parens removed.
@@
expression THING1, THING2;
identifier COUNT;
type TYPE1, TYPE2;
@@
(
kzalloc(
- sizeof(TYPE1) * sizeof(TYPE2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
kzalloc(
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
kzalloc(
- sizeof(THING1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
kzalloc(
- sizeof(THING1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
kzalloc(
- sizeof(TYPE1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
|
kzalloc(
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
)
// 3-factor product, only identifiers, with redundant parens removed.
@@
identifier STRIDE, SIZE, COUNT;
@@
(
kzalloc(
- (COUNT) * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- COUNT * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- COUNT * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- (COUNT) * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- COUNT * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- (COUNT) * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- (COUNT) * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- COUNT * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
)
// Any remaining multi-factor products, first at least 3-factor products,
// when they're not all constants...
@@
expression E1, E2, E3;
constant C1, C2, C3;
@@
(
kzalloc(C1 * C2 * C3, ...)
|
kzalloc(
- (E1) * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
|
kzalloc(
- (E1) * (E2) * E3
+ array3_size(E1, E2, E3)
, ...)
|
kzalloc(
- (E1) * (E2) * (E3)
+ array3_size(E1, E2, E3)
, ...)
|
kzalloc(
- E1 * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
)
// And then all remaining 2 factors products when they're not all constants,
// keeping sizeof() as the second factor argument.
@@
expression THING, E1, E2;
type TYPE;
constant C1, C2, C3;
@@
(
kzalloc(sizeof(THING) * C2, ...)
|
kzalloc(sizeof(TYPE) * C2, ...)
|
kzalloc(C1 * C2 * C3, ...)
|
kzalloc(C1 * C2, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * (E2)
+ E2, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * E2
+ E2, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * (E2)
+ E2, sizeof(THING)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * E2
+ E2, sizeof(THING)
, ...)
|
- kzalloc
+ kcalloc
(
- (E1) * E2
+ E1, E2
, ...)
|
- kzalloc
+ kcalloc
(
- (E1) * (E2)
+ E1, E2
, ...)
|
- kzalloc
+ kcalloc
(
- E1 * E2
+ E1, E2
, ...)
)
Signed-off-by: Kees Cook <keescook@chromium.org>
266 lines
6.6 KiB
C
266 lines
6.6 KiB
C
/*
|
|
* This file is subject to the terms and conditions of the GNU General Public
|
|
* License. See the file "COPYING" in the main directory of this archive
|
|
* for more details.
|
|
*
|
|
* Copyright (C) 2001-2004, 2006 Silicon Graphics, Inc. All rights reserved.
|
|
*/
|
|
|
|
#include <linux/interrupt.h>
|
|
#include <linux/types.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/pci.h>
|
|
#include <linux/export.h>
|
|
#include <asm/sn/addrs.h>
|
|
#include <asm/sn/geo.h>
|
|
#include <asm/sn/pcibr_provider.h>
|
|
#include <asm/sn/pcibus_provider_defs.h>
|
|
#include <asm/sn/pcidev.h>
|
|
#include <asm/sn/sn_sal.h>
|
|
#include <asm/sn/pic.h>
|
|
#include <asm/sn/sn2/sn_hwperf.h>
|
|
#include "xtalk/xwidgetdev.h"
|
|
#include "xtalk/hubdev.h"
|
|
|
|
int
|
|
sal_pcibr_slot_enable(struct pcibus_info *soft, int device, void *resp,
|
|
char **ssdt)
|
|
{
|
|
struct ia64_sal_retval ret_stuff;
|
|
u64 busnum;
|
|
u64 segment;
|
|
|
|
ret_stuff.status = 0;
|
|
ret_stuff.v0 = 0;
|
|
|
|
segment = soft->pbi_buscommon.bs_persist_segment;
|
|
busnum = soft->pbi_buscommon.bs_persist_busnum;
|
|
SAL_CALL_NOLOCK(ret_stuff, (u64) SN_SAL_IOIF_SLOT_ENABLE, segment,
|
|
busnum, (u64) device, (u64) resp, (u64)ia64_tpa(ssdt),
|
|
0, 0);
|
|
|
|
return (int)ret_stuff.v0;
|
|
}
|
|
|
|
int
|
|
sal_pcibr_slot_disable(struct pcibus_info *soft, int device, int action,
|
|
void *resp)
|
|
{
|
|
struct ia64_sal_retval ret_stuff;
|
|
u64 busnum;
|
|
u64 segment;
|
|
|
|
ret_stuff.status = 0;
|
|
ret_stuff.v0 = 0;
|
|
|
|
segment = soft->pbi_buscommon.bs_persist_segment;
|
|
busnum = soft->pbi_buscommon.bs_persist_busnum;
|
|
SAL_CALL_NOLOCK(ret_stuff, (u64) SN_SAL_IOIF_SLOT_DISABLE,
|
|
segment, busnum, (u64) device, (u64) action,
|
|
(u64) resp, 0, 0);
|
|
|
|
return (int)ret_stuff.v0;
|
|
}
|
|
|
|
static int sal_pcibr_error_interrupt(struct pcibus_info *soft)
|
|
{
|
|
struct ia64_sal_retval ret_stuff;
|
|
u64 busnum;
|
|
int segment;
|
|
ret_stuff.status = 0;
|
|
ret_stuff.v0 = 0;
|
|
|
|
segment = soft->pbi_buscommon.bs_persist_segment;
|
|
busnum = soft->pbi_buscommon.bs_persist_busnum;
|
|
SAL_CALL_NOLOCK(ret_stuff,
|
|
(u64) SN_SAL_IOIF_ERROR_INTERRUPT,
|
|
(u64) segment, (u64) busnum, 0, 0, 0, 0, 0);
|
|
|
|
return (int)ret_stuff.v0;
|
|
}
|
|
|
|
u16 sn_ioboard_to_pci_bus(struct pci_bus *pci_bus)
|
|
{
|
|
long rc;
|
|
u16 uninitialized_var(ioboard); /* GCC be quiet */
|
|
nasid_t nasid = NASID_GET(SN_PCIBUS_BUSSOFT(pci_bus)->bs_base);
|
|
|
|
rc = ia64_sn_sysctl_ioboard_get(nasid, &ioboard);
|
|
if (rc) {
|
|
printk(KERN_WARNING "ia64_sn_sysctl_ioboard_get failed: %ld\n",
|
|
rc);
|
|
return 0;
|
|
}
|
|
|
|
return ioboard;
|
|
}
|
|
|
|
/*
|
|
* PCI Bridge Error interrupt handler. Gets invoked whenever a PCI
|
|
* bridge sends an error interrupt.
|
|
*/
|
|
static irqreturn_t
|
|
pcibr_error_intr_handler(int irq, void *arg)
|
|
{
|
|
struct pcibus_info *soft = arg;
|
|
|
|
if (sal_pcibr_error_interrupt(soft) < 0)
|
|
panic("pcibr_error_intr_handler(): Fatal Bridge Error");
|
|
|
|
return IRQ_HANDLED;
|
|
}
|
|
|
|
void *
|
|
pcibr_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *controller)
|
|
{
|
|
int nasid, cnode, j;
|
|
struct hubdev_info *hubdev_info;
|
|
struct pcibus_info *soft;
|
|
struct sn_flush_device_kernel *sn_flush_device_kernel;
|
|
struct sn_flush_device_common *common;
|
|
|
|
if (! IS_PCI_BRIDGE_ASIC(prom_bussoft->bs_asic_type)) {
|
|
return NULL;
|
|
}
|
|
|
|
/*
|
|
* Allocate kernel bus soft and copy from prom.
|
|
*/
|
|
|
|
soft = kmemdup(prom_bussoft, sizeof(struct pcibus_info), GFP_KERNEL);
|
|
if (!soft) {
|
|
return NULL;
|
|
}
|
|
|
|
soft->pbi_buscommon.bs_base = (unsigned long)
|
|
ioremap(REGION_OFFSET(soft->pbi_buscommon.bs_base),
|
|
sizeof(struct pic));
|
|
|
|
spin_lock_init(&soft->pbi_lock);
|
|
|
|
/*
|
|
* register the bridge's error interrupt handler
|
|
*/
|
|
if (request_irq(SGI_PCIASIC_ERROR, pcibr_error_intr_handler,
|
|
IRQF_SHARED, "PCIBR error", (void *)(soft))) {
|
|
printk(KERN_WARNING
|
|
"pcibr cannot allocate interrupt for error handler\n");
|
|
}
|
|
irq_set_handler(SGI_PCIASIC_ERROR, handle_level_irq);
|
|
sn_set_err_irq_affinity(SGI_PCIASIC_ERROR);
|
|
|
|
/*
|
|
* Update the Bridge with the "kernel" pagesize
|
|
*/
|
|
if (PAGE_SIZE < 16384) {
|
|
pcireg_control_bit_clr(soft, PCIBR_CTRL_PAGE_SIZE);
|
|
} else {
|
|
pcireg_control_bit_set(soft, PCIBR_CTRL_PAGE_SIZE);
|
|
}
|
|
|
|
nasid = NASID_GET(soft->pbi_buscommon.bs_base);
|
|
cnode = nasid_to_cnodeid(nasid);
|
|
hubdev_info = (struct hubdev_info *)(NODEPDA(cnode)->pdinfo);
|
|
|
|
if (hubdev_info->hdi_flush_nasid_list.widget_p) {
|
|
sn_flush_device_kernel = hubdev_info->hdi_flush_nasid_list.
|
|
widget_p[(int)soft->pbi_buscommon.bs_xid];
|
|
if (sn_flush_device_kernel) {
|
|
for (j = 0; j < DEV_PER_WIDGET;
|
|
j++, sn_flush_device_kernel++) {
|
|
common = sn_flush_device_kernel->common;
|
|
if (common->sfdl_slot == -1)
|
|
continue;
|
|
if ((common->sfdl_persistent_segment ==
|
|
soft->pbi_buscommon.bs_persist_segment) &&
|
|
(common->sfdl_persistent_busnum ==
|
|
soft->pbi_buscommon.bs_persist_busnum))
|
|
common->sfdl_pcibus_info =
|
|
soft;
|
|
}
|
|
}
|
|
}
|
|
|
|
/* Setup the PMU ATE map */
|
|
soft->pbi_int_ate_resource.lowest_free_index = 0;
|
|
soft->pbi_int_ate_resource.ate =
|
|
kcalloc(soft->pbi_int_ate_size, sizeof(u64), GFP_KERNEL);
|
|
|
|
if (!soft->pbi_int_ate_resource.ate) {
|
|
kfree(soft);
|
|
return NULL;
|
|
}
|
|
|
|
return soft;
|
|
}
|
|
|
|
void pcibr_force_interrupt(struct sn_irq_info *sn_irq_info)
|
|
{
|
|
struct pcidev_info *pcidev_info;
|
|
struct pcibus_info *pcibus_info;
|
|
int bit = sn_irq_info->irq_int_bit;
|
|
|
|
if (! sn_irq_info->irq_bridge)
|
|
return;
|
|
|
|
pcidev_info = (struct pcidev_info *)sn_irq_info->irq_pciioinfo;
|
|
if (pcidev_info) {
|
|
pcibus_info =
|
|
(struct pcibus_info *)pcidev_info->pdi_host_pcidev_info->
|
|
pdi_pcibus_info;
|
|
pcireg_force_intr_set(pcibus_info, bit);
|
|
}
|
|
}
|
|
|
|
void pcibr_target_interrupt(struct sn_irq_info *sn_irq_info)
|
|
{
|
|
struct pcidev_info *pcidev_info;
|
|
struct pcibus_info *pcibus_info;
|
|
int bit = sn_irq_info->irq_int_bit;
|
|
u64 xtalk_addr = sn_irq_info->irq_xtalkaddr;
|
|
|
|
pcidev_info = (struct pcidev_info *)sn_irq_info->irq_pciioinfo;
|
|
if (pcidev_info) {
|
|
pcibus_info =
|
|
(struct pcibus_info *)pcidev_info->pdi_host_pcidev_info->
|
|
pdi_pcibus_info;
|
|
|
|
/* Disable the device's IRQ */
|
|
pcireg_intr_enable_bit_clr(pcibus_info, (1 << bit));
|
|
|
|
/* Change the device's IRQ */
|
|
pcireg_intr_addr_addr_set(pcibus_info, bit, xtalk_addr);
|
|
|
|
/* Re-enable the device's IRQ */
|
|
pcireg_intr_enable_bit_set(pcibus_info, (1 << bit));
|
|
|
|
pcibr_force_interrupt(sn_irq_info);
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Provider entries for PIC/CP
|
|
*/
|
|
|
|
struct sn_pcibus_provider pcibr_provider = {
|
|
.dma_map = pcibr_dma_map,
|
|
.dma_map_consistent = pcibr_dma_map_consistent,
|
|
.dma_unmap = pcibr_dma_unmap,
|
|
.bus_fixup = pcibr_bus_fixup,
|
|
.force_interrupt = pcibr_force_interrupt,
|
|
.target_interrupt = pcibr_target_interrupt
|
|
};
|
|
|
|
int
|
|
pcibr_init_provider(void)
|
|
{
|
|
sn_pci_provider[PCIIO_ASIC_TYPE_PIC] = &pcibr_provider;
|
|
sn_pci_provider[PCIIO_ASIC_TYPE_TIOCP] = &pcibr_provider;
|
|
|
|
return 0;
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(sal_pcibr_slot_enable);
|
|
EXPORT_SYMBOL_GPL(sal_pcibr_slot_disable);
|
|
EXPORT_SYMBOL_GPL(sn_ioboard_to_pci_bus);
|