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

Commit c43ff3f2 authored by Min Guo's avatar Min Guo Committed by Macpaul Lin
Browse files

UPSTREAM: usb: musb: Add noirq type of dma create interface 



Add noirq type of dma create interface for platform which do not
have dedicated DMA interrupt line, move musbhsdma macro definition
to musb_dma.h

Bug: 158724613
Signed-off-by: default avatarMin Guo <min.guo@mediatek.com>
Signed-off-by: default avatarBin Liu <b-liu@ti.com>
Link: https://lore.kernel.org/r/20200115132547.364-22-b-liu@ti.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarMacpaul Lin <macpaul.lin@mediatek.com>
(cherry picked from commit edce61776c7e212d8b3d61e69afe7672efbacb04)
Change-Id: I23aba994ccc417b78a838f62021d795d70080c84
parent 60f8509f

drivers/usb/musb/musb_dma.h

+9 −0
Original line number Diff line number Diff line
@@ -35,6 +35,12 @@ struct musb_hw_ep; 
 *    whether shared with the Inventra core or separate.

 */



#define MUSB_HSDMA_BASE		0x200

#define MUSB_HSDMA_INTR		(MUSB_HSDMA_BASE + 0)

#define MUSB_HSDMA_CONTROL	0x4

#define MUSB_HSDMA_ADDRESS	0x8

#define MUSB_HSDMA_COUNT	0xc



#define	DMA_ADDR_INVALID	(~(dma_addr_t)0)



#ifdef CONFIG_MUSB_PIO_ONLY
@@ -191,6 +197,9 @@ extern void (*musb_dma_controller_destroy)(struct dma_controller *); 
extern struct dma_controller *

musbhs_dma_controller_create(struct musb *musb, void __iomem *base);

extern void musbhs_dma_controller_destroy(struct dma_controller *c);

extern struct dma_controller *

musbhs_dma_controller_create_noirq(struct musb *musb, void __iomem *base);

extern irqreturn_t dma_controller_irq(int irq, void *private_data);



extern struct dma_controller *

tusb_dma_controller_create(struct musb *musb, void __iomem *base);

drivers/usb/musb/musbhsdma.c

+37 −17
Original line number Diff line number Diff line
@@ -10,12 +10,7 @@ 
#include <linux/platform_device.h>

#include <linux/slab.h>

#include "musb_core.h"



#define MUSB_HSDMA_BASE		0x200

#define MUSB_HSDMA_INTR		(MUSB_HSDMA_BASE + 0)

#define MUSB_HSDMA_CONTROL		0x4

#define MUSB_HSDMA_ADDRESS		0x8

#define MUSB_HSDMA_COUNT		0xc

#include "musb_dma.h"



#define MUSB_HSDMA_CHANNEL_OFFSET(_bchannel, _offset)		\

		(MUSB_HSDMA_BASE + (_bchannel << 4) + _offset)
@@ -268,7 +263,7 @@ static int dma_channel_abort(struct dma_channel *channel) 
	return 0;

}



static irqreturn_t dma_controller_irq(int irq, void *private_data)

irqreturn_t dma_controller_irq(int irq, void *private_data)

{

	struct musb_dma_controller *controller = private_data;

	struct musb *musb = controller->private_data;
@@ -383,6 +378,7 @@ static irqreturn_t dma_controller_irq(int irq, void *private_data) 
	spin_unlock_irqrestore(&musb->lock, flags);

	return retval;

}

EXPORT_SYMBOL_GPL(dma_controller_irq);



void musbhs_dma_controller_destroy(struct dma_controller *c)

{
@@ -398,18 +394,10 @@ void musbhs_dma_controller_destroy(struct dma_controller *c) 
}

EXPORT_SYMBOL_GPL(musbhs_dma_controller_destroy);



struct dma_controller *musbhs_dma_controller_create(struct musb *musb,

						    void __iomem *base)

static struct musb_dma_controller *

dma_controller_alloc(struct musb *musb, void __iomem *base)

{

	struct musb_dma_controller *controller;

	struct device *dev = musb->controller;

	struct platform_device *pdev = to_platform_device(dev);

	int irq = platform_get_irq_byname(pdev, "dma");



	if (irq <= 0) {

		dev_err(dev, "No DMA interrupt line!\n");

		return NULL;

	}



	controller = kzalloc(sizeof(*controller), GFP_KERNEL);

	if (!controller)
@@ -423,6 +411,25 @@ struct dma_controller *musbhs_dma_controller_create(struct musb *musb, 
	controller->controller.channel_release = dma_channel_release;

	controller->controller.channel_program = dma_channel_program;

	controller->controller.channel_abort = dma_channel_abort;

	return controller;

}



struct dma_controller *

musbhs_dma_controller_create(struct musb *musb, void __iomem *base)

{

	struct musb_dma_controller *controller;

	struct device *dev = musb->controller;

	struct platform_device *pdev = to_platform_device(dev);

	int irq = platform_get_irq_byname(pdev, "dma");



	if (irq <= 0) {

		dev_err(dev, "No DMA interrupt line!\n");

		return NULL;

	}



	controller = dma_controller_alloc(musb, base);

	if (!controller)

		return NULL;



	if (request_irq(irq, dma_controller_irq, 0,

			dev_name(musb->controller), controller)) {
@@ -437,3 +444,16 @@ struct dma_controller *musbhs_dma_controller_create(struct musb *musb, 
	return &controller->controller;

}

EXPORT_SYMBOL_GPL(musbhs_dma_controller_create);



struct dma_controller *

musbhs_dma_controller_create_noirq(struct musb *musb, void __iomem *base)

{

	struct musb_dma_controller *controller;



	controller = dma_controller_alloc(musb, base);

	if (!controller)

		return NULL;



	return &controller->controller;

}

EXPORT_SYMBOL_GPL(musbhs_dma_controller_create_noirq);