tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

platform/x86/intel/pmc: Allow pmc_core_ssram_init to fail

Currently, if the PMC SSRAM initialization fails, no error is returned and
the only indication is that a PMC device has not been created. Instead,
allow an error to be returned and handled directly by the caller.

Signed-off-by: David E. Box <david.e.box@linux.intel.com>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20231129222132.2331261-13-david.e.box@linux.intel.com
Signed-off-by: Hans de Goede <hdegoede@redhat.com>

authored by

David E. Box and committed by
Hans de Goede 9512920a 2e35e3aa

+14 -9
+1 -1
drivers/platform/x86/intel/pmc/core.h
··· 492 492 int get_primary_reg_base(struct pmc *pmc); 493 493 extern void pmc_core_get_low_power_modes(struct pmc_dev *pmcdev); 494 494 495 - extern void pmc_core_ssram_init(struct pmc_dev *pmcdev); 495 + extern int pmc_core_ssram_init(struct pmc_dev *pmcdev); 496 496 497 497 int spt_core_init(struct pmc_dev *pmcdev); 498 498 int cnp_core_init(struct pmc_dev *pmcdev);
+13 -8
drivers/platform/x86/intel/pmc/core_ssram.c
··· 35 35 return lo_hi_readq(addr + offset) & GENMASK_ULL(63, 3); 36 36 } 37 37 38 - static void 38 + static int 39 39 pmc_core_pmc_add(struct pmc_dev *pmcdev, u64 pwrm_base, 40 40 const struct pmc_reg_map *reg_map, int pmc_index) 41 41 { 42 42 struct pmc *pmc = pmcdev->pmcs[pmc_index]; 43 43 44 44 if (!pwrm_base) 45 - return; 45 + return -ENODEV; 46 46 47 47 /* Memory for primary PMC has been allocated in core.c */ 48 48 if (!pmc) { 49 49 pmc = devm_kzalloc(&pmcdev->pdev->dev, sizeof(*pmc), GFP_KERNEL); 50 50 if (!pmc) 51 - return; 51 + return -ENOMEM; 52 52 } 53 53 54 54 pmc->map = reg_map; ··· 57 57 58 58 if (!pmc->regbase) { 59 59 devm_kfree(&pmcdev->pdev->dev, pmc); 60 - return; 60 + return -ENOMEM; 61 61 } 62 62 63 63 pmcdev->pmcs[pmc_index] = pmc; 64 + 65 + return 0; 64 66 } 65 67 66 68 static void ··· 98 96 iounmap(ssram); 99 97 } 100 98 101 - void pmc_core_ssram_init(struct pmc_dev *pmcdev) 99 + int pmc_core_ssram_init(struct pmc_dev *pmcdev) 102 100 { 103 101 void __iomem *ssram; 104 102 struct pci_dev *pcidev; ··· 107 105 108 106 pcidev = pci_get_domain_bus_and_slot(0, 0, PCI_DEVFN(20, 2)); 109 107 if (!pcidev) 110 - goto out; 108 + return -ENODEV; 111 109 112 110 ret = pcim_enable_device(pcidev); 113 111 if (ret) ··· 125 123 pmc_core_ssram_get_pmc(pmcdev, ssram, SSRAM_PCH_OFFSET, PMC_IDX_PCH); 126 124 127 125 iounmap(ssram); 128 - out: 129 - return; 126 + 127 + return 0; 130 128 131 129 disable_dev: 130 + pmcdev->ssram_pcidev = NULL; 132 131 pci_disable_device(pcidev); 133 132 release_dev: 134 133 pci_dev_put(pcidev); 134 + 135 + return ret; 135 136 }