Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85580ea4 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

i7300_edac: pre-allocate a buffer used to prepare err messages 



Instead of dynamically allocating a buffer for it where needed,
just allocate it once. As we'll use the same buffer also during
fatal and non-fatal errors, is is very risky to dynamically allocate
it during an error.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 28c2ce7c

drivers/edac/i7300_edac.c

+24 −17
Original line number Original line Diff line number Diff line
@@ -306,6 +306,9 @@ struct i7300_pvt { 




	/* DIMM information matrix, allocating architecture maximums */

	/* DIMM information matrix, allocating architecture maximums */

	struct i7300_dimm_info dimm_info[MAX_SLOTS][MAX_CHANNELS];

	struct i7300_dimm_info dimm_info[MAX_SLOTS][MAX_CHANNELS];



	/* Temporary buffer for use when preparing error messages */

	char *tmp_prt_buffer;

};

};





/* FIXME: Why do we need to have this static? */

/* FIXME: Why do we need to have this static? */
@@ -611,17 +614,12 @@ static int decode_mtr(struct i7300_pvt *pvt, 
static void print_dimm_size(struct i7300_pvt *pvt)

static void print_dimm_size(struct i7300_pvt *pvt)

{

{

	struct i7300_dimm_info *dinfo;

	struct i7300_dimm_info *dinfo;

	char *p, *mem_buffer;

	char *p;

	int space, n;

	int space, n;

	int channel, slot;

	int channel, slot;





	space = PAGE_SIZE;

	space = PAGE_SIZE;

	mem_buffer = p = kmalloc(space, GFP_KERNEL);

	p = pvt->tmp_prt_buffer;

	if (p == NULL) {

		i7300_printk(KERN_ERR, "MC: %s:%s() kmalloc() failed\n",

			__FILE__, __func__);

		return;

	}





	n = snprintf(p, space, "              ");

	n = snprintf(p, space, "              ");

	p += n;

	p += n;
@@ -631,15 +629,15 @@ static void print_dimm_size(struct i7300_pvt *pvt) 
		p += n;

		p += n;

		space -= n;

		space -= n;

	}

	}

	debugf2("%s\n", mem_buffer);

	debugf2("%s\n", pvt->tmp_prt_buffer);

	p = mem_buffer;

	p = pvt->tmp_prt_buffer;

	space = PAGE_SIZE;

	space = PAGE_SIZE;

	n = snprintf(p, space, "-------------------------------"

	n = snprintf(p, space, "-------------------------------"

		               "------------------------------");

		               "------------------------------");

	p += n;

	p += n;

	space -= n;

	space -= n;

	debugf2("%s\n", mem_buffer);

	debugf2("%s\n", pvt->tmp_prt_buffer);

	p = mem_buffer;

	p = pvt->tmp_prt_buffer;

	space = PAGE_SIZE;

	space = PAGE_SIZE;





	for (slot = 0; slot < MAX_SLOTS; slot++) {

	for (slot = 0; slot < MAX_SLOTS; slot++) {
@@ -654,8 +652,8 @@ static void print_dimm_size(struct i7300_pvt *pvt) 
			space -= n;

			space -= n;

		}

		}





		debugf2("%s\n", mem_buffer);

		debugf2("%s\n", pvt->tmp_prt_buffer);

		p = mem_buffer;

		p = pvt->tmp_prt_buffer;

		space = PAGE_SIZE;

		space = PAGE_SIZE;

	}

	}
@@ -663,11 +661,9 @@ static void print_dimm_size(struct i7300_pvt *pvt) 
		               "------------------------------");

		               "------------------------------");

	p += n;

	p += n;

	space -= n;

	space -= n;

	debugf2("%s\n", mem_buffer);

	debugf2("%s\n", pvt->tmp_prt_buffer);

	p = mem_buffer;

	p = pvt->tmp_prt_buffer;

	space = PAGE_SIZE;

	space = PAGE_SIZE;



	kfree(mem_buffer);

}

}





/*

/*
@@ -978,6 +974,12 @@ static int i7300_probe1(struct pci_dev *pdev, int dev_idx) 
	pvt = mci->pvt_info;

	pvt = mci->pvt_info;

	pvt->pci_dev_16_0_fsb_ctlr = pdev;	/* Record this device in our private */

	pvt->pci_dev_16_0_fsb_ctlr = pdev;	/* Record this device in our private */





	pvt->tmp_prt_buffer = kmalloc(PAGE_SIZE, GFP_KERNEL);

	if (!pvt->tmp_prt_buffer) {

		edac_mc_free(mci);

		return -ENOMEM;

	}



	/* 'get' the pci devices we want to reserve for our use */

	/* 'get' the pci devices we want to reserve for our use */

	if (i7300_get_devices(mci, dev_idx))

	if (i7300_get_devices(mci, dev_idx))

		goto fail0;

		goto fail0;
@@ -1038,6 +1040,7 @@ static int i7300_probe1(struct pci_dev *pdev, int dev_idx) 
	i7300_put_devices(mci);

	i7300_put_devices(mci);





fail0:

fail0:

	kfree(pvt->tmp_prt_buffer);

	edac_mc_free(mci);

	edac_mc_free(mci);

	return -ENODEV;

	return -ENODEV;

}

}
@@ -1072,6 +1075,7 @@ static int __devinit i7300_init_one(struct pci_dev *pdev, 
static void __devexit i7300_remove_one(struct pci_dev *pdev)

static void __devexit i7300_remove_one(struct pci_dev *pdev)

{

{

	struct mem_ctl_info *mci;

	struct mem_ctl_info *mci;

	char *tmp;





	debugf0(__FILE__ ": %s()\n", __func__);

	debugf0(__FILE__ ": %s()\n", __func__);
@@ -1082,9 +1086,12 @@ static void __devexit i7300_remove_one(struct pci_dev *pdev) 
	if (!mci)

	if (!mci)

		return;

		return;





	tmp = ((struct i7300_pvt *)mci->pvt_info)->tmp_prt_buffer;



	/* retrieve references to resources, and free those resources */

	/* retrieve references to resources, and free those resources */

	i7300_put_devices(mci);

	i7300_put_devices(mci);





	kfree(tmp);

	edac_mc_free(mci);

	edac_mc_free(mci);

}

}