diff options
Diffstat (limited to 'src/soc/amd')
| -rw-r--r-- | src/soc/amd/common/block/include/amdblocks/sata.h | 23 | ||||
| -rw-r--r-- | src/soc/amd/common/block/sata/Kconfig | 5 | ||||
| -rw-r--r-- | src/soc/amd/common/block/sata/Makefile.inc | 1 | ||||
| -rw-r--r-- | src/soc/amd/common/block/sata/sata.c | 41 | ||||
| -rw-r--r-- | src/soc/amd/stoneyridge/Kconfig | 1 | ||||
| -rw-r--r-- | src/soc/amd/stoneyridge/sata.c | 32 |
6 files changed, 73 insertions, 30 deletions
diff --git a/src/soc/amd/common/block/include/amdblocks/sata.h b/src/soc/amd/common/block/include/amdblocks/sata.h new file mode 100644 index 0000000000..2a21436525 --- /dev/null +++ b/src/soc/amd/common/block/include/amdblocks/sata.h @@ -0,0 +1,23 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2017 Advanced Micro Devices, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef __AMDBLOCKS_SATA_H__ +#define __AMDBLOCKS_SATA_H__ + +#include <device/device.h> + +void soc_enable_sata_features(struct device *dev); + +#endif /* __AMDBLOCKS_SATA_H__ */ diff --git a/src/soc/amd/common/block/sata/Kconfig b/src/soc/amd/common/block/sata/Kconfig new file mode 100644 index 0000000000..0c3d5bc0a1 --- /dev/null +++ b/src/soc/amd/common/block/sata/Kconfig @@ -0,0 +1,5 @@ +config SOC_AMD_COMMON_BLOCK_SATA + bool + default n + help + Select this option to use AMD common SATA driver support. diff --git a/src/soc/amd/common/block/sata/Makefile.inc b/src/soc/amd/common/block/sata/Makefile.inc new file mode 100644 index 0000000000..59b99eb9b4 --- /dev/null +++ b/src/soc/amd/common/block/sata/Makefile.inc @@ -0,0 +1 @@ +ramstage-$(CONFIG_SOC_AMD_COMMON_BLOCK_HDA) += sata.c diff --git a/src/soc/amd/common/block/sata/sata.c b/src/soc/amd/common/block/sata/sata.c new file mode 100644 index 0000000000..cbbc7cfd92 --- /dev/null +++ b/src/soc/amd/common/block/sata/sata.c @@ -0,0 +1,41 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2010 Advanced Micro Devices, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <device/device.h> +#include <device/pci.h> +#include <device/pci_ids.h> +#include <device/pci_ops.h> +#include <amdblocks/sata.h> + +void __weak soc_enable_sata_features(struct device *dev) { } + +static struct device_operations sata_ops = { + .read_resources = pci_dev_read_resources, + .set_resources = pci_dev_set_resources, + .enable_resources = pci_dev_enable_resources, + .init = soc_enable_sata_features, +}; + +static const unsigned short pci_device_ids[] = { + PCI_DEVICE_ID_AMD_CZ_SATA, + PCI_DEVICE_ID_AMD_CZ_SATA_AHCI, + 0 +}; + +static const struct pci_driver sata0_driver __pci_driver = { + .ops = &sata_ops, + .vendor = PCI_VENDOR_ID_AMD, + .devices = pci_device_ids, +}; diff --git a/src/soc/amd/stoneyridge/Kconfig b/src/soc/amd/stoneyridge/Kconfig index 5bad30955b..ba82565bf4 100644 --- a/src/soc/amd/stoneyridge/Kconfig +++ b/src/soc/amd/stoneyridge/Kconfig @@ -53,6 +53,7 @@ config CPU_SPECIFIC_OPTIONS select SOC_AMD_COMMON_BLOCK_LPC select SOC_AMD_COMMON_BLOCK_PCI select SOC_AMD_COMMON_BLOCK_HDA + select SOC_AMD_COMMON_BLOCK_SATA select SOC_AMD_COMMON_BLOCK_PI select SOC_AMD_COMMON_BLOCK_PSP select SOC_AMD_COMMON_BLOCK_CAR diff --git a/src/soc/amd/stoneyridge/sata.c b/src/soc/amd/stoneyridge/sata.c index f0dabe046b..6740698dd2 100644 --- a/src/soc/amd/stoneyridge/sata.c +++ b/src/soc/amd/stoneyridge/sata.c @@ -18,9 +18,10 @@ #include <device/pci_ids.h> #include <device/pci_ops.h> #include <device/pci_def.h> +#include <amdblocks/sata.h> #include <soc/southbridge.h> -static void soc_enable_sata_features(struct device *dev) +void soc_enable_sata_features(struct device *dev) { u8 *ahci_ptr; u32 misc_ctl, cap_cfg; @@ -45,32 +46,3 @@ static void soc_enable_sata_features(struct device *dev) temp &= ~SATA_MISC_SUBCLASS_WREN; pci_write_config32(dev, SATA_MISC_CONTROL_REG, temp); }; - -static void sata_init(struct device *dev) -{ - soc_enable_sata_features(dev); -} - -static struct pci_operations lops_pci = { - /* .set_subsystem = pci_dev_set_subsystem, */ -}; - -static struct device_operations sata_ops = { - .read_resources = pci_dev_read_resources, - .set_resources = pci_dev_set_resources, - .enable_resources = pci_dev_enable_resources, - .init = sata_init, - .ops_pci = &lops_pci, -}; - -static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_AMD_CZ_SATA, - PCI_DEVICE_ID_AMD_CZ_SATA_AHCI, - 0 -}; - -static const struct pci_driver sata0_driver __pci_driver = { - .ops = &sata_ops, - .vendor = PCI_VENDOR_ID_AMD, - .devices = pci_device_ids, -}; |