History

Merge tag 'qcom-drivers-for-5.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into arm/drivers

Qualcomm ARM Based Driver Updates for v5.1 - Part 2 * Fixups/Cleanup for Qualcomm LLCC * tag 'qcom-drivers-for-5.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux: qcom: soc: llcc-slice: Consolidate some code qcom: soc: llcc-slice: Clear the global drv_data pointer on error

Arnd Bergmann committed 7 years ago

Commit 5aa8f492 parents 50b0225 ed10a253 files · +80 −33Browse files

Unified · Split

3 files
  1. drivers/soc/qcom/llcc-sdm845.c +6 −0
  2. drivers/soc/qcom/llcc-slice.c +68 −33
  3. include/linux/soc/qcom/llcc-qcom.h +6 −0
drivers/soc/qcom/llcc-sdm845.c+6−0
@@ -71,6 +71,11 @@ static struct llcc_slice_config sdm845_data[] = { · 70 unmodified lines
7171 SCT_ENTRY(LLCC_AUDHW, 22, 1024, 1, 1, 0xffc, 0x2, 0, 0, 1, 1, 0),
7272 };
7373
74+static int sdm845_qcom_llcc_remove(struct platform_device *pdev)
75+{
76+ return qcom_llcc_remove(pdev);
77+}
78+
7479 static int sdm845_qcom_llcc_probe(struct platform_device *pdev)
7580 {
7681 return qcom_llcc_probe(pdev, sdm845_data, ARRAY_SIZE(sdm845_data));
@@ -87,6 +92,7 @@ static struct platform_driver sdm845_qcom_llcc_driver = { · 10 unmodified lines
8792 .of_match_table = sdm845_qcom_llcc_of_match,
8893 },
8994 .probe = sdm845_qcom_llcc_probe,
95+ .remove = sdm845_qcom_llcc_remove,
9096 };
9197 module_platform_driver(sdm845_qcom_llcc_driver);
9298
drivers/soc/qcom/llcc-slice.c+68−33
@@ -46,7 +46,7 @@ · 45 unmodified lines
4646
4747 #define BANK_OFFSET_STRIDE 0x80000
4848
49−static struct llcc_drv_data *drv_data;
49+static struct llcc_drv_data *drv_data = (void *) -EPROBE_DEFER;
5050
5151 static const struct regmap_config llcc_regmap_config = {
5252 .reg_bits = 32,
@@ -68,6 +68,9 @@ struct llcc_slice_desc *llcc_slice_getd(u32 uid) · 15 unmodified lines
6868 struct llcc_slice_desc *desc;
6969 u32 sz, count;
7070
71+ if (IS_ERR(drv_data))
72+ return ERR_CAST(drv_data);
73+
7174 cfg = drv_data->cfg;
7275 sz = drv_data->cfg_size;
7376
@@ -108,6 +111,9 @@ static int llcc_update_act_ctrl(u32 sid, · 34 unmodified lines
108111 u32 slice_status;
109112 int ret;
110113
114+ if (IS_ERR(drv_data))
115+ return PTR_ERR(drv_data);
116+
111117 act_ctrl_reg = LLCC_TRP_ACT_CTRLn(sid);
112118 status_reg = LLCC_TRP_STATUSn(sid);
113119
@@ -143,6 +149,9 @@ int llcc_slice_activate(struct llcc_slice_desc *desc) · 29 unmodified lines
143149 int ret;
144150 u32 act_ctrl_val;
145151
152+ If (IS_ERR(drv_data))
153+ return PTR_ERR(drv_data);
154+
146155 if (IS_ERR_OR_NULL(desc))
147156 return -EINVAL;
148157
@@ -180,6 +189,9 @@ int llcc_slice_deactivate(struct llcc_slice_desc *desc) · 31 unmodified lines
180189 u32 act_ctrl_val;
181190 int ret;
182191
192+ If (IS_ERR(drv_data))
193+ return PTR_ERR(drv_data);
194+
183195 if (IS_ERR_OR_NULL(desc))
184196 return -EINVAL;
185197
@@ -289,46 +301,62 @@ static int qcom_llcc_cfg_program(struct platform_device *pdev) · 103 unmodified lines
289301 return ret;
290302 }
291303
304+int qcom_llcc_remove(struct platform_device *pdev)
305+{
306+ /* Set the global pointer to a error code to avoid referencing it */
307+ drv_data = ERR_PTR(-ENODEV);
308+ return 0;
309+}
310+EXPORT_SYMBOL_GPL(qcom_llcc_remove);
311+
312+static struct regmap *qcom_llcc_init_mmio(struct platform_device *pdev,
313+ const char *name)
314+{
315+ struct resource *res;
316+ void __iomem *base;
317+
318+ res = platform_get_resource_byname(pdev, IORESOURCE_MEM, name);
319+ if (!res)
320+ return ERR_PTR(-ENODEV);
321+
322+ base = devm_ioremap_resource(&pdev->dev, res);
323+ if (IS_ERR(base))
324+ return ERR_CAST(base);
325+
326+ return devm_regmap_init_mmio(&pdev->dev, base, &llcc_regmap_config);
327+}
328+
292329 int qcom_llcc_probe(struct platform_device *pdev,
293330 const struct llcc_slice_config *llcc_cfg, u32 sz)
294331 {
295332 u32 num_banks;
296333 struct device *dev = &pdev->dev;
297− struct resource *llcc_banks_res, *llcc_bcast_res;
298− void __iomem *llcc_banks_base, *llcc_bcast_base;
299334 int ret, i;
300335 struct platform_device *llcc_edac;
301336
302337 drv_data = devm_kzalloc(dev, sizeof(*drv_data), GFP_KERNEL);
303− if (!drv_data)
304− return -ENOMEM;
305−
306− llcc_banks_res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
307− "llcc_base");
308− llcc_banks_base = devm_ioremap_resource(&pdev->dev, llcc_banks_res);
309− if (IS_ERR(llcc_banks_base))
310− return PTR_ERR(llcc_banks_base);
311−
312− drv_data->regmap = devm_regmap_init_mmio(dev, llcc_banks_base,
313− &llcc_regmap_config);
314− if (IS_ERR(drv_data->regmap))
315− return PTR_ERR(drv_data->regmap);
316−
317− llcc_bcast_res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
318− "llcc_broadcast_base");
319− llcc_bcast_base = devm_ioremap_resource(&pdev->dev, llcc_bcast_res);
320− if (IS_ERR(llcc_bcast_base))
321− return PTR_ERR(llcc_bcast_base);
322−
323− drv_data->bcast_regmap = devm_regmap_init_mmio(dev, llcc_bcast_base,
324− &llcc_regmap_config);
325− if (IS_ERR(drv_data->bcast_regmap))
326− return PTR_ERR(drv_data->bcast_regmap);
338+ if (!drv_data) {
339+ ret = -ENOMEM;
340+ goto err;
341+ }
342+
343+ drv_data->regmap = qcom_llcc_init_mmio(pdev, "llcc_base");
344+ if (IS_ERR(drv_data->regmap)) {
345+ ret = PTR_ERR(drv_data->regmap);
346+ goto err;
347+ }
348+
349+ drv_data->bcast_regmap =
350+ qcom_llcc_init_mmio(pdev, "llcc_broadcast_base");
351+ if (IS_ERR(drv_data->bcast_regmap)) {
352+ ret = PTR_ERR(drv_data->bcast_regmap);
353+ goto err;
354+ }
327355
328356 ret = regmap_read(drv_data->regmap, LLCC_COMMON_STATUS0,
329357 &num_banks);
330358 if (ret)
331− return ret;
359+ goto err;
332360
333361 num_banks &= LLCC_LB_CNT_MASK;
334362 num_banks >>= LLCC_LB_CNT_SHIFT;
@@ -340,8 +368,10 @@ int qcom_llcc_probe(struct platform_device *pdev, · 5 unmodified lines
340368
341369 drv_data->offsets = devm_kcalloc(dev, num_banks, sizeof(u32),
342370 GFP_KERNEL);
343− if (!drv_data->offsets)
344− return -ENOMEM;
371+ if (!drv_data->offsets) {
372+ ret = -ENOMEM;
373+ goto err;
374+ }
345375
346376 for (i = 0; i < num_banks; i++)
347377 drv_data->offsets[i] = i * BANK_OFFSET_STRIDE;
@@ -349,8 +379,10 @@ int qcom_llcc_probe(struct platform_device *pdev, · 1 unmodified line
349379 drv_data->bitmap = devm_kcalloc(dev,
350380 BITS_TO_LONGS(drv_data->max_slices), sizeof(unsigned long),
351381 GFP_KERNEL);
352− if (!drv_data->bitmap)
353− return -ENOMEM;
382+ if (!drv_data->bitmap) {
383+ ret = -ENOMEM;
384+ goto err;
385+ }
354386
355387 drv_data->cfg = llcc_cfg;
356388 drv_data->cfg_size = sz;
@@ -359,7 +391,7 @@ int qcom_llcc_probe(struct platform_device *pdev, · 2 unmodified lines
359391
360392 ret = qcom_llcc_cfg_program(pdev);
361393 if (ret)
362− return ret;
394+ goto err;
363395
364396 drv_data->ecc_irq = platform_get_irq(pdev, 0);
365397 if (drv_data->ecc_irq >= 0) {
@@ -370,6 +402,9 @@ int qcom_llcc_probe(struct platform_device *pdev, · 4 unmodified lines
370402 dev_err(dev, "Failed to register llcc edac driver\n");
371403 }
372404
405+ return 0;
406+err:
407+ drv_data = ERR_PTR(-ENODEV);
373408 return ret;
374409 }
375410 EXPORT_SYMBOL_GPL(qcom_llcc_probe);
include/linux/soc/qcom/llcc-qcom.h+6−0
@@ -162,6 +162,12 @@ int llcc_slice_deactivate(struct llcc_slice_desc *desc); · 161 unmodified lines
162162 */
163163 int qcom_llcc_probe(struct platform_device *pdev,
164164 const struct llcc_slice_config *table, u32 sz);
165+
166+/**
167+ * qcom_llcc_remove - remove the sct table
168+ * @pdev: Platform device pointer
169+ */
170+int qcom_llcc_remove(struct platform_device *pdev);
165171 #else
166172 static inline struct llcc_slice_desc *llcc_slice_getd(u32 uid)
167173 {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t