2010-04-01 12:48:52

by Luis Correia

Subject: [PATCH] Remove MCU requests for SoC platforms

The ralink SoC platforms do not have an MCU.

Signed-off-by: Luis Correia <[email protected]>
---

--- a/drivers/net/wireless/rt2x00/rt2800lib.c 2010-03-26
18:25:50.000000000 +0000
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c 2010-04-01
13:05:18.249747122 +0100
@@ -221,9 +221,9 @@
u32 reg;

/*
- * SOC devices don't support MCU requests.
+ * some devices don't support MCU requests.
*/
- if (rt2x00_is_soc(rt2x00dev))
+ if (!test_bit(DRIVER_REQUIRE_MCU, &rt2x00dev->flags))
return;

mutex_lock(&rt2x00dev->csr_mutex);
--- a/drivers/net/wireless/rt2x00/rt2800pci.c 2010-03-26
18:25:50.000000000 +0000
+++ b/drivers/net/wireless/rt2x00/rt2800pci.c 2010-04-01
13:04:42.453621607 +0100
@@ -59,6 +59,12 @@
{
unsigned int i;
u32 reg;
+
+ /*
+ * some devices don't support MCU requests.
+ */
+ if (!test_bit(DRIVER_REQUIRE_MCU, &rt2x00dev->flags))
+ return;

for (i = 0; i < 200; i++) {
rt2800_register_read(rt2x00dev, H2M_MAILBOX_CID, &reg);
@@ -1100,8 +1106,10 @@
/*
* This device requires firmware and MCU access.
*/
- if (!rt2x00_is_soc(rt2x00dev))
+ if (!rt2x00_is_soc(rt2x00dev)) {
__set_bit(DRIVER_REQUIRE_FIRMWARE, &rt2x00dev->flags);
+ __set_bit(DRIVER_REQUIRE_MCU, &rt2x00dev->flags);
+ }
__set_bit(DRIVER_REQUIRE_DMA, &rt2x00dev->flags);
__set_bit(DRIVER_REQUIRE_L2PAD, &rt2x00dev->flags);
if (!modparam_nohwcrypt)
--- a/drivers/net/wireless/rt2x00/rt2x00.h 2010-03-26 18:25:50.000000000 +0000
+++ b/drivers/net/wireless/rt2x00/rt2x00.h 2010-04-01 13:01:26.812694036 +0100
@@ -631,6 +631,7 @@
* Driver requirements
*/
DRIVER_REQUIRE_FIRMWARE,
+ DRIVER_REQUIRE_MCU,
DRIVER_REQUIRE_BEACON_GUARD,
DRIVER_REQUIRE_ATIM_QUEUE,
DRIVER_REQUIRE_DMA,

2010-04-01 12:51:47

by Ivo Van Doorn

Subject: Re: [PATCH] Remove MCU requests for SoC platforms

Hi,

> @@ -1100,8 +1106,10 @@
> /*
> * This device requires firmware and MCU access.
> */

You manually edited your patch didn't you? :P
This doesn't apply since you changed the comment line.

Ivo

2010-04-01 20:16:45

by Kalle Valo

Subject: Re: [PATCH V2] Remove MCU requests for SoC platforms

Luis Correia <[email protected]> writes:

> The ralink SoC platforms do not have an MCU.

Please add a prefix to the title to specify the component. Something
like this:

rtx2x00: remove MCU requests for SoC platforms

--
Kalle Valo

2010-04-01 12:58:23

by Luis Correia

Subject: [PATCH V2] Remove MCU requests for SoC platforms

The ralink SoC platforms do not have an MCU.

Signed-off-by: Luis Correia <[email protected]>
---

--- a/drivers/net/wireless/rt2x00/rt2800lib.c 2010-03-26
18:25:50.000000000 +0000
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c 2010-04-01
13:05:18.249747122 +0100
@@ -221,9 +221,9 @@
u32 reg;

/*
- * SOC devices don't support MCU requests.
+ * some devices don't support MCU requests.
*/
- if (rt2x00_is_soc(rt2x00dev))
+ if (!test_bit(DRIVER_REQUIRE_MCU, &rt2x00dev->flags))
return;

mutex_lock(&rt2x00dev->csr_mutex);
--- a/drivers/net/wireless/rt2x00/rt2800pci.c 2010-03-26
18:25:50.000000000 +0000
+++ b/drivers/net/wireless/rt2x00/rt2800pci.c 2010-04-01
13:04:42.453621607 +0100
@@ -59,6 +59,12 @@
{
unsigned int i;
u32 reg;
+
+ /*
+ * some devices don't support MCU requests.
+ */
+ if (!test_bit(DRIVER_REQUIRE_MCU, &rt2x00dev->flags))
+ return;

for (i = 0; i < 200; i++) {
rt2800_register_read(rt2x00dev, H2M_MAILBOX_CID, &reg);
@@ -1098,10 +1104,12 @@
__set_bit(DRIVER_SUPPORT_CONTROL_FILTER_PSPOLL, &rt2x00dev->flags);

/*
- * This device requires firmware.
+ * This device requires firmware and MCU access.
*/
- if (!rt2x00_is_soc(rt2x00dev))
+ if (!rt2x00_is_soc(rt2x00dev)){
__set_bit(DRIVER_REQUIRE_FIRMWARE, &rt2x00dev->flags);
+ __set_bit(DRIVER_REQUIRE_MCU, &rt2x00dev->flags);
+ }
__set_bit(DRIVER_REQUIRE_DMA, &rt2x00dev->flags);
__set_bit(DRIVER_REQUIRE_L2PAD, &rt2x00dev->flags);
if (!modparam_nohwcrypt)
--- a/drivers/net/wireless/rt2x00/rt2x00.h 2010-03-26 18:25:50.000000000 +0000
+++ b/drivers/net/wireless/rt2x00/rt2x00.h 2010-04-01 13:01:26.812694036 +0100
@@ -631,6 +631,7 @@
* Driver requirements
*/
DRIVER_REQUIRE_FIRMWARE,
+ DRIVER_REQUIRE_MCU,
DRIVER_REQUIRE_BEACON_GUARD,
DRIVER_REQUIRE_ATIM_QUEUE,
DRIVER_REQUIRE_DMA,

2010-04-01 13:03:00

by Ivo Van Doorn

Subject: Re: [PATCH V2] Remove MCU requests for SoC platforms

On Thursday 01 April 2010, Luis Correia wrote:
> The ralink SoC platforms do not have an MCU.
>
> Signed-off-by: Luis Correia <[email protected]>


Acked-by: Ivo van Doorn <[email protected]>