nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-23 01:50:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: remove GV100 PCI dev ids

Browse Source 
GV100 dGPU is no longer a POR. Deprecate its support by removing all
of the PCI IDs supported by nvgpu.
GV100 will stop booting with this patch

Bug 200496768

Change-Id: I5cace0d2438556508f457434111c1c6dc8332a3a
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2124111
GVS: Gerrit_Virtual_Submit
Reviewed-by: Thomas Fleury <tfleury@nvidia.com>
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Deepak Nibade
2019-05-23 13:01:36 +05:30
committed by mobile promotions
parent 9e6c3622ad
commit d27a72584f
1 changed files with 70 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

304
drivers/gpu/nvgpu/os/linux/pci.c
View File

@@ -72,224 +72,84 @@ static long nvgpu_pci_clk_round_rate(struct device *dev, unsigned long rate)
} }
static struct gk20a_platform nvgpu_pci_device[] = { static struct gk20a_platform nvgpu_pci_device[] = {
{ /* DEVICE=PG503 SKU 201 */ /* SKU 0x1ebf */
/* ptimer src frequency in hz */
.ptimer_src_freq = 31250000,
.probe = nvgpu_pci_tegra_probe,
.remove = nvgpu_pci_tegra_remove,
/* power management configuration */
.railgate_delay_init = 500,
.can_railgate_init = false,
.can_elpg_init = false,
.enable_elpg = false,
.enable_elcg = false,
.enable_slcg = false,
.enable_blcg = false,
.enable_mscg = false,
.can_slcg = false,
.can_blcg = false,
.can_elcg = false,
.disable_aspm = true,
/* power management callbacks */
.is_railgated = nvgpu_pci_tegra_is_railgated,
.clk_round_rate = nvgpu_pci_clk_round_rate,
.ch_wdt_init_limit_ms = 7000,
.unify_address_spaces = true,
.honors_aperture = true,
.dma_mask = DMA_BIT_MASK(40),
.vbios_min_version = 0x88001e00,
.hardcode_sw_threshold = false,
.run_preos = true,
},
{ /* DEVICE=PG503 SKU 200 ES */
/* ptimer src frequency in hz */
.ptimer_src_freq = 31250000,
.probe = nvgpu_pci_tegra_probe,
.remove = nvgpu_pci_tegra_remove,
/* power management configuration */
.railgate_delay_init = 500,
.can_railgate_init = false,
.can_elpg_init = false,
.enable_elpg = false,
.enable_elcg = false,
.enable_slcg = false,
.enable_blcg = false,
.enable_mscg = false,
.can_slcg = false,
.can_blcg = false,
.can_elcg = false,
.disable_aspm = true,
/* power management callbacks */
.is_railgated = nvgpu_pci_tegra_is_railgated,
.clk_round_rate = nvgpu_pci_clk_round_rate,
.ch_wdt_init_limit_ms = 7000,
.unify_address_spaces = true,
.honors_aperture = true,
.dma_mask = DMA_BIT_MASK(40),
.vbios_min_version = 0x88001e00,
.hardcode_sw_threshold = false,
.run_preos = true,
},
{ {
/* ptimer src frequency in hz */ /* ptimer src frequency in hz */
.ptimer_src_freq = 31250000, .ptimer_src_freq = 31250000,
.probe = nvgpu_pci_tegra_probe, .probe = nvgpu_pci_tegra_probe,
.remove = nvgpu_pci_tegra_remove, .remove = nvgpu_pci_tegra_remove,
/* power management configuration */ /* power management configuration */
.railgate_delay_init = 500, .railgate_delay_init = 500,
.can_railgate_init = false, .can_railgate_init = false,
.can_elpg_init = false, .can_elpg_init = false,
.enable_elpg = false, .enable_elpg = false,
.enable_elcg = false, .enable_elcg = false,
.enable_slcg = false, .enable_slcg = false,
.enable_blcg = false, .enable_blcg = false,
.enable_mscg = false, .enable_mscg = false,
.can_slcg = false, .can_slcg = false,
.can_blcg = false, .can_blcg = false,
.can_elcg = false, .can_elcg = false,
.disable_aspm = true, .disable_aspm = true,
/* power management callbacks */ /* power management callbacks */
.is_railgated = nvgpu_pci_tegra_is_railgated, .is_railgated = nvgpu_pci_tegra_is_railgated,
.clk_round_rate = nvgpu_pci_clk_round_rate, .clk_round_rate = nvgpu_pci_clk_round_rate,
.ch_wdt_init_limit_ms = 7000, /*
* WAR: PCIE X1 is very slow, set to very high value till nvlink is up
*/
.ch_wdt_init_limit_ms = 30000,
.unify_address_spaces = true, .unify_address_spaces = true,
.honors_aperture = true, .honors_aperture = true,
.dma_mask = DMA_BIT_MASK(40), .dma_mask = DMA_BIT_MASK(40),
.vbios_min_version = 0x88000126, .vbios_min_version = 0x1,
.hardcode_sw_threshold = false, .hardcode_sw_threshold = false,
.run_preos = true, .unified_memory = false,
.has_syncpoints = true,
}, },
{ /* PG503 SKU250 */
/* ptimer src frequency in hz */
.ptimer_src_freq = 31250000,
.probe = nvgpu_pci_tegra_probe, /* 0x1eba, 0x1efa, 0x1ebb, 0x1efb */
.remove = nvgpu_pci_tegra_remove, /* 0x1eae, 0x1eaf (internal chip SKUs) */
{
/* ptimer src frequency in hz */
.ptimer_src_freq = 31250000,
/* power management configuration */ .probe = nvgpu_pci_tegra_probe,
.railgate_delay_init = 500, .remove = nvgpu_pci_tegra_remove,
.can_railgate_init = false,
.can_pci_gc_off = true,
.can_elpg_init = false,
.enable_elpg = false,
.enable_elcg = false,
.enable_slcg = true,
.enable_blcg = true,
.enable_mscg = false,
.can_slcg = true,
.can_blcg = true,
.can_elcg = false,
.disable_aspm = true, /* power management configuration */
.railgate_delay_init = 500,
.can_railgate_init = false,
.can_pci_gc_off = true,
.can_elpg_init = false,
.enable_elpg = false,
.enable_elcg = false,
.enable_slcg = true,
.enable_blcg = true,
.enable_mscg = false,
.can_slcg = true,
.can_blcg = true,
.can_elcg = false,
/* power management callbacks */ .disable_aspm = true,
.is_railgated = nvgpu_pci_tegra_is_railgated,
.clk_round_rate = nvgpu_pci_clk_round_rate,
.ch_wdt_init_limit_ms = 7000, /* power management callbacks */
.is_railgated = nvgpu_pci_tegra_is_railgated,
.clk_round_rate = nvgpu_pci_clk_round_rate,
.unify_address_spaces = true, .ch_wdt_init_limit_ms = 7000,
.honors_aperture = true,
.dma_mask = DMA_BIT_MASK(40),
.vbios_min_version = 0x88005900,
.hardcode_sw_threshold = false,
.run_preos = true,
.has_syncpoints = true,
},
{ /* SKU 0x1ebf */
/* ptimer src frequency in hz */
.ptimer_src_freq = 31250000,
.probe = nvgpu_pci_tegra_probe, .unify_address_spaces = true,
.remove = nvgpu_pci_tegra_remove, .honors_aperture = true,
.dma_mask = DMA_BIT_MASK(40),
/* power management configuration */ .vbios_min_version = 0x90041800,
.railgate_delay_init = 500, .vbios_compatible_version = 0x90045A00,
.can_railgate_init = false, .hardcode_sw_threshold = false,
.can_elpg_init = false, .has_syncpoints = true,
.enable_elpg = false,
.enable_elcg = false,
.enable_slcg = false,
.enable_blcg = false,
.enable_mscg = false,
.can_slcg = false,
.can_blcg = false,
.can_elcg = false,
.disable_aspm = true,
/* power management callbacks */
.is_railgated = nvgpu_pci_tegra_is_railgated,
.clk_round_rate = nvgpu_pci_clk_round_rate,
/*
* WAR: PCIE X1 is very slow, set to very high value till nvlink is up
*/
.ch_wdt_init_limit_ms = 30000,
.unify_address_spaces = true,
.honors_aperture = true,
.dma_mask = DMA_BIT_MASK(40),
.vbios_min_version = 0x1,
.hardcode_sw_threshold = false,
.unified_memory = false,
},
{ /* 0x1eba, 0x1efa, 0x1ebb, 0x1efb */
/* 0x1eae, 0x1eaf (internal chip SKUs) */
/* ptimer src frequency in hz */
.ptimer_src_freq = 31250000,
.probe = nvgpu_pci_tegra_probe,
.remove = nvgpu_pci_tegra_remove,
/* power management configuration */
.railgate_delay_init = 500,
.can_railgate_init = false,
.can_pci_gc_off = true,
.can_elpg_init = false,
.enable_elpg = false,
.enable_elcg = false,
.enable_slcg = true,
.enable_blcg = true,
.enable_mscg = false,
.can_slcg = true,
.can_blcg = true,
.can_elcg = false,
.disable_aspm = true,
/* power management callbacks */
.is_railgated = nvgpu_pci_tegra_is_railgated,
.clk_round_rate = nvgpu_pci_clk_round_rate,
.ch_wdt_init_limit_ms = 7000,
.unify_address_spaces = true,
.honors_aperture = true,
.dma_mask = DMA_BIT_MASK(40),
.vbios_min_version = 0x90041800,
.vbios_compatible_version = 0x90045A00,
.hardcode_sw_threshold = false,
.has_syncpoints = true,
}, },
}; };
@@ -300,70 +160,46 @@ static struct gk20a_platform nvgpu_pci_device[] = {
static struct pci_device_id nvgpu_pci_table[] = { static struct pci_device_id nvgpu_pci_table[] = {
{ {
PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, 0x1db1), PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, 0x1ebf),
.class = PCI_BASE_CLASS_DISPLAY << 16, .class = PCI_BASE_CLASS_DISPLAY << 16,
.class_mask = 0xff << 16, .class_mask = 0xff << 16,
.driver_data = 0, .driver_data = 0,
}, },
{ {
PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, 0x1db0), PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, 0x1eba),
.class = PCI_BASE_CLASS_DISPLAY << 16, .class = PCI_BASE_CLASS_DISPLAY << 16,
.class_mask = 0xff << 16, .class_mask = 0xff << 16,
.driver_data = 1, .driver_data = 1,
}, },
{
PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, 0x1dbe),
.class = PCI_BASE_CLASS_DISPLAY << 16,
.class_mask = 0xff << 16,
.driver_data = 2,
},
{
PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, 0x1df1),
.class = PCI_BASE_CLASS_DISPLAY << 16,
.class_mask = 0xff << 16,
.driver_data = 3,
},
{
PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, 0x1ebf),
.class = PCI_BASE_CLASS_DISPLAY << 16,
.class_mask = 0xff << 16,
.driver_data = 4,
},
{
PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, 0x1eba),
.class = PCI_BASE_CLASS_DISPLAY << 16,
.class_mask = 0xff << 16,
.driver_data = 5,
},
{ {
PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, 0x1efa), PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, 0x1efa),
.class = PCI_BASE_CLASS_DISPLAY << 16, .class = PCI_BASE_CLASS_DISPLAY << 16,
.class_mask = 0xff << 16, .class_mask = 0xff << 16,
.driver_data = 5, .driver_data = 1,
}, },
{ {
PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, 0x1ebb), PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, 0x1ebb),
.class = PCI_BASE_CLASS_DISPLAY << 16, .class = PCI_BASE_CLASS_DISPLAY << 16,
.class_mask = 0xff << 16, .class_mask = 0xff << 16,
.driver_data = 5, .driver_data = 1,
}, },
{ {
PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, 0x1efb), PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, 0x1efb),
.class = PCI_BASE_CLASS_DISPLAY << 16, .class = PCI_BASE_CLASS_DISPLAY << 16,
.class_mask = 0xff << 16, .class_mask = 0xff << 16,
.driver_data = 5, .driver_data = 1,
}, },
{ {
PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, 0x1eae), PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, 0x1eae),
.class = PCI_BASE_CLASS_DISPLAY << 16, .class = PCI_BASE_CLASS_DISPLAY << 16,
.class_mask = 0xff << 16, .class_mask = 0xff << 16,
.driver_data = 5 | PCI_DEVICE_F_INTERNAL_CHIP_SKU, .driver_data = 1 | PCI_DEVICE_F_INTERNAL_CHIP_SKU,
}, },
{ {
PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, 0x1eaf), PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, 0x1eaf),
.class = PCI_BASE_CLASS_DISPLAY << 16, .class = PCI_BASE_CLASS_DISPLAY << 16,
.class_mask = 0xff << 16, .class_mask = 0xff << 16,
.driver_data = 5 | PCI_DEVICE_F_INTERNAL_CHIP_SKU, .driver_data = 1 | PCI_DEVICE_F_INTERNAL_CHIP_SKU,
}, },
{} {}