Skip to content

Commit abeb9f8

Browse files
committed
Merge: Update VMD driver's vmd_dev::cfg _lock
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/649 ``` Merge branch 'pci/controller/vmd' - Convert vmd_dev.cfg_lock from spinlock_t to raw_spinlock_t so pci_ops.read() will never sleep, even on PREEMPT_RT where spinlock_t becomes a sleepable lock (Ryo Takakura) * pci/controller/vmd: PCI: vmd: Make vmd_dev::cfg_lock a raw_spinlock_t type JIRA: https://issues.redhat.com/browse/RHEL-83150 Signed-off-by: Myron Stowe <mstowe@redhat.com> ``` Approved-by: John W. Linville <linville@redhat.com> Approved-by: Bastien Nocera <bnocera@redhat.com> Approved-by: Tony Camuso <tcamuso@redhat.com> Approved-by: Luis Claudio R. Goncalves <lgoncalv@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Julio Faracco <jfaracco@redhat.com>
2 parents 43a30bf + 37d3b75 commit abeb9f8

File tree

1 file changed

+6
-6
lines changed
  • drivers/pci/controller

1 file changed

+6
-6
lines changed

drivers/pci/controller/vmd.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ struct vmd_irq_list {
125125
struct vmd_dev {
126126
struct pci_dev *dev;
127127

128-
spinlock_t cfg_lock;
128+
raw_spinlock_t cfg_lock;
129129
void __iomem *cfgbar;
130130

131131
int msix_count;
@@ -391,7 +391,7 @@ static int vmd_pci_read(struct pci_bus *bus, unsigned int devfn, int reg,
391391
if (!addr)
392392
return -EFAULT;
393393

394-
spin_lock_irqsave(&vmd->cfg_lock, flags);
394+
raw_spin_lock_irqsave(&vmd->cfg_lock, flags);
395395
switch (len) {
396396
case 1:
397397
*value = readb(addr);
@@ -406,7 +406,7 @@ static int vmd_pci_read(struct pci_bus *bus, unsigned int devfn, int reg,
406406
ret = -EINVAL;
407407
break;
408408
}
409-
spin_unlock_irqrestore(&vmd->cfg_lock, flags);
409+
raw_spin_unlock_irqrestore(&vmd->cfg_lock, flags);
410410
return ret;
411411
}
412412

@@ -426,7 +426,7 @@ static int vmd_pci_write(struct pci_bus *bus, unsigned int devfn, int reg,
426426
if (!addr)
427427
return -EFAULT;
428428

429-
spin_lock_irqsave(&vmd->cfg_lock, flags);
429+
raw_spin_lock_irqsave(&vmd->cfg_lock, flags);
430430
switch (len) {
431431
case 1:
432432
writeb(value, addr);
@@ -444,7 +444,7 @@ static int vmd_pci_write(struct pci_bus *bus, unsigned int devfn, int reg,
444444
ret = -EINVAL;
445445
break;
446446
}
447-
spin_unlock_irqrestore(&vmd->cfg_lock, flags);
447+
raw_spin_unlock_irqrestore(&vmd->cfg_lock, flags);
448448
return ret;
449449
}
450450

@@ -1009,7 +1009,7 @@ static int vmd_probe(struct pci_dev *dev, const struct pci_device_id *id)
10091009
if (features & VMD_FEAT_OFFSET_FIRST_VECTOR)
10101010
vmd->first_vec = 1;
10111011

1012-
spin_lock_init(&vmd->cfg_lock);
1012+
raw_spin_lock_init(&vmd->cfg_lock);
10131013
pci_set_drvdata(dev, vmd);
10141014
err = vmd_enable_domain(vmd, features);
10151015
if (err)

0 commit comments

Comments
 (0)