[PATCH 1/2] net: macb: Include multi queue support for xilinx ZynqMP ethernet version

[PATCH 1/2] net: macb: Include multi queue support for xilinx ZynqMP ethernet version

[Michal Simek]

From: Punnaiah Choudary Kalluri <punnaiah.choudary.kalluri@xilinx.com>

Include multi queue support for the ethernet IP version in xilinx ZynqMP
SoC.

Signed-off-by: Punnaiah Choudary Kalluri <punnaia@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

 drivers/net/ethernet/cadence/macb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
index ad76b8e35a00..24b1eb466e52 100644
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c
@@ -2192,7 +2192,7 @@ static void macb_probe_queues(void __iomem *mem,
 
 	/* is it macb or gem ? */
 	mid = __raw_readl(mem + MACB_MID);
-	if (MACB_BFEXT(IDNUM, mid) != 0x2)
+	if (MACB_BFEXT(IDNUM, mid) < 0x2)
 		return;
 
 	/* bit 0 is never set but queue 0 always exists */
-- 
1.8.2.3

[PATCH 2/2] net: macb: Fix multi queue support for xilinx ZynqMP soc

[Michal Simek]

From: Punnaiah Choudary Kalluri <punnaiah.choudary.kalluri@xilinx.com>

ZynqMP soc has single interrupt for all the queue events. So,
passing the IRQF_SHARED flag for interrupt registration call.

Signed-off-by: Punnaiah Choudary Kalluri <punnaia@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

 drivers/net/ethernet/cadence/macb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
index 24b1eb466e52..0493c3e6bbbe 100644
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c
@@ -2319,7 +2319,7 @@ static int macb_probe(struct platform_device *pdev)
 		 */
 		queue->irq = platform_get_irq(pdev, q);
 		err = devm_request_irq(&pdev->dev, queue->irq, macb_interrupt,
-				       0, dev->name, queue);
+				       IRQF_SHARED, dev->name, queue);
 		if (err) {
 			dev_err(&pdev->dev,
 				"Unable to request IRQ %d (error %d)\n",
-- 
1.8.2.3

Re: [PATCH 1/2] net: macb: Include multi queue support for xilinx ZynqMP ethernet version

[Michal Simek]

[-- Attachment #1: Type: text/plain, Size: 1422 bytes --]

Hi Nicolas,

On 03/05/2015 02:04 PM, Michal Simek wrote:
> From: Punnaiah Choudary Kalluri <punnaiah.choudary.kalluri@xilinx.com>
> 
> Include multi queue support for the ethernet IP version in xilinx ZynqMP
> SoC.
> 
> Signed-off-by: Punnaiah Choudary Kalluri <punnaia@xilinx.com>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> ---
> 
>  drivers/net/ethernet/cadence/macb.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
> index ad76b8e35a00..24b1eb466e52 100644
> --- a/drivers/net/ethernet/cadence/macb.c
> +++ b/drivers/net/ethernet/cadence/macb.c
> @@ -2192,7 +2192,7 @@ static void macb_probe_queues(void __iomem *mem,
>  
>  	/* is it macb or gem ? */
>  	mid = __raw_readl(mem + MACB_MID);
> -	if (MACB_BFEXT(IDNUM, mid) != 0x2)
> +	if (MACB_BFEXT(IDNUM, mid) < 0x2)
>  		return;
>  
>  	/* bit 0 is never set but queue 0 always exists */
> 

Can you please check this?
(There will be definitely v2 because I forget to base it on net-next).

Thanks,
Michal

-- 
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: [PATCH 1/2] net: macb: Include multi queue support for xilinx ZynqMP ethernet version

[Nicolas Ferre]

Le 05/03/2015 15:00, Michal Simek a écrit :
> Hi Nicolas,
> 
> On 03/05/2015 02:04 PM, Michal Simek wrote:
>> From: Punnaiah Choudary Kalluri <punnaiah.choudary.kalluri@xilinx.com>
>>
>> Include multi queue support for the ethernet IP version in xilinx ZynqMP
>> SoC.
>>
>> Signed-off-by: Punnaiah Choudary Kalluri <punnaia@xilinx.com>
>> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
>> ---
>>
>>  drivers/net/ethernet/cadence/macb.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
>> index ad76b8e35a00..24b1eb466e52 100644
>> --- a/drivers/net/ethernet/cadence/macb.c
>> +++ b/drivers/net/ethernet/cadence/macb.c
>> @@ -2192,7 +2192,7 @@ static void macb_probe_queues(void __iomem *mem,
>>  
>>  	/* is it macb or gem ? */
>>  	mid = __raw_readl(mem + MACB_MID);
>> -	if (MACB_BFEXT(IDNUM, mid) != 0x2)
>> +	if (MACB_BFEXT(IDNUM, mid) < 0x2)
>>  		return;
>>  
>>  	/* bit 0 is never set but queue 0 always exists */
>>
> 
> Can you please check this?
> (There will be definitely v2 because I forget to base it on net-next).

Michal,

It seems correct to me: you can add my:
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>

Bye,
-- 
Nicolas Ferre

Re: [PATCH 2/2] net: macb: Fix multi queue support for xilinx ZynqMP soc

[Nicolas Ferre]

Le 05/03/2015 14:04, Michal Simek a écrit :
> From: Punnaiah Choudary Kalluri <punnaiah.choudary.kalluri@xilinx.com>
> 
> ZynqMP soc has single interrupt for all the queue events. So,
> passing the IRQF_SHARED flag for interrupt registration call.
> 
> Signed-off-by: Punnaiah Choudary Kalluri <punnaia@xilinx.com>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>

Ok then:
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>

> ---
> 
>  drivers/net/ethernet/cadence/macb.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
> index 24b1eb466e52..0493c3e6bbbe 100644
> --- a/drivers/net/ethernet/cadence/macb.c
> +++ b/drivers/net/ethernet/cadence/macb.c
> @@ -2319,7 +2319,7 @@ static int macb_probe(struct platform_device *pdev)
>  		 */
>  		queue->irq = platform_get_irq(pdev, q);
>  		err = devm_request_irq(&pdev->dev, queue->irq, macb_interrupt,
> -				       0, dev->name, queue);
> +				       IRQF_SHARED, dev->name, queue);
>  		if (err) {
>  			dev_err(&pdev->dev,
>  				"Unable to request IRQ %d (error %d)\n",
> 


-- 
Nicolas Ferre