From e1e455bc96063b61ef97bd7894b0f38bd81f3941 Mon Sep 17 00:00:00 2001 From: Elyes HAOUAS Date: Sun, 16 Sep 2018 18:54:33 +0200 Subject: sb/amd/sr5650/sr5650.h: Get rid of device_t Use of device_t has been abandoned in ramstage. Change-Id: Ib4dbb607cfd1e02d45efe141b498d6505574d6e6 Signed-off-by: Elyes HAOUAS Reviewed-on: https://review.coreboot.org/28633 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- src/southbridge/amd/sr5650/sr5650.h | 65 ++++++++++++++++++++----------------- 1 file changed, 35 insertions(+), 30 deletions(-) (limited to 'src/southbridge/amd') diff --git a/src/southbridge/amd/sr5650/sr5650.h b/src/southbridge/amd/sr5650/sr5650.h index ea7005c9ef..2e6b728495 100644 --- a/src/southbridge/amd/sr5650/sr5650.h +++ b/src/southbridge/amd/sr5650/sr5650.h @@ -89,47 +89,52 @@ typedef struct __PCIE_CFG__ { extern PCIE_CFG AtiPcieCfg; /* ----------------- export functions ----------------- */ -u32 nbpcie_p_read_index(device_t dev, u32 index); -void nbpcie_p_write_index(device_t dev, u32 index, u32 data); -u32 nbpcie_ind_read_index(device_t nb_dev, u32 index); -void nbpcie_ind_write_index(device_t nb_dev, u32 index, u32 data); -uint32_t l2cfg_ind_read_index(device_t nb_dev, uint32_t index); -void l2cfg_ind_write_index(device_t nb_dev, uint32_t index, uint32_t data); -uint32_t l1cfg_ind_read_index(device_t nb_dev, uint32_t index); -void l1cfg_ind_write_index(device_t nb_dev, uint32_t index, uint32_t data); -u32 pci_ext_read_config32(device_t nb_dev, device_t dev, u32 reg); -void pci_ext_write_config32(device_t nb_dev, device_t dev, u32 reg, u32 mask, u32 val); -void sr5650_set_tom(device_t nb_dev); +u32 nbpcie_p_read_index(struct device *dev, u32 index); +void nbpcie_p_write_index(struct device *dev, u32 index, u32 data); +u32 nbpcie_ind_read_index(struct device *nb_dev, u32 index); +void nbpcie_ind_write_index(struct device *nb_dev, u32 index, u32 data); +uint32_t l2cfg_ind_read_index(struct device *nb_dev, uint32_t index); +void l2cfg_ind_write_index(struct device *nb_dev, uint32_t index, + uint32_t data); +uint32_t l1cfg_ind_read_index(struct device *nb_dev, uint32_t index); +void l1cfg_ind_write_index(struct device *nb_dev, uint32_t index, + uint32_t data); +u32 pci_ext_read_config32(struct device *nb_dev, struct device *dev, u32 reg); +void pci_ext_write_config32(struct device *nb_dev, struct device *dev, u32 reg, + u32 mask, u32 val); +void sr5650_set_tom(struct device *nb_dev); -unsigned long southbridge_write_acpi_tables(device_t device, unsigned long current, - struct acpi_rsdp *rsdp); +unsigned long southbridge_write_acpi_tables(struct device *device, + unsigned long current, + struct acpi_rsdp *rsdp); void ProgK8TempMmioBase(u8 in_out, u32 pcie_base_add, u32 mmio_base_add); -void enable_pcie_bar3(device_t nb_dev); -void disable_pcie_bar3(device_t nb_dev); +void enable_pcie_bar3(struct device *nb_dev); +void disable_pcie_bar3(struct device *nb_dev); void enable_sr5650_dev8(void); void sr5650_htinit(void); void sr5650_htinit_dect_and_enable_isochronous_link(void); void sr5650_early_setup(void); void sr5650_before_pci_init(void); -void sr5650_enable(device_t dev); -void sr5650_gpp_sb_init(device_t nb_dev, device_t dev, u32 port); -void sr5650_gfx_init(device_t nb_dev, device_t dev, u32 port); -void avoid_lpc_dma_deadlock(device_t nb_dev, device_t sb_dev); -void config_gpp_core(device_t nb_dev, device_t sb_dev); -void PcieReleasePortTraining(device_t nb_dev, device_t dev, u32 port); -u8 PcieTrainPort(device_t nb_dev, device_t dev, u32 port); -void pcie_config_misc_clk(device_t nb_dev); +void sr5650_enable(struct device *dev); +void sr5650_gpp_sb_init(struct device *nb_dev, struct device *dev, u32 port); +void sr5650_gfx_init(struct device *nb_dev, struct device *dev, u32 port); +void avoid_lpc_dma_deadlock(struct device *nb_dev, struct device *sb_dev); +void config_gpp_core(struct device *nb_dev, struct device *sb_dev); +void PcieReleasePortTraining(struct device *nb_dev, struct device *dev, + u32 port); +u8 PcieTrainPort(struct device *nb_dev, struct device *dev, u32 port); +void pcie_config_misc_clk(struct device *nb_dev); void fam10_optimization(void); void sr5650_disable_pcie_bridge(void); -u32 get_vid_did(device_t dev); -void detect_and_enable_iommu(device_t iommu_dev); -void sr5650_iommu_read_resources(device_t dev); -void sr5650_iommu_set_resources(device_t dev); -void sr5650_iommu_enable_resources(device_t dev); -void sr5650_nb_pci_table(device_t nb_dev); -void init_gen2(device_t nb_dev, device_t dev, u8 port); +u32 get_vid_did(struct device *dev); +void detect_and_enable_iommu(struct device *iommu_dev); +void sr5650_iommu_read_resources(struct device *dev); +void sr5650_iommu_set_resources(struct device *dev); +void sr5650_iommu_enable_resources(struct device *dev); +void sr5650_nb_pci_table(struct device *nb_dev); +void init_gen2(struct device *nb_dev, struct device *dev, u8 port); void sr56x0_lock_hwinitreg(void); struct resource * sr5650_retrieve_cpu_mmio_resource(void); #endif /* __SR5650_H__ */ -- cgit v1.2.3