[LinuxBIOS] [PATCH] fix port 0 on sata controller 0 for ck804 based boards

[Ward Vandewege]

Hi all,

There is a problem with the ck804 code in the tree when it comes to SATA
support. I've observed this on a tyan s2891, and it has been confirmed by
folks with a sun ultra40.

This patch changes the southbridge/nvidia/ck804/ck804_early_setup.c file and
enables one extra SATA port. I've tested this on real hardware (tyan s2891).

There is a very similar file called
southbridge/nvidia/ck804/ck804_early_setup_car.c which seems to be used by

tyan/s2895
  sunw/ultra40

I don't have access to a s2895, but YH thinks that all sata ports should work
on that board. It would be great if someone could verify that.

I'm not 100% sure why both the ck804_early_setup.c and the
ck804_early_setup_car.c file are included in the mainboards/sunw/ultra40/
tree; probably only one of those files is actually used.

I've spent quite a bit of time with 'dumpio' and tried to match register
values between the proprietary BIOS and LinuxBIOS, but to no avail. If
someone has ideas to get port 1 working on both sata controllers, that would
be great.

Thanks,
Ward.

[LinuxBIOS] [PATCH] fix port 0 on sata controller 0 for ck804 based boards

[yhlu]

On Nov 15, 2007 12:44 PM, Ward Vandewege  wrote:
> Hi all,
>
> There is a problem with the ck804 code in the tree when it comes to SATA
> support. I've observed this on a tyan s2891, and it has been confirmed by
> folks with a sun ultra40.
>
> This patch changes the southbridge/nvidia/ck804/ck804_early_setup.c file and
> enables one extra SATA port. I've tested this on real hardware (tyan s2891).

good work.
> There is a very similar file called
> southbridge/nvidia/ck804/ck804_early_setup_car.c which seems to be used by
>
> tyan/s2895
>   sunw/ultra40
>
> I don't have access to a s2895, but YH thinks that all sata ports should work
> on that board. It would be great if someone could verify that.
>
> I'm not 100% sure why both the ck804_early_setup.c and the
> ck804_early_setup_car.c file are included in the mainboards/sunw/ultra40/
> tree; probably only one of those files is actually used.

we can delete non car version for now, because ck804 and mcp55 based
all go with car auto main.

YH

[LinuxBIOS] [PATCH] fix port 0 on sata controller 0 for ck804 based boards

[Uwe Hermann]

On Thu, Nov 15, 2007 at 09:34:33PM -0800, yhlu wrote:
> > I'm not 100% sure why both the ck804_early_setup.c and the
> > ck804_early_setup_car.c file are included in the mainboards/sunw/ultra40/
> > tree; probably only one of those files is actually used.
>
> we can delete non car version for now, because ck804 and mcp55 based
> all go with car auto main.

Agreed, I think we should drop all romcc-related code from boards which
already do support CAR in v2. In v3 all boards _must_ use CAR anyway.

As for ck804_early_setup.c, the A8N-E still uses it at the moment.
With this patch in cache_as_ram_auto.c I tested the SATA ports again
and I see no changes (3+4 work, 1+2 don't).

-#include "southbridge/nvidia/ck804/ck804_early_setup.c"
+#include "southbridge/nvidia/ck804/ck804_early_setup_car.c"

So shall we move all boards to ck804_early_setup_car.c for now and
drop ck804_early_setup.c completely?

(btw, could ck804_early_setup.c affect other things than just SATA?
I only tested the SATA ports so far)

Thanks, Uwe.

[LinuxBIOS] [PATCH] fix port 0 on sata controller 0 for ck804 based boards

[Uwe Hermann]

On Thu, Nov 15, 2007 at 03:44:07PM -0500, Ward Vandewege wrote:
> The ck804 code in the LB tree does not properly initialize all SATA ports.
> The situation is currently as follows for boards with 4 SATA ports:
> sata controller 0: both ports 100% dead (no drives detected)
> sata controller 1: port 0 ok; port 1 sees drive but times out when trying
> to access it

Can you elaborate how you tested this?

Here's what I was able to test on the ASUS A8N-E. The ports are numbered 1-4
on the PCB, not sure how that maps to your numbers above. I used a 40 GB
SATA disk with 'IDE_DISK_POLL_DELAY = 1' in FILO as well as the 5
seconds spin-up delay patch from the wiki.

Without patches:
 - Port 1, 2 don't work.
 - Port 3: Works (hde in FILO), I can boot from the SATA disk.
 - Port 4: Works (hdg in FILO), I can boot from the SATA disk.

No change in behaviour with your patch applied. Ports 1/2 broken, 3/4 work.

Uwe.

[LinuxBIOS] [PATCH] fix port 0 on sata controller 0 for ck804 based boards

[Ward Vandewege]

On Sun, Nov 18, 2007 at 03:09:13AM +0100, Uwe Hermann wrote:
> On Thu, Nov 15, 2007 at 03:44:07PM -0500, Ward Vandewege wrote:
> > The ck804 code in the LB tree does not properly initialize all SATA ports.
> > The situation is currently as follows for boards with 4 SATA ports:
> > sata controller 0: both ports 100% dead (no drives detected)
> > sata controller 1: port 0 ok; port 1 sees drive but times out when trying
> > to access it
>
> Can you elaborate how you tested this?

The s2891 has 2 sata controllers; pci ids 0000:00:07.0 and 0000:00:08.0. Both
have 2 onboard sata ports (which I've been referring to as 0 and 1).

Test pre-patch:

1. stick 4 sata drives in s2891
2. boot
3. controller 0 (pci id 7) does not see *any* drives
4. controller 1 (pci id 8) sees both drives connected to it, but when the
kernel tries to access the second disk, it times out with nasty errors like
this.

See the boot log here:

http://ward.vandewege.net/s2891/s2891-bootlog-lb.cap

Test post-patch:

same as above, but controller 0 behaves identical to controller 1
> Here's what I was able to test on the ASUS A8N-E. The ports are numbered 1-4
> on the PCB, not sure how that maps to your numbers above. I used a 40 GB
> SATA disk with 'IDE_DISK_POLL_DELAY = 1' in FILO as well as the 5
> seconds spin-up delay patch from the wiki.
>
> Without patches:
> Port 1, 2 don't work.
> Port 3: Works (hde in FILO), I can boot from the SATA disk.
> Port 4: Works (hdg in FILO), I can boot from the SATA disk.
>
> No change in behaviour with your patch applied. Ports 1/2 broken, 3/4 work.

What are the PCI ids for the sata controllers on your board?

Thanks,
Ward.

[LinuxBIOS] [PATCH] fix port 0 on sata controller 0 for ck804 based boards

[Ward Vandewege]

On Sun, Nov 18, 2007 at 03:09:13AM +0100, Uwe Hermann wrote:
> On Thu, Nov 15, 2007 at 03:44:07PM -0500, Ward Vandewege wrote:
> > The ck804 code in the LB tree does not properly initialize all SATA ports.
> > The situation is currently as follows for boards with 4 SATA ports:
> > sata controller 0: both ports 100% dead (no drives detected)
> > sata controller 1: port 0 ok; port 1 sees drive but times out when trying
> > to access it
>
> Can you elaborate how you tested this?

Uhm, boot with 4 drives in the machine? It's immediately obvious from the
boot logs (and the long delays for the drives that are half-detected).
> Here's what I was able to test on the ASUS A8N-E. The ports are numbered 1-4
> on the PCB, not sure how that maps to your numbers above. I used a 40 GB
> SATA disk with 'IDE_DISK_POLL_DELAY = 1' in FILO as well as the 5
> seconds spin-up delay patch from the wiki.
>
> Without patches:
> Port 1, 2 don't work.
> Port 3: Works (hde in FILO), I can boot from the SATA disk.
> Port 4: Works (hdg in FILO), I can boot from the SATA disk.
>
> No change in behaviour with your patch applied. Ports 1/2 broken, 3/4 work.

Did you check that the SATA controller PCI ids are the same?

Thanks,
Ward.

[LinuxBIOS] [PATCH] fix port 0 on sata controller 0 for ck804 based boards

[Ward Vandewege]

On Thu, Nov 15, 2007 at 03:44:07PM -0500, Ward Vandewege wrote:
> There is a problem with the ck804 code in the tree when it comes to SATA
> support. I've observed this on a tyan s2891, and it has been confirmed by
> folks with a sun ultra40.
>
> This patch changes the southbridge/nvidia/ck804/ck804_early_setup.c file and
> enables one extra SATA port. I've tested this on real hardware (tyan s2891).
>
> There is a very similar file called
> southbridge/nvidia/ck804/ck804_early_setup_car.c which seems to be used by
>
> tyan/s2895
>   sunw/ultra40
>
> I don't have access to a s2895, but YH thinks that all sata ports should work
> on that board. It would be great if someone could verify that.
>
> I'm not 100% sure why both the ck804_early_setup.c and the
> ck804_early_setup_car.c file are included in the mainboards/sunw/ultra40/
> tree; probably only one of those files is actually used.
>
> I've spent quite a bit of time with 'dumpio' and tried to match register
> values between the proprietary BIOS and LinuxBIOS, but to no avail. If
> someone has ideas to get port 1 working on both sata controllers, that would
> be great.

*ping*, do I get an ack?

Thanks,
Ward.
> The ck804 code in the LB tree does not properly initialize all SATA ports.
> The situation is currently as follows for boards with 4 SATA ports:
> sata controller 0: both ports 100% dead (no drives detected)
> sata controller 1: port 0 ok; port 1 sees drive but times out when trying
> to access it
>
> The attached patch fixes port 0 on controller 0; port 1 on both controllers 
> is still half-broken (as in it sees the drive initially but times out when 
> trying to access it).
>
> This patch will affect the boards that use the 
> southbridge/nvidia/ck804/ck804_early_setup.c file:
>
> sunw/ultra40
>   tyan/s2891
>   tyan/s2892
>   asus/a8n_e
>
> Signed-off-by: Ward Vandewege
> Index: ck804_early_setup.c
>
> --- LinuxBIOSv2/src/southbridge/nvidia/ck804/ck804_early_setup.c	(revision 2974)
> +++ LinuxBIOSv2/src/southbridge/nvidia/ck804/ck804_early_setup.c	(working copy)
> @@ -228,6 +228,18 @@
>          RES_PORT_IO_32, CK804B_ANACTRL_IO_BASE + 0x24, 0xfcffff0f, 0x020000b0,
>  #endif
> // Activate master port on primary SATA controller
> RES_PCI_IO, PCI_ADDR(0, CK804_DEVN_BASE+7 , 0, 0x50), ~(0x1f000013), 0x15000013,
> RES_PCI_IO, PCI_ADDR(0, CK804_DEVN_BASE+7 , 0, 0x64), ~(0x00000001), 0x00000001,
> RES_PCI_IO, PCI_ADDR(0, CK804_DEVN_BASE+7 , 0, 0x68), ~(0x02000000), 0x02000000,
> RES_PCI_IO, PCI_ADDR(0, CK804_DEVN_BASE+7 , 0, 0x70), ~(0x000f0000), 0x00040000,
> RES_PCI_IO, PCI_ADDR(0, CK804_DEVN_BASE+7 , 0, 0xa0), ~(0x000001ff), 0x00000150,
> RES_PCI_IO, PCI_ADDR(0, CK804_DEVN_BASE+7 , 0, 0xac), ~(0xffff8f00), 0x02aa8b00,
> RES_PCI_IO, PCI_ADDR(0, CK804_DEVN_BASE+7 , 0, 0x7c), ~(0x00000010), 0x00000000,
> RES_PCI_IO, PCI_ADDR(0, CK804_DEVN_BASE+7 , 0, 0xc8), ~(0x0fff0fff), 0x000a000a,
> RES_PCI_IO, PCI_ADDR(0, CK804_DEVN_BASE+7 , 0, 0xd0), ~(0xf0000000), 0x00000000,
> RES_PCI_IO, PCI_ADDR(0, CK804_DEVN_BASE+7 , 0, 0xe0), ~(0xf0000000), 0x00000000,
> RES_PCI_IO, PCI_ADDR(0, CK804_DEVN_BASE+8 , 0, 0x50), ~(0x1f000013), 0x15000013,
> RES_PCI_IO, PCI_ADDR(0, CK804_DEVN_BASE+8 , 0, 0x64), ~(0x00000001), 0x00000001,
> RES_PCI_IO, PCI_ADDR(0, CK804_DEVN_BASE+8 , 0, 0x68), ~(0x02000000), 0x02000000,
> !DSPAM:473cafad297961804284693!

[LinuxBIOS] [PATCH] fix port 0 on sata controller 0 for ck804 based boards

[ron minnich]

Acked-by: Ronald G. Minnich

On Dec 8, 2007 1:56 PM, Ward Vandewege  wrote:
> On Thu, Nov 15, 2007 at 03:44:07PM -0500, Ward Vandewege wrote:
> > There is a problem with the ck804 code in the tree when it comes to SATA
> > support. I've observed this on a tyan s2891, and it has been confirmed by
> > folks with a sun ultra40.
> >
> > This patch changes the southbridge/nvidia/ck804/ck804_early_setup.c file and
> > enables one extra SATA port. I've tested this on real hardware (tyan s2891).
> >
> > There is a very similar file called
> > southbridge/nvidia/ck804/ck804_early_setup_car.c which seems to be used by
> >
> > tyan/s2895
> >   sunw/ultra40
> >
> > I don't have access to a s2895, but YH thinks that all sata ports should work
> > on that board. It would be great if someone could verify that.
> >
> > I'm not 100% sure why both the ck804_early_setup.c and the
> > ck804_early_setup_car.c file are included in the mainboards/sunw/ultra40/
> > tree; probably only one of those files is actually used.
> >
> > I've spent quite a bit of time with 'dumpio' and tried to match register
> > values between the proprietary BIOS and LinuxBIOS, but to no avail. If
> > someone has ideas to get port 1 working on both sata controllers, that would
> > be great.
>
> *ping*, do I get an ack?
>
> Thanks,
> Ward.
> > The ck804 code in the LB tree does not properly initialize all SATA ports.
> > The situation is currently as follows for boards with 4 SATA ports:
> > sata controller 0: both ports 100% dead (no drives detected)
> > sata controller 1: port 0 ok; port 1 sees drive but times out when trying
> > to access it
> >
> > The attached patch fixes port 0 on controller 0; port 1 on both controllers
> > is still half-broken (as in it sees the drive initially but times out when
> > trying to access it).
> >
> > This patch will affect the boards that use the
> > southbridge/nvidia/ck804/ck804_early_setup.c file:
> >
> > sunw/ultra40
> >   tyan/s2891
> >   tyan/s2892
> >   asus/a8n_e
> >
> > Signed-off-by: Ward Vandewege
> > Index: ck804_early_setup.c
> >
> > --- LinuxBIOSv2/src/southbridge/nvidia/ck804/ck804_early_setup.c      (revision 2974)
> > +++ LinuxBIOSv2/src/southbridge/nvidia/ck804/ck804_early_setup.c      (working copy)
> > @@ -228,6 +228,18 @@
> >          RES_PORT_IO_32, CK804B_ANACTRL_IO_BASE + 0x24, 0xfcffff0f, 0x020000b0,
> >  #endif
> > // Activate master port on primary SATA controller
> > RES_PCI_IO, PCI_ADDR(0, CK804_DEVN_BASE+7 , 0, 0x50), ~(0x1f000013), 0x15000013,
> > RES_PCI_IO, PCI_ADDR(0, CK804_DEVN_BASE+7 , 0, 0x64), ~(0x00000001), 0x00000001,
> > RES_PCI_IO, PCI_ADDR(0, CK804_DEVN_BASE+7 , 0, 0x68), ~(0x02000000), 0x02000000,
> > RES_PCI_IO, PCI_ADDR(0, CK804_DEVN_BASE+7 , 0, 0x70), ~(0x000f0000), 0x00040000,
> > RES_PCI_IO, PCI_ADDR(0, CK804_DEVN_BASE+7 , 0, 0xa0), ~(0x000001ff), 0x00000150,
> > RES_PCI_IO, PCI_ADDR(0, CK804_DEVN_BASE+7 , 0, 0xac), ~(0xffff8f00), 0x02aa8b00,
> > RES_PCI_IO, PCI_ADDR(0, CK804_DEVN_BASE+7 , 0, 0x7c), ~(0x00000010), 0x00000000,
> > RES_PCI_IO, PCI_ADDR(0, CK804_DEVN_BASE+7 , 0, 0xc8), ~(0x0fff0fff), 0x000a000a,
> > RES_PCI_IO, PCI_ADDR(0, CK804_DEVN_BASE+7 , 0, 0xd0), ~(0xf0000000), 0x00000000,
> > RES_PCI_IO, PCI_ADDR(0, CK804_DEVN_BASE+7 , 0, 0xe0), ~(0xf0000000), 0x00000000,
> > RES_PCI_IO, PCI_ADDR(0, CK804_DEVN_BASE+8 , 0, 0x50), ~(0x1f000013), 0x15000013,
> >    RES_PCI_IO, PCI_ADDR(0, CK804_DEVN_BASE+8 , 0, 0x64), ~(0x00000001), 0x00000001,
> >    RES_PCI_IO, PCI_ADDR(0, CK804_DEVN_BASE+8 , 0, 0x68), ~(0x02000000), 0x02000000,
> > !DSPAM:473cafad297961804284693!

[LinuxBIOS] [PATCH] fix port 0 on sata controller 0 for ck804 based boards

[Stefan Reinauer]

Acked-by: Stefan Reinauer

* Ward Vandewege  [071115 21:44]:
> Hi all,
>
> There is a problem with the ck804 code in the tree when it comes to SATA
> support. I've observed this on a tyan s2891, and it has been confirmed by
> folks with a sun ultra40.
>
> This patch changes the southbridge/nvidia/ck804/ck804_early_setup.c file and
> enables one extra SATA port. I've tested this on real hardware (tyan s2891).
>
> There is a very similar file called
> southbridge/nvidia/ck804/ck804_early_setup_car.c which seems to be used by
>
> tyan/s2895
>   sunw/ultra40
>
> I don't have access to a s2895, but YH thinks that all sata ports should work
> on that board. It would be great if someone could verify that.
>
> I'm not 100% sure why both the ck804_early_setup.c and the
> ck804_early_setup_car.c file are included in the mainboards/sunw/ultra40/
> tree; probably only one of those files is actually used.
>
> I've spent quite a bit of time with 'dumpio' and tried to match register
> values between the proprietary BIOS and LinuxBIOS, but to no avail. If
> someone has ideas to get port 1 working on both sata controllers, that would
> be great.
>
> Thanks,
> Ward.
> The ck804 code in the LB tree does not properly initialize all SATA ports.
> The situation is currently as follows for boards with 4 SATA ports:
> sata controller 0: both ports 100% dead (no drives detected)
> sata controller 1: port 0 ok; port 1 sees drive but times out when trying
> to access it
>
> The attached patch fixes port 0 on controller 0; port 1 on both controllers 
> is still half-broken (as in it sees the drive initially but times out when 
> trying to access it).
>
> This patch will affect the boards that use the 
> southbridge/nvidia/ck804/ck804_early_setup.c file:
>
> sunw/ultra40
>   tyan/s2891
>   tyan/s2892
>   asus/a8n_e
>
> Signed-off-by: Ward Vandewege
> Index: ck804_early_setup.c
>
> --- LinuxBIOSv2/src/southbridge/nvidia/ck804/ck804_early_setup.c	(revision 2974)
> +++ LinuxBIOSv2/src/southbridge/nvidia/ck804/ck804_early_setup.c	(working copy)
> @@ -228,6 +228,18 @@
>          RES_PORT_IO_32, CK804B_ANACTRL_IO_BASE + 0x24, 0xfcffff0f, 0x020000b0,
>  #endif
> // Activate master port on primary SATA controller
> RES_PCI_IO, PCI_ADDR(0, CK804_DEVN_BASE+7 , 0, 0x50), ~(0x1f000013), 0x15000013,
> RES_PCI_IO, PCI_ADDR(0, CK804_DEVN_BASE+7 , 0, 0x64), ~(0x00000001), 0x00000001,
> RES_PCI_IO, PCI_ADDR(0, CK804_DEVN_BASE+7 , 0, 0x68), ~(0x02000000), 0x02000000,
> RES_PCI_IO, PCI_ADDR(0, CK804_DEVN_BASE+7 , 0, 0x70), ~(0x000f0000), 0x00040000,
> RES_PCI_IO, PCI_ADDR(0, CK804_DEVN_BASE+7 , 0, 0xa0), ~(0x000001ff), 0x00000150,
> RES_PCI_IO, PCI_ADDR(0, CK804_DEVN_BASE+7 , 0, 0xac), ~(0xffff8f00), 0x02aa8b00,
> RES_PCI_IO, PCI_ADDR(0, CK804_DEVN_BASE+7 , 0, 0x7c), ~(0x00000010), 0x00000000,
> RES_PCI_IO, PCI_ADDR(0, CK804_DEVN_BASE+7 , 0, 0xc8), ~(0x0fff0fff), 0x000a000a,
> RES_PCI_IO, PCI_ADDR(0, CK804_DEVN_BASE+7 , 0, 0xd0), ~(0xf0000000), 0x00000000,
> RES_PCI_IO, PCI_ADDR(0, CK804_DEVN_BASE+7 , 0, 0xe0), ~(0xf0000000), 0x00000000,
> RES_PCI_IO, PCI_ADDR(0, CK804_DEVN_BASE+8 , 0, 0x50), ~(0x1f000013), 0x15000013,
> RES_PCI_IO, PCI_ADDR(0, CK804_DEVN_BASE+8 , 0, 0x64), ~(0x00000001), 0x00000001,
> RES_PCI_IO, PCI_ADDR(0, CK804_DEVN_BASE+8 , 0, 0x68), ~(0x02000000), 0x02000000,
>