Name of user not set #1002701 has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37546 )
Change subject: New PCI ID for FCH SATA Controller (AHCI Mode) ......................................................................
New PCI ID for FCH SATA Controller (AHCI Mode)
The 1022:7904 FCH SATA Controller is found in the AMD Bettong board. Support is added to configure properly the SATA device in initialization.
Change-Id: Id8e5d67cded0588e84ad81f7d5e6fa4b6907ebc9 Signed-off-by: Jorge Fernandez jorgefm@cirsa.com --- M src/include/device/pci_ids.h M src/soc/amd/common/block/sata/sata.c M src/southbridge/amd/pi/hudson/sata.c 3 files changed, 11 insertions(+), 8 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/46/37546/1
diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h index c05640f..6444bc1 100644 --- a/src/include/device/pci_ids.h +++ b/src/include/device/pci_ids.h @@ -444,14 +444,15 @@ #define PCI_DEVICE_ID_AMD_SR5650_PCIE_DEV8 0x5A21 #define PCI_DEVICE_ID_AMD_SR5650_IOMMU 0x5A23
-#define PCI_DEVICE_ID_AMD_CZ_HDA 0x157A -#define PCI_DEVICE_ID_AMD_CZ_LPC 0x790E -#define PCI_DEVICE_ID_AMD_CZ_SATA 0x7900 -#define PCI_DEVICE_ID_AMD_CZ_SATA_AHCI 0x7901 -#define PCI_DEVICE_ID_AMD_CZ_USB_0 0x7907 -#define PCI_DEVICE_ID_AMD_CZ_USB_1 0x7908 -#define PCI_DEVICE_ID_AMD_CZ_USB3_0 0x7914 -#define PCI_DEVICE_ID_AMD_CZ_SMBUS 0x790B +#define PCI_DEVICE_ID_AMD_CZ_HDA 0x157A +#define PCI_DEVICE_ID_AMD_CZ_LPC 0x790E +#define PCI_DEVICE_ID_AMD_CZ_SATA 0x7900 +#define PCI_DEVICE_ID_AMD_CZ_SATA_AHCI 0x7901 +#define PCI_DEVICE_ID_AMD_CZ_SATA_AHCI_AMD 0x7904 +#define PCI_DEVICE_ID_AMD_CZ_USB_0 0x7907 +#define PCI_DEVICE_ID_AMD_CZ_USB_1 0x7908 +#define PCI_DEVICE_ID_AMD_CZ_USB3_0 0x7914 +#define PCI_DEVICE_ID_AMD_CZ_SMBUS 0x790B
#define PCI_DEVICE_ID_AMD_PCO_LPC 0x790e #define PCI_DEVICE_ID_AMD_PCO_HDA0 0x15de diff --git a/src/soc/amd/common/block/sata/sata.c b/src/soc/amd/common/block/sata/sata.c index 5aa2088..1cd342e 100644 --- a/src/soc/amd/common/block/sata/sata.c +++ b/src/soc/amd/common/block/sata/sata.c @@ -30,6 +30,7 @@ static const unsigned short pci_device_ids[] = { PCI_DEVICE_ID_AMD_CZ_SATA, PCI_DEVICE_ID_AMD_CZ_SATA_AHCI, + PCI_DEVICE_ID_AMD_CZ_SATA_AHCI_AMD, 0 };
diff --git a/src/southbridge/amd/pi/hudson/sata.c b/src/southbridge/amd/pi/hudson/sata.c index 08e967d..77365ef 100644 --- a/src/southbridge/amd/pi/hudson/sata.c +++ b/src/southbridge/amd/pi/hudson/sata.c @@ -70,6 +70,7 @@ PCI_DEVICE_ID_AMD_SB900_SATA_AHCI, PCI_DEVICE_ID_AMD_CZ_SATA, PCI_DEVICE_ID_AMD_CZ_SATA_AHCI, + PCI_DEVICE_ID_AMD_CZ_SATA_AHCI_AMD, 0 };
Frans Hendriks has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37546 )
Change subject: New PCI ID for FCH SATA Controller (AHCI Mode) ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/37546/1/src/include/device/pci_ids.... File src/include/device/pci_ids.h:
https://review.coreboot.org/c/coreboot/+/37546/1/src/include/device/pci_ids.... PS1, Line 451: #define PCI_DEVICE_ID_AMD_CZ_SATA_AHCI_AMD 0x7904 Might replace_AMD with e.g. bettong to make difference between the two AHCI controllers.
Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37546 )
Change subject: New PCI ID for FCH SATA Controller (AHCI Mode) ......................................................................
Patch Set 1:
(3 comments)
Welcome to coreboot!
https://review.coreboot.org/c/coreboot/+/37546/1//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/37546/1//COMMIT_MSG@7 PS1, Line 7: New PCI ID for FCH SATA Controller (AHCI Mode) Please look through `git log --oneline` on how to format and write git commit message summaries in coreboot.
amd/hudson: Add PCI ID for FCH SATA controller (AHCI Mode)
https://review.coreboot.org/c/coreboot/+/37546/1//COMMIT_MSG@9 PS1, Line 9: The 1022:7904 FCH SATA Controller is found in the AMD Bettong board. Very strange, that there is another ID. Did the chipset revision(?) change somehow on these boards?
https://review.coreboot.org/c/coreboot/+/37546/1/src/include/device/pci_ids.... File src/include/device/pci_ids.h:
https://review.coreboot.org/c/coreboot/+/37546/1/src/include/device/pci_ids.... PS1, Line 451: #define PCI_DEVICE_ID_AMD_CZ_SATA_AHCI_AMD 0x7904 What is the PCI ID of the non-AHCI mode device?
Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37546 )
Change subject: New PCI ID for FCH SATA Controller (AHCI Mode) ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/37546/1/src/include/device/pci_ids.... File src/include/device/pci_ids.h:
https://review.coreboot.org/c/coreboot/+/37546/1/src/include/device/pci_ids.... PS1, Line 451: #define PCI_DEVICE_ID_AMD_CZ_SATA_AHCI_AMD 0x7904
What is the PCI ID of the non-AHCI mode device?
From https://pci-ids.ucw.cz/v2.2/pci.ids:
7900 FCH SATA Controller [IDE mode] 7901 FCH SATA Controller [AHCI mode] 103c 8615 Pavilion Laptop 15-cw1xxx 7902 FCH SATA Controller [RAID mode] 7903 FCH SATA Controller [RAID mode] 7904 FCH SATA Controller [AHCI mode]
Marshall Dawson has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37546 )
Change subject: New PCI ID for FCH SATA Controller (AHCI Mode) ......................................................................
Patch Set 1:
(3 comments)
https://review.coreboot.org/c/coreboot/+/37546/1//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/37546/1//COMMIT_MSG@9 PS1, Line 9: The 1022:7904 FCH SATA Controller is found in the AMD Bettong board.
Very strange, that there is another ID. […]
Paul, it's a different mode the existing controller may be set to.
If anything, I'm curious whether anything changed that caused the controller to be programmed this way by default. This is an uncommon configuration that should only be caused by setting HUDSON_SATA_MODE to 5. So the change is good for completeness.
See sb/amd/*/hudson/Kconfig -- actually, it looks like the Kconfig files didn't get updated for Carrizo and later. It's still using 7804 help text and IDs. I'd recommend updating those in this patch stack too, perhaps ahead of this one for clarity.
https://review.coreboot.org/c/coreboot/+/37546/1/src/include/device/pci_ids.... File src/include/device/pci_ids.h:
https://review.coreboot.org/c/coreboot/+/37546/1/src/include/device/pci_ids.... PS1, Line 451: #define PCI_DEVICE_ID_AMD_CZ_SATA_AHCI_AMD 0x7904
From https://pci-ids.ucw.cz/v2.2/pci.ids: […]
7900
https://review.coreboot.org/c/coreboot/+/37546/1/src/include/device/pci_ids.... PS1, Line 451: #define PCI_DEVICE_ID_AMD_CZ_SATA_AHCI_AMD 0x7904
Might replace_AMD with e.g. bettong to make difference between the two AHCI controllers.
I prefer not using the name Bettong. Bettong is the name of one particular board but this ID is used across multiple APUs, and even more boards. Also, in case it's not clear, it's the same controller which can be programmed to report one of several IDs.
Name of user not set #1002701 has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/37546 )
Change subject: New PCI ID for FCH SATA Controller (AHCI Mode) ......................................................................
Abandoned
This changes are added in https://review.coreboot.org/c/coreboot/+/37551
Jorge Fernandez has restored this change. ( https://review.coreboot.org/c/coreboot/+/37546 )
Change subject: New PCI ID for FCH SATA Controller (AHCI Mode) ......................................................................
Restored
Hello Marshall Dawson, build bot (Jenkins), Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/37546
to look at the new patch set (#2).
Change subject: amd/hudson: Add PCI ID for FCH SATA Controller (AHCI Mode) for AMD driver ......................................................................
amd/hudson: Add PCI ID for FCH SATA Controller (AHCI Mode) for AMD driver
This new device ID is found in the AMD Bettong board. Support is added to configure properly the SATA device in initialization.
Change-Id: Id8e5d67cded0588e84ad81f7d5e6fa4b6907ebc9 Signed-off-by: Jorge Fernandez jorgefm@cirsa.com --- M src/include/device/pci_ids.h M src/soc/amd/common/block/sata/sata.c M src/southbridge/amd/pi/hudson/sata.c 3 files changed, 11 insertions(+), 8 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/46/37546/2
Frans Hendriks has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37546 )
Change subject: amd/hudson: Add PCI ID for FCH SATA Controller (AHCI Mode) for AMD driver ......................................................................
Patch Set 2: Code-Review+1
Martin L Roth has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/37546?usp=email )
Change subject: amd/hudson: Add PCI ID for FCH SATA Controller (AHCI Mode) for AMD driver ......................................................................
Abandoned
This patch has not been touched in over 12 months. Anyone who wants to take over work on this patch, please feel free to restore it and do any work needed to get it merged. If you create a new patch based on this work, please credit the original author.
-
Frans Hendriks (Code Review) -
Jorge Fernandez (Code Review)
-
Marshall Dawson (Code Review)
-
Martin L Roth (Code Review)
-
Name of user not set (Code Review)
-
Paul Menzel (Code Review)