Re: linux-next: Tree for May 12 (ssb)

Re: linux-next: Tree for May 12 (ssb)

[Randy Dunlap]

On Thu, 12 May 2011 14:23:03 +1000 Stephen Rothwell wrote:

> Hi all,
> 
> Changes since 20110511:


on i386 and x86_64 (many randconfigs fail with these errors):

drivers/ssb/main.c:1336: error: 'SSB_PCICORE_BCAST_ADDR' undeclared (first use in this function)
drivers/ssb/main.c:1337: error: 'SSB_PCICORE_BCAST_DATA' undeclared (first use in this function)
drivers/ssb/main.c:1349: error: 'struct ssb_pcicore' has no member named 'dev'

---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

[PATCH] ssb: fix pcicore build breakage

[John W. Linville]

drivers/ssb/main.c:1336: error: 'SSB_PCICORE_BCAST_ADDR' undeclared (first use in this function)
drivers/ssb/main.c:1337: error: 'SSB_PCICORE_BCAST_DATA' undeclared (first use in this function)
drivers/ssb/main.c:1349: error: 'struct ssb_pcicore' has no member named 'dev'

Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---
 drivers/ssb/main.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c
index ee2937c..a53fc4d 100644
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
@@ -1332,6 +1332,7 @@ EXPORT_SYMBOL(ssb_bus_powerup);
 static void ssb_broadcast_value(struct ssb_device *dev,
 				u32 address, u32 data)
 {
+#ifdef CONFIG_SSB_DRIVER_PCICORE
 	/* This is used for both, PCI and ChipCommon core, so be careful. */
 	BUILD_BUG_ON(SSB_PCICORE_BCAST_ADDR != SSB_CHIPCO_BCAST_ADDR);
 	BUILD_BUG_ON(SSB_PCICORE_BCAST_DATA != SSB_CHIPCO_BCAST_DATA);
@@ -1340,6 +1341,7 @@ static void ssb_broadcast_value(struct ssb_device *dev,
 	ssb_read32(dev, SSB_PCICORE_BCAST_ADDR); /* flush */
 	ssb_write32(dev, SSB_PCICORE_BCAST_DATA, data);
 	ssb_read32(dev, SSB_PCICORE_BCAST_DATA); /* flush */
+#endif
 }
 
 void ssb_commit_settings(struct ssb_bus *bus)
-- 
1.7.4.4

Re: linux-next: Tree for May 12 (ssb)

[Rafał Miłecki]

2011/5/13 Randy Dunlap <randy.dunlap@oracle.com>:
> On Thu, 12 May 2011 14:23:03 +1000 Stephen Rothwell wrote:
>
>> Hi all,
>>
>> Changes since 20110511:
>
>
> on i386 and x86_64 (many randconfigs fail with these errors):
>
> drivers/ssb/main.c:1336: error: 'SSB_PCICORE_BCAST_ADDR' undeclared (first use in this function)
> drivers/ssb/main.c:1337: error: 'SSB_PCICORE_BCAST_DATA' undeclared (first use in this function)
> drivers/ssb/main.c:1349: error: 'struct ssb_pcicore' has no member named 'dev'

Whoops, I'm sorry. I'll check this today late night. I'm quite sure I
tested it, I don't know what does it happen.

-- 
Rafał

Re: [PATCH] ssb: fix pcicore build breakage

[Rafał Miłecki]

2011/5/13 John W. Linville <linville@tuxdriver.com>:
> drivers/ssb/main.c:1336: error: 'SSB_PCICORE_BCAST_ADDR' undeclared (first use in this function)
> drivers/ssb/main.c:1337: error: 'SSB_PCICORE_BCAST_DATA' undeclared (first use in this function)
> drivers/ssb/main.c:1349: error: 'struct ssb_pcicore' has no member named 'dev'
>
> Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
> Signed-off-by: John W. Linville <linville@tuxdriver.com>
> ---
>  drivers/ssb/main.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c
> index ee2937c..a53fc4d 100644
> --- a/drivers/ssb/main.c
> +++ b/drivers/ssb/main.c
> @@ -1332,6 +1332,7 @@ EXPORT_SYMBOL(ssb_bus_powerup);
>  static void ssb_broadcast_value(struct ssb_device *dev,
>                                u32 address, u32 data)
>  {
> +#ifdef CONFIG_SSB_DRIVER_PCICORE
>        /* This is used for both, PCI and ChipCommon core, so be careful. */
>        BUILD_BUG_ON(SSB_PCICORE_BCAST_ADDR != SSB_CHIPCO_BCAST_ADDR);
>        BUILD_BUG_ON(SSB_PCICORE_BCAST_DATA != SSB_CHIPCO_BCAST_DATA);
> @@ -1340,6 +1341,7 @@ static void ssb_broadcast_value(struct ssb_device *dev,
>        ssb_read32(dev, SSB_PCICORE_BCAST_ADDR); /* flush */
>        ssb_write32(dev, SSB_PCICORE_BCAST_DATA, data);
>        ssb_read32(dev, SSB_PCICORE_BCAST_DATA); /* flush */
> +#endif
>  }
>
>  void ssb_commit_settings(struct ssb_bus *bus)

>From *quick* review I think it's wrong. WIth this patch we don't do
commiting without PCI driver. This is still possible, we just need to
use ChipCommon for commiting.

-- 
Rafał

Re: [PATCH] ssb: fix pcicore build breakage

[John W. Linville]

On Fri, May 13, 2011 at 03:33:03PM +0200, Rafał Miłecki wrote:
> 2011/5/13 John W. Linville <linville@tuxdriver.com>:
> > drivers/ssb/main.c:1336: error: 'SSB_PCICORE_BCAST_ADDR' undeclared (first use in this function)
> > drivers/ssb/main.c:1337: error: 'SSB_PCICORE_BCAST_DATA' undeclared (first use in this function)
> > drivers/ssb/main.c:1349: error: 'struct ssb_pcicore' has no member named 'dev'
> >
> > Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
> > Signed-off-by: John W. Linville <linville@tuxdriver.com>
> > ---
> >  drivers/ssb/main.c |    2 ++
> >  1 files changed, 2 insertions(+), 0 deletions(-)
> >
> > diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c
> > index ee2937c..a53fc4d 100644
> > --- a/drivers/ssb/main.c
> > +++ b/drivers/ssb/main.c
> > @@ -1332,6 +1332,7 @@ EXPORT_SYMBOL(ssb_bus_powerup);
> >  static void ssb_broadcast_value(struct ssb_device *dev,
> >                                u32 address, u32 data)
> >  {
> > +#ifdef CONFIG_SSB_DRIVER_PCICORE
> >        /* This is used for both, PCI and ChipCommon core, so be careful. */
> >        BUILD_BUG_ON(SSB_PCICORE_BCAST_ADDR != SSB_CHIPCO_BCAST_ADDR);
> >        BUILD_BUG_ON(SSB_PCICORE_BCAST_DATA != SSB_CHIPCO_BCAST_DATA);
> > @@ -1340,6 +1341,7 @@ static void ssb_broadcast_value(struct ssb_device *dev,
> >        ssb_read32(dev, SSB_PCICORE_BCAST_ADDR); /* flush */
> >        ssb_write32(dev, SSB_PCICORE_BCAST_DATA, data);
> >        ssb_read32(dev, SSB_PCICORE_BCAST_DATA); /* flush */
> > +#endif
> >  }
> >
> >  void ssb_commit_settings(struct ssb_bus *bus)
> 
> From *quick* review I think it's wrong. WIth this patch we don't do
> commiting without PCI driver. This is still possible, we just need to
> use ChipCommon for commiting.

I'm happy for a better patch, but since the build is failing as-is...

-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.

Re: [PATCH] ssb: fix pcicore build breakage

[Michael Büsch]

On Fri, 2011-05-13 at 09:26 -0400, John W. Linville wrote: 
> drivers/ssb/main.c:1336: error: 'SSB_PCICORE_BCAST_ADDR' undeclared (first use in this function)
> drivers/ssb/main.c:1337: error: 'SSB_PCICORE_BCAST_DATA' undeclared (first use in this function)
> drivers/ssb/main.c:1349: error: 'struct ssb_pcicore' has no member named 'dev'
> 
> Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
> Signed-off-by: John W. Linville <linville@tuxdriver.com>
> ---
>  drivers/ssb/main.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c
> index ee2937c..a53fc4d 100644
> --- a/drivers/ssb/main.c
> +++ b/drivers/ssb/main.c
> @@ -1332,6 +1332,7 @@ EXPORT_SYMBOL(ssb_bus_powerup);
>  static void ssb_broadcast_value(struct ssb_device *dev,
>  				u32 address, u32 data)
>  {
> +#ifdef CONFIG_SSB_DRIVER_PCICORE
>  	/* This is used for both, PCI and ChipCommon core, so be careful. */
>  	BUILD_BUG_ON(SSB_PCICORE_BCAST_ADDR != SSB_CHIPCO_BCAST_ADDR);
>  	BUILD_BUG_ON(SSB_PCICORE_BCAST_DATA != SSB_CHIPCO_BCAST_DATA);
> @@ -1340,6 +1341,7 @@ static void ssb_broadcast_value(struct ssb_device *dev,
>  	ssb_read32(dev, SSB_PCICORE_BCAST_ADDR); /* flush */
>  	ssb_write32(dev, SSB_PCICORE_BCAST_DATA, data);
>  	ssb_read32(dev, SSB_PCICORE_BCAST_DATA); /* flush */
> +#endif
>  }
>  
>  void ssb_commit_settings(struct ssb_bus *bus)

This clearly is incorrect. Read the comment, please.

-- 
Greetings Michael.

Re: [PATCH] ssb: fix pcicore build breakage

[Michael Büsch]

On Fri, 2011-05-13 at 15:43 +0200, Michael Büsch wrote: 
> On Fri, 2011-05-13 at 09:26 -0400, John W. Linville wrote: 
> > drivers/ssb/main.c:1336: error: 'SSB_PCICORE_BCAST_ADDR' undeclared (first use in this function)
> > drivers/ssb/main.c:1337: error: 'SSB_PCICORE_BCAST_DATA' undeclared (first use in this function)
> > drivers/ssb/main.c:1349: error: 'struct ssb_pcicore' has no member named 'dev'
> > 
> > Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
> > Signed-off-by: John W. Linville <linville@tuxdriver.com>
> > ---
> >  drivers/ssb/main.c |    2 ++
> >  1 files changed, 2 insertions(+), 0 deletions(-)
> > 
> > diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c
> > index ee2937c..a53fc4d 100644
> > --- a/drivers/ssb/main.c
> > +++ b/drivers/ssb/main.c
> > @@ -1332,6 +1332,7 @@ EXPORT_SYMBOL(ssb_bus_powerup);
> >  static void ssb_broadcast_value(struct ssb_device *dev,
> >  				u32 address, u32 data)
> >  {
> > +#ifdef CONFIG_SSB_DRIVER_PCICORE
> >  	/* This is used for both, PCI and ChipCommon core, so be careful. */
> >  	BUILD_BUG_ON(SSB_PCICORE_BCAST_ADDR != SSB_CHIPCO_BCAST_ADDR);
> >  	BUILD_BUG_ON(SSB_PCICORE_BCAST_DATA != SSB_CHIPCO_BCAST_DATA);
> > @@ -1340,6 +1341,7 @@ static void ssb_broadcast_value(struct ssb_device *dev,
> >  	ssb_read32(dev, SSB_PCICORE_BCAST_ADDR); /* flush */
> >  	ssb_write32(dev, SSB_PCICORE_BCAST_DATA, data);
> >  	ssb_read32(dev, SSB_PCICORE_BCAST_DATA); /* flush */
> > +#endif
> >  }
> >  
> >  void ssb_commit_settings(struct ssb_bus *bus)
> 
> This clearly is incorrect. Read the comment, please.

I think we should probably have two ssb_broadcast_value functions. One
for PCI core and one for chipcommon. That seems the best solution, even
if the constants happen to be the same. It's only a few lines of code.
(If the compiler is clever enough, it might probably be able to optimize
it out anyway).

-- 
Greetings Michael.

Re: [PATCH] ssb: fix pcicore build breakage

[Rafał Miłecki]

W dniu 13 maja 2011 15:33 użytkownik John W. Linville
<linville@tuxdriver.com> napisał:
> On Fri, May 13, 2011 at 03:33:03PM +0200, Rafał Miłecki wrote:
>> 2011/5/13 John W. Linville <linville@tuxdriver.com>:
>> > drivers/ssb/main.c:1336: error: 'SSB_PCICORE_BCAST_ADDR' undeclared (first use in this function)
>> > drivers/ssb/main.c:1337: error: 'SSB_PCICORE_BCAST_DATA' undeclared (first use in this function)
>> > drivers/ssb/main.c:1349: error: 'struct ssb_pcicore' has no member named 'dev'
>> >
>> > Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
>> > Signed-off-by: John W. Linville <linville@tuxdriver.com>
>> > ---
>> >  drivers/ssb/main.c |    2 ++
>> >  1 files changed, 2 insertions(+), 0 deletions(-)
>> >
>> > diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c
>> > index ee2937c..a53fc4d 100644
>> > --- a/drivers/ssb/main.c
>> > +++ b/drivers/ssb/main.c
>> > @@ -1332,6 +1332,7 @@ EXPORT_SYMBOL(ssb_bus_powerup);
>> >  static void ssb_broadcast_value(struct ssb_device *dev,
>> >                                u32 address, u32 data)
>> >  {
>> > +#ifdef CONFIG_SSB_DRIVER_PCICORE
>> >        /* This is used for both, PCI and ChipCommon core, so be careful. */
>> >        BUILD_BUG_ON(SSB_PCICORE_BCAST_ADDR != SSB_CHIPCO_BCAST_ADDR);
>> >        BUILD_BUG_ON(SSB_PCICORE_BCAST_DATA != SSB_CHIPCO_BCAST_DATA);
>> > @@ -1340,6 +1341,7 @@ static void ssb_broadcast_value(struct ssb_device *dev,
>> >        ssb_read32(dev, SSB_PCICORE_BCAST_ADDR); /* flush */
>> >        ssb_write32(dev, SSB_PCICORE_BCAST_DATA, data);
>> >        ssb_read32(dev, SSB_PCICORE_BCAST_DATA); /* flush */
>> > +#endif
>> >  }
>> >
>> >  void ssb_commit_settings(struct ssb_bus *bus)
>>
>> From *quick* review I think it's wrong. WIth this patch we don't do
>> commiting without PCI driver. This is still possible, we just need to
>> use ChipCommon for commiting.
>
> I'm happy for a better patch, but since the build is failing as-is...

Today late night will submit.

-- 
Rafał

[PATCH v2] ssb: fix pcicore build breakage

[John W. Linville]

drivers/ssb/main.c:1336: error: 'SSB_PCICORE_BCAST_ADDR' undeclared (first use in this function)
drivers/ssb/main.c:1337: error: 'SSB_PCICORE_BCAST_DATA' undeclared (first use in this function)
drivers/ssb/main.c:1349: error: 'struct ssb_pcicore' has no member named 'dev'

Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---
Use CHIPCO definitions since they should always(?) be valid...

 drivers/ssb/main.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c
index ee2937c..b2abd0f 100644
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
@@ -1332,14 +1332,16 @@ EXPORT_SYMBOL(ssb_bus_powerup);
 static void ssb_broadcast_value(struct ssb_device *dev,
 				u32 address, u32 data)
 {
+#ifdef CONFIG_SSB_DRIVER_PCICORE
 	/* This is used for both, PCI and ChipCommon core, so be careful. */
 	BUILD_BUG_ON(SSB_PCICORE_BCAST_ADDR != SSB_CHIPCO_BCAST_ADDR);
 	BUILD_BUG_ON(SSB_PCICORE_BCAST_DATA != SSB_CHIPCO_BCAST_DATA);
+#endif
 
-	ssb_write32(dev, SSB_PCICORE_BCAST_ADDR, address);
-	ssb_read32(dev, SSB_PCICORE_BCAST_ADDR); /* flush */
-	ssb_write32(dev, SSB_PCICORE_BCAST_DATA, data);
-	ssb_read32(dev, SSB_PCICORE_BCAST_DATA); /* flush */
+	ssb_write32(dev, SSB_CHIPCO_BCAST_ADDR, address);
+	ssb_read32(dev, SSB_CHIPCO_BCAST_ADDR); /* flush */
+	ssb_write32(dev, SSB_CHIPCO_BCAST_DATA, data);
+	ssb_read32(dev, SSB_CHIPCO_BCAST_DATA); /* flush */
 }
 
 void ssb_commit_settings(struct ssb_bus *bus)
-- 
1.7.4.4

Re: [PATCH v2] ssb: fix pcicore build breakage

[Randy Dunlap]

On Fri, 13 May 2011 10:22:50 -0400 John W. Linville wrote:

> drivers/ssb/main.c:1336: error: 'SSB_PCICORE_BCAST_ADDR' undeclared (first use in this function)
> drivers/ssb/main.c:1337: error: 'SSB_PCICORE_BCAST_DATA' undeclared (first use in this function)
> drivers/ssb/main.c:1349: error: 'struct ssb_pcicore' has no member named 'dev'

This patch does not fix the last error above when CONFIG_PCI is not enabled.


> Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
> Signed-off-by: John W. Linville <linville@tuxdriver.com>
> ---
> Use CHIPCO definitions since they should always(?) be valid...
> 
>  drivers/ssb/main.c |   10 ++++++----
>  1 files changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c
> index ee2937c..b2abd0f 100644
> --- a/drivers/ssb/main.c
> +++ b/drivers/ssb/main.c
> @@ -1332,14 +1332,16 @@ EXPORT_SYMBOL(ssb_bus_powerup);
>  static void ssb_broadcast_value(struct ssb_device *dev,
>  				u32 address, u32 data)
>  {
> +#ifdef CONFIG_SSB_DRIVER_PCICORE
>  	/* This is used for both, PCI and ChipCommon core, so be careful. */
>  	BUILD_BUG_ON(SSB_PCICORE_BCAST_ADDR != SSB_CHIPCO_BCAST_ADDR);
>  	BUILD_BUG_ON(SSB_PCICORE_BCAST_DATA != SSB_CHIPCO_BCAST_DATA);
> +#endif
>  
> -	ssb_write32(dev, SSB_PCICORE_BCAST_ADDR, address);
> -	ssb_read32(dev, SSB_PCICORE_BCAST_ADDR); /* flush */
> -	ssb_write32(dev, SSB_PCICORE_BCAST_DATA, data);
> -	ssb_read32(dev, SSB_PCICORE_BCAST_DATA); /* flush */
> +	ssb_write32(dev, SSB_CHIPCO_BCAST_ADDR, address);
> +	ssb_read32(dev, SSB_CHIPCO_BCAST_ADDR); /* flush */
> +	ssb_write32(dev, SSB_CHIPCO_BCAST_DATA, data);
> +	ssb_read32(dev, SSB_CHIPCO_BCAST_DATA); /* flush */
>  }
>  
>  void ssb_commit_settings(struct ssb_bus *bus)
> -- 


---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

[PATCH v3] ssb: fix pcicore build breakage

[John W. Linville]

drivers/ssb/main.c:1336: error: 'SSB_PCICORE_BCAST_ADDR' undeclared (first use in this function)
drivers/ssb/main.c:1337: error: 'SSB_PCICORE_BCAST_DATA' undeclared (first use in this function)
drivers/ssb/main.c:1349: error: 'struct ssb_pcicore' has no member named 'dev'

Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---
 drivers/ssb/main.c |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c
index ee2937c..f8a13f8 100644
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
@@ -1332,21 +1332,27 @@ EXPORT_SYMBOL(ssb_bus_powerup);
 static void ssb_broadcast_value(struct ssb_device *dev,
 				u32 address, u32 data)
 {
+#ifdef CONFIG_SSB_DRIVER_PCICORE
 	/* This is used for both, PCI and ChipCommon core, so be careful. */
 	BUILD_BUG_ON(SSB_PCICORE_BCAST_ADDR != SSB_CHIPCO_BCAST_ADDR);
 	BUILD_BUG_ON(SSB_PCICORE_BCAST_DATA != SSB_CHIPCO_BCAST_DATA);
+#endif
 
-	ssb_write32(dev, SSB_PCICORE_BCAST_ADDR, address);
-	ssb_read32(dev, SSB_PCICORE_BCAST_ADDR); /* flush */
-	ssb_write32(dev, SSB_PCICORE_BCAST_DATA, data);
-	ssb_read32(dev, SSB_PCICORE_BCAST_DATA); /* flush */
+	ssb_write32(dev, SSB_CHIPCO_BCAST_ADDR, address);
+	ssb_read32(dev, SSB_CHIPCO_BCAST_ADDR); /* flush */
+	ssb_write32(dev, SSB_CHIPCO_BCAST_DATA, data);
+	ssb_read32(dev, SSB_CHIPCO_BCAST_DATA); /* flush */
 }
 
 void ssb_commit_settings(struct ssb_bus *bus)
 {
 	struct ssb_device *dev;
 
+#ifdef CONFIG_SSB_DRIVER_PCICORE
 	dev = bus->chipco.dev ? bus->chipco.dev : bus->pcicore.dev;
+#else
+	dev = bus->chipco.dev;
+#endif
 	if (WARN_ON(!dev))
 		return;
 	/* This forces an update of the cached registers. */
-- 
1.7.4.4

Re: [PATCH v3] ssb: fix pcicore build breakage

[Rafał Miłecki]

2011/5/13 John W. Linville <linville@tuxdriver.com>:
> drivers/ssb/main.c:1336: error: 'SSB_PCICORE_BCAST_ADDR' undeclared (first use in this function)
> drivers/ssb/main.c:1337: error: 'SSB_PCICORE_BCAST_DATA' undeclared (first use in this function)
> drivers/ssb/main.c:1349: error: 'struct ssb_pcicore' has no member named 'dev'
>
> Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
> Signed-off-by: John W. Linville <linville@tuxdriver.com>
> ---
>  drivers/ssb/main.c |   14 ++++++++++----
>  1 files changed, 10 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c
> index ee2937c..f8a13f8 100644
> --- a/drivers/ssb/main.c
> +++ b/drivers/ssb/main.c
> @@ -1332,21 +1332,27 @@ EXPORT_SYMBOL(ssb_bus_powerup);
>  static void ssb_broadcast_value(struct ssb_device *dev,
>                                u32 address, u32 data)
>  {
> +#ifdef CONFIG_SSB_DRIVER_PCICORE
>        /* This is used for both, PCI and ChipCommon core, so be careful. */
>        BUILD_BUG_ON(SSB_PCICORE_BCAST_ADDR != SSB_CHIPCO_BCAST_ADDR);
>        BUILD_BUG_ON(SSB_PCICORE_BCAST_DATA != SSB_CHIPCO_BCAST_DATA);
> +#endif
>
> -       ssb_write32(dev, SSB_PCICORE_BCAST_ADDR, address);
> -       ssb_read32(dev, SSB_PCICORE_BCAST_ADDR); /* flush */
> -       ssb_write32(dev, SSB_PCICORE_BCAST_DATA, data);
> -       ssb_read32(dev, SSB_PCICORE_BCAST_DATA); /* flush */
> +       ssb_write32(dev, SSB_CHIPCO_BCAST_ADDR, address);
> +       ssb_read32(dev, SSB_CHIPCO_BCAST_ADDR); /* flush */
> +       ssb_write32(dev, SSB_CHIPCO_BCAST_DATA, data);
> +       ssb_read32(dev, SSB_CHIPCO_BCAST_DATA); /* flush */
>  }
>
>  void ssb_commit_settings(struct ssb_bus *bus)
>  {
>        struct ssb_device *dev;
>
> +#ifdef CONFIG_SSB_DRIVER_PCICORE
>        dev = bus->chipco.dev ? bus->chipco.dev : bus->pcicore.dev;
> +#else
> +       dev = bus->chipco.dev;
> +#endif
>        if (WARN_ON(!dev))
>                return;
>        /* This forces an update of the cached registers. */
> --
> 1.7.4.4

Acked-by: Rafał Miłecki <zajec5@gmail.com>

-- 
Rafał

Re: [PATCH v3] ssb: fix pcicore build breakage

[Randy Dunlap]

On 05/13/11 12:07, John W. Linville wrote:
> drivers/ssb/main.c:1336: error: 'SSB_PCICORE_BCAST_ADDR' undeclared (first use in this function)
> drivers/ssb/main.c:1337: error: 'SSB_PCICORE_BCAST_DATA' undeclared (first use in this function)
> drivers/ssb/main.c:1349: error: 'struct ssb_pcicore' has no member named 'dev'
> 
> Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
> Signed-off-by: John W. Linville <linville@tuxdriver.com>

Acked-by: Randy Dunlap <randy.dunlap@oracle.com>

Thanks.

> ---
>  drivers/ssb/main.c |   14 ++++++++++----
>  1 files changed, 10 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c
> index ee2937c..f8a13f8 100644
> --- a/drivers/ssb/main.c
> +++ b/drivers/ssb/main.c
> @@ -1332,21 +1332,27 @@ EXPORT_SYMBOL(ssb_bus_powerup);
>  static void ssb_broadcast_value(struct ssb_device *dev,
>  				u32 address, u32 data)
>  {
> +#ifdef CONFIG_SSB_DRIVER_PCICORE
>  	/* This is used for both, PCI and ChipCommon core, so be careful. */
>  	BUILD_BUG_ON(SSB_PCICORE_BCAST_ADDR != SSB_CHIPCO_BCAST_ADDR);
>  	BUILD_BUG_ON(SSB_PCICORE_BCAST_DATA != SSB_CHIPCO_BCAST_DATA);
> +#endif
>  
> -	ssb_write32(dev, SSB_PCICORE_BCAST_ADDR, address);
> -	ssb_read32(dev, SSB_PCICORE_BCAST_ADDR); /* flush */
> -	ssb_write32(dev, SSB_PCICORE_BCAST_DATA, data);
> -	ssb_read32(dev, SSB_PCICORE_BCAST_DATA); /* flush */
> +	ssb_write32(dev, SSB_CHIPCO_BCAST_ADDR, address);
> +	ssb_read32(dev, SSB_CHIPCO_BCAST_ADDR); /* flush */
> +	ssb_write32(dev, SSB_CHIPCO_BCAST_DATA, data);
> +	ssb_read32(dev, SSB_CHIPCO_BCAST_DATA); /* flush */
>  }
>  
>  void ssb_commit_settings(struct ssb_bus *bus)
>  {
>  	struct ssb_device *dev;
>  
> +#ifdef CONFIG_SSB_DRIVER_PCICORE
>  	dev = bus->chipco.dev ? bus->chipco.dev : bus->pcicore.dev;
> +#else
> +	dev = bus->chipco.dev;
> +#endif
>  	if (WARN_ON(!dev))
>  		return;
>  	/* This forces an update of the cached registers. */


-- 
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***