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

Commit 90bc70e2 authored by Niranjana Vishwanathapura's avatar Niranjana Vishwanathapura Committed by Gerrit - the friendly Code Review server
Browse files

msm: emac: Update IRQ resource handling 



Update code to get IRQs as platform resource.
Also embed the IRQ information in ethernet adapter data structure
so as to support multiple EMAC hardware instances by the driver.

Change-Id: I16d0ee0777e3a183bac4b306f9b79feab0670094
Signed-off-by: default avatarNiranjana Vishwanathapura <nvishwan@codeaurora.org>
parent 0cabfa0f

drivers/net/ethernet/msm/emac/emac.h

+2 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#define EMAC_DMA_ADDR_LO(_addr) \

		((u32)((u64)(_addr) & DMA_ADDR_LO_MASK))



/* 4 emac core irqs */

#define EMAC_NUM_CORE_IRQ     4



#define EMAC_LINK_SPEED_UNKNOWN         0x0
@@ -567,7 +568,7 @@ struct emac_tx_queue { 
struct emac_adapter {

	struct net_device *netdev;



	struct emac_irq_info *irq_info;

	struct emac_irq_info  irq_info[EMAC_NUM_CORE_IRQ];



	/* dma parameters */

	u64                             dma_mask;

drivers/net/ethernet/msm/emac/emac_main.c

+18 −6
Original line number Diff line number Diff line
@@ -2065,6 +2065,17 @@ static int emac_get_resources(struct platform_device *pdev, 
	void *reg_base[NUM_EMAC_REG_BASES] = { 0 };

	char *res_name[NUM_EMAC_REG_BASES] = {"emac", "emac_csr", "emac_1588"};



	/* get irqs */

	for (i = 0; i < EMAC_NUM_CORE_IRQ; i++) {

		struct emac_irq_info *irq_info = &adpt->irq_info[i];

		retval = platform_get_irq_byname(pdev, irq_info->name);

		if (retval < 0)

			goto err_res;



		irq_info->irq = retval;

	}



	/* get register addresses */

	for (i = 0; i < NUM_EMAC_REG_BASES; i++) {

		if ((i == EMAC_1588) && !adpt->tstamp_en)

			continue;
@@ -2096,6 +2107,7 @@ static int emac_get_resources(struct platform_device *pdev, 
		netdev->base_addr = (unsigned long)adpt->hw.reg_addr[EMAC];

	}



err_res:

	return retval;

}
@@ -2144,17 +2156,17 @@ static int emac_probe(struct platform_device *pdev) 
	dma_set_max_seg_size(&pdev->dev, 65536);

	dma_set_seg_boundary(&pdev->dev, 0xffffffff);



	adpt->tstamp_en = true;

	retval = emac_get_resources(pdev, adpt);

	if (retval)

		goto err_res;



	adpt->irq_info = emac_irq;

	memcpy(adpt->irq_info, emac_irq, sizeof(adpt->irq_info));

	for (i = 0; i < EMAC_NUM_CORE_IRQ; i++) {

		adpt->irq_info[i].adpt = adpt;

		adpt->irq_info[i].rxque = &adpt->rx_queue[i];

	}



	adpt->tstamp_en = true;

	retval = emac_get_resources(pdev, adpt);

	if (retval)

		goto err_res;



	hw_ver = emac_reg_r32(hw, EMAC, EMAC_CORE_HW_VERSION);



	netdev->watchdog_timeo = EMAC_WATCHDOG_TIME;