Commit 86f0a9c8 authored by Christophe Leroy's avatar Christophe Leroy Committed by Greg Kroah-Hartman
Browse files

serial: cpm_uart: Refactor cpm_uart_allocbuf()/cpm_uart_freebuf() 



cpm_uart_freebuf() is identical for CPM1 and CPM2.

cpm_uart_allocbuf() only has a small difference between CPM1 and CPM2
as shown below:

CPM1:
	if (is_con) {
		/* was hostalloc but changed cause it blows away the */
		/* large tlb mapping when pinning the kernel area    */
		mem_addr = (u8 *) cpm_dpram_addr(cpm_dpalloc(memsz, 8));
		dma_addr = (u32)cpm_dpram_phys(mem_addr);
	} else
		mem_addr = dma_alloc_coherent(pinfo->port.dev, memsz, &dma_addr,
					      GFP_KERNEL);

CPM2:

	if (is_con) {
		mem_addr = kzalloc(memsz, GFP_NOWAIT);
		dma_addr = virt_to_bus(mem_addr);
	}
	else
		mem_addr = dma_alloc_coherent(pinfo->port.dev, memsz, &dma_addr,
					      GFP_KERNEL);

Refactor this by using IS_ENABLED(CONFIG_CPM1)
and move both functions in cpm_uart_core.c as they are used only there.

While doing this, add the necessary casts to silence sparse for the CPM1
part. This is because a dma alloc is not expected to be an iomem but
for CPM1 as we use DPRAM this is seen as iomem.

Also replace calls to cpm_dpxxxx() by relevant cpm_muram_xxxx() calls.
This is needed at least for cpm_dpram_phys() which is only defined
for CPM1. Just do the same for all so that cpm_dpxxxx() macros can get
droped in the future.

To silence checkpatch, replace printk(KERN_ERR by pr_err( and display
function name instead of hard coded filename. Also replace
mem_addr == NULL by !mem_addr.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Link: https://lore.kernel.org/r/606dfdd258a4f2f2882e2e189bef37526bb3b499.1691068700.git.christophe.leroy@csgroup.eu


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ae8261ed

drivers/tty/serial/cpm_uart/cpm_uart.h

+0 −2
Original line number Diff line number Diff line
@@ -79,8 +79,6 @@ struct uart_cpm_port { 
void __iomem *cpm_uart_map_pram(struct uart_cpm_port *port,

				struct device_node *np);

void cpm_uart_unmap_pram(struct uart_cpm_port *port, void __iomem *pram);

int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con);

void cpm_uart_freebuf(struct uart_cpm_port *pinfo);



/*

   virtual to phys transtalion

drivers/tty/serial/cpm_uart/cpm_uart_core.c

+72 −0
Original line number Diff line number Diff line
@@ -868,6 +868,78 @@ static void cpm_uart_init_smc(struct uart_cpm_port *pinfo) 
	setbits16(&sp->smc_smcmr, SMCMR_REN | SMCMR_TEN);

}



/*

 * Allocate DP-Ram and memory buffers. We need to allocate a transmit and

 * receive buffer descriptors from dual port ram, and a character

 * buffer area from host mem. If we are allocating for the console we need

 * to do it from bootmem

 */

static int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con)

{

	int dpmemsz, memsz;

	u8 __iomem *dp_mem;

	unsigned long dp_offset;

	u8 *mem_addr;

	dma_addr_t dma_addr = 0;



	pr_debug("CPM uart[%d]:allocbuf\n", pinfo->port.line);



	dpmemsz = sizeof(cbd_t) * (pinfo->rx_nrfifos + pinfo->tx_nrfifos);

	dp_offset = cpm_muram_alloc(dpmemsz, 8);

	if (IS_ERR_VALUE(dp_offset)) {

		pr_err("%s: could not allocate buffer descriptors\n", __func__);

		return -ENOMEM;

	}



	dp_mem = cpm_muram_addr(dp_offset);



	memsz = L1_CACHE_ALIGN(pinfo->rx_nrfifos * pinfo->rx_fifosize) +

	    L1_CACHE_ALIGN(pinfo->tx_nrfifos * pinfo->tx_fifosize);

	if (IS_ENABLED(CONFIG_CPM1) && is_con) {

		/* was hostalloc but changed cause it blows away the */

		/* large tlb mapping when pinning the kernel area    */

		mem_addr = (u8 __force *)cpm_muram_addr(cpm_muram_alloc(memsz, 8));

		dma_addr = cpm_muram_dma((void __iomem *)mem_addr);

	} else if (is_con) {

		mem_addr = kzalloc(memsz, GFP_NOWAIT);

		dma_addr = virt_to_bus(mem_addr);

	} else {

		mem_addr = dma_alloc_coherent(pinfo->port.dev, memsz, &dma_addr,

					      GFP_KERNEL);

	}



	if (!mem_addr) {

		cpm_muram_free(dp_offset);

		pr_err("%s: could not allocate coherent memory\n", __func__);

		return -ENOMEM;

	}



	pinfo->dp_addr = dp_offset;

	pinfo->mem_addr = mem_addr;

	pinfo->dma_addr = dma_addr;

	pinfo->mem_size = memsz;



	pinfo->rx_buf = mem_addr;

	pinfo->tx_buf = pinfo->rx_buf + L1_CACHE_ALIGN(pinfo->rx_nrfifos

						       * pinfo->rx_fifosize);



	pinfo->rx_bd_base = (cbd_t __iomem *)dp_mem;

	pinfo->tx_bd_base = pinfo->rx_bd_base + pinfo->rx_nrfifos;



	return 0;

}



static void cpm_uart_freebuf(struct uart_cpm_port *pinfo)

{

	dma_free_coherent(pinfo->port.dev, L1_CACHE_ALIGN(pinfo->rx_nrfifos *

							  pinfo->rx_fifosize) +

			  L1_CACHE_ALIGN(pinfo->tx_nrfifos *

					 pinfo->tx_fifosize), (void __force *)pinfo->mem_addr,

			  pinfo->dma_addr);



	cpm_muram_free(pinfo->dp_addr);

}



/*

 * Initialize port. This is called from early_console stuff

 * so we have to be careful here !

drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c

+0 −69
Original line number Diff line number Diff line
@@ -46,72 +46,3 @@ void cpm_uart_unmap_pram(struct uart_cpm_port *port, void __iomem *pram) 
{

	iounmap(pram);

}
 


/*

 * Allocate DP-Ram and memory buffers. We need to allocate a transmit and

 * receive buffer descriptors from dual port ram, and a character

 * buffer area from host mem. If we are allocating for the console we need

 * to do it from bootmem

 */

int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con)

{

	int dpmemsz, memsz;

	u8 *dp_mem;

	unsigned long dp_offset;

	u8 *mem_addr;

	dma_addr_t dma_addr = 0;



	pr_debug("CPM uart[%d]:allocbuf\n", pinfo->port.line);



	dpmemsz = sizeof(cbd_t) * (pinfo->rx_nrfifos + pinfo->tx_nrfifos);

	dp_offset = cpm_dpalloc(dpmemsz, 8);

	if (IS_ERR_VALUE(dp_offset)) {

		printk(KERN_ERR

		       "cpm_uart_cpm1.c: could not allocate buffer descriptors\n");

		return -ENOMEM;

	}

	dp_mem = cpm_dpram_addr(dp_offset);



	memsz = L1_CACHE_ALIGN(pinfo->rx_nrfifos * pinfo->rx_fifosize) +

	    L1_CACHE_ALIGN(pinfo->tx_nrfifos * pinfo->tx_fifosize);

	if (is_con) {

		/* was hostalloc but changed cause it blows away the */

		/* large tlb mapping when pinning the kernel area    */

		mem_addr = (u8 *) cpm_dpram_addr(cpm_dpalloc(memsz, 8));

		dma_addr = (u32)cpm_dpram_phys(mem_addr);

	} else

		mem_addr = dma_alloc_coherent(pinfo->port.dev, memsz, &dma_addr,

					      GFP_KERNEL);



	if (mem_addr == NULL) {

		cpm_dpfree(dp_offset);

		printk(KERN_ERR

		       "cpm_uart_cpm1.c: could not allocate coherent memory\n");

		return -ENOMEM;

	}



	pinfo->dp_addr = dp_offset;

	pinfo->mem_addr = mem_addr;             /*  virtual address*/

	pinfo->dma_addr = dma_addr;             /*  physical address*/

	pinfo->mem_size = memsz;



	pinfo->rx_buf = mem_addr;

	pinfo->tx_buf = pinfo->rx_buf + L1_CACHE_ALIGN(pinfo->rx_nrfifos

						       * pinfo->rx_fifosize);



	pinfo->rx_bd_base = (cbd_t __iomem __force *)dp_mem;

	pinfo->tx_bd_base = pinfo->rx_bd_base + pinfo->rx_nrfifos;



	return 0;

}



void cpm_uart_freebuf(struct uart_cpm_port *pinfo)

{

	dma_free_coherent(pinfo->port.dev, L1_CACHE_ALIGN(pinfo->rx_nrfifos *

							  pinfo->rx_fifosize) +

			  L1_CACHE_ALIGN(pinfo->tx_nrfifos *

					 pinfo->tx_fifosize), pinfo->mem_addr,

			  pinfo->dma_addr);



	cpm_dpfree(pinfo->dp_addr);

}

drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c

+0 −69
Original line number Diff line number Diff line
@@ -80,72 +80,3 @@ void cpm_uart_unmap_pram(struct uart_cpm_port *port, void __iomem *pram) 
	if (!IS_SMC(port))

		iounmap(pram);

}
 


/*

 * Allocate DP-Ram and memory buffers. We need to allocate a transmit and

 * receive buffer descriptors from dual port ram, and a character

 * buffer area from host mem. If we are allocating for the console we need

 * to do it from bootmem

 */

int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con)

{

	int dpmemsz, memsz;

	u8 __iomem *dp_mem;

	unsigned long dp_offset;

	u8 *mem_addr;

	dma_addr_t dma_addr = 0;



	pr_debug("CPM uart[%d]:allocbuf\n", pinfo->port.line);



	dpmemsz = sizeof(cbd_t) * (pinfo->rx_nrfifos + pinfo->tx_nrfifos);

	dp_offset = cpm_dpalloc(dpmemsz, 8);

	if (IS_ERR_VALUE(dp_offset)) {

		printk(KERN_ERR

		       "cpm_uart_cpm.c: could not allocate buffer descriptors\n");

		return -ENOMEM;

	}



	dp_mem = cpm_dpram_addr(dp_offset);



	memsz = L1_CACHE_ALIGN(pinfo->rx_nrfifos * pinfo->rx_fifosize) +

	    L1_CACHE_ALIGN(pinfo->tx_nrfifos * pinfo->tx_fifosize);

	if (is_con) {

		mem_addr = kzalloc(memsz, GFP_NOWAIT);

		dma_addr = virt_to_bus(mem_addr);

	}

	else

		mem_addr = dma_alloc_coherent(pinfo->port.dev, memsz, &dma_addr,

					      GFP_KERNEL);



	if (mem_addr == NULL) {

		cpm_dpfree(dp_offset);

		printk(KERN_ERR

		       "cpm_uart_cpm.c: could not allocate coherent memory\n");

		return -ENOMEM;

	}



	pinfo->dp_addr = dp_offset;

	pinfo->mem_addr = mem_addr;

	pinfo->dma_addr = dma_addr;

	pinfo->mem_size = memsz;



	pinfo->rx_buf = mem_addr;

	pinfo->tx_buf = pinfo->rx_buf + L1_CACHE_ALIGN(pinfo->rx_nrfifos

						       * pinfo->rx_fifosize);



	pinfo->rx_bd_base = (cbd_t __iomem *)dp_mem;

	pinfo->tx_bd_base = pinfo->rx_bd_base + pinfo->rx_nrfifos;



	return 0;

}



void cpm_uart_freebuf(struct uart_cpm_port *pinfo)

{

	dma_free_coherent(pinfo->port.dev, L1_CACHE_ALIGN(pinfo->rx_nrfifos *

							  pinfo->rx_fifosize) +

			  L1_CACHE_ALIGN(pinfo->tx_nrfifos *

					 pinfo->tx_fifosize), (void __force *)pinfo->mem_addr,

			  pinfo->dma_addr);



	cpm_dpfree(pinfo->dp_addr);

}