system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-20 19:17:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

ASPEED soc updates for 5.15

Browse source 
* Two fixes for drivers that control the mapping of BMC memory over
    PCIe and LPC
 
  * Re-enable FWH2AHB on systems that have it closed off by default
 
  * A new id for the AST2625, an AST2600 variant
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE+nHMAt9PCBDH63wBa3ZZB4FHcJ4FAmEd31cACgkQa3ZZB4FH
 cJ7I/RAAicAazWZRX2hzbsKWWjd+JNWQiwRwJ6cojMlikRy8foqna0MrLTH3w5Y8
 kngEt618jh3mD5BOMx5rjl74ToCBjvvcaTCIjwrWmx5O/2zQEpLNvZVdIonvLt5g
 3b+ZksypO/ull3RHntAKVivGPkCvgQqsP8QshbYbiOnGPrPueOLzzN8kT2LHQ+V0
 NJf+MiVdpe7ynPejWkq/OO79mz5KcNCOXHLirFqIrXaC9DFWE15H+L6U9AXx28gg
 UqXTwBreojBzikFsYb+a4ARgHTilfn10xF+7dVERUV0I5o2/UF7ZLzbSRmsLDpVe
 PTPWsvUcJuugQmTu4wNPSSaYJo1Vn7qCbpPdNAaU+FE0TGz26JDaNOR2ExIfscDO
 V51zo6RGTFaFWz6kB4rhz6glYjE0Ee35rhuRpXq9IqPdqAXXDH00hLjCn2a7/RxK
 K1AsLnaN3+yJrCCzBBN8ET8nzdM8YwiD+JhOR7szbdgQun23GC6vChIiYZDWvje4
 E6G9pOv1Pl5qGcjSz6SSTa5ZlcEvrQBtrXkBFIL4n2lJeuPbvAnUHUlE95um+RGj
 Ck6caZAK1Xj6kXZlTRvV1zofo8iZjwdctxyY3hY1A4AZYKuMKqMHtFMSyw4I14TA
 7wfB+/9jlL1th7gCWJoaCKT2FLpn7cXmwBkoAsnczKyy2HIY+SM=
 =kPiv
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmEedsYACgkQmmx57+YA
 GNngvQ/8DznceSeltNaXON6I75z0BlVRlkbjxOzLP5Fyq5v3rtPkRRoaeSF1GHWl
 pfsMUfMd/LZdZQC8OP1TDhBNKg/mKNEy7bkO3rJ4lqB8M0WTS5ijRF8iTaVNwbK/
 iC6OOftXsKurWdTBjXJ7J0s4tLJBmc4RcwVO5/SeJ9l269oh3EyvYCNU91luPPsM
 3PZX3yU7DuPOl/ydSGm6wQ/qvL/G3QbNKVG0TQ5RRnTRIpbJUYAxR9g9n/GO+5Oo
 wW73VHJMhLlXQ8Z0VzmRpwS6NJ+SGmrBj+TYEQfL7TxD8siJMsbDQvmrF7rDKem3
 0JtPvoTURmyooJ1xwOGW/laCLPT1R4LILVFKPo7/CzOHAtUweVIYk7XEl/Aw+Pz8
 V+J+0xVBqS18kDPlfCjQTSMG7ucFVcpAhlCXZofQB8F1VY4RfQxIYCtMd4AVnVqu
 2sZ663LB2kgMtQ4dfZw0D/LK32xEUxzEsDyQxGSSqdOeLvsCC4RUkfgtMWFA6LWd
 uLmUSa3hH3RvkoXKY76yX3HwnHgHEopL4fTSdyQDrLVoiucb1IOPXDo2FvtRBk3R
 ENqaAAVfmBjLmkTK1NcQEyftzVa0aS3CnNLHC48GbeHN3i+/UQFpdVuNmDwOeoxy
 cTBUrFPJjqHGqHllo+VPtFoxuoTbjIVYmiGdfzpyEg2VfD8hnZA=
 =MUV/
 -----END PGP SIGNATURE-----

Merge tag 'aspeed-5.15-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc into arm/soc

ASPEED soc updates for 5.15

 * Two fixes for drivers that control the mapping of BMC memory over
   PCIe and LPC

 * Re-enable FWH2AHB on systems that have it closed off by default

 * A new id for the AST2625, an AST2600 variant

* tag 'aspeed-5.15-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc:
  soc: aspeed: Re-enable FWH2AHB on AST2600
  soc: aspeed: socinfo: Add AST2625 variant
  soc: aspeed: p2a-ctrl: Fix boundary check for mmap
  soc: aspeed: lpc-ctrl: Fix boundary check for mmap

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2021-08-19 17:02:52 +02:00
parent 0fbd740944 2f9b25fa66
commit 9dbacd465a
3 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
drivers/soc/aspeed/aspeed-lpc-ctrl.c
View file

@ -37,6 +37,7 @@ struct aspeed_lpc_ctrl {
u32 pnor_size;
u32 pnor_base;
bool fwh2ahb;
struct regmap *scu;
};
static struct aspeed_lpc_ctrl *file_aspeed_lpc_ctrl(struct file *file)
@ -51,7 +52,7 @@ static int aspeed_lpc_ctrl_mmap(struct file *file, struct vm_area_struct *vma)
unsigned long vsize = vma->vm_end - vma->vm_start;
pgprot_t prot = vma->vm_page_prot;
if (vma->vm_pgoff + vsize > lpc_ctrl->mem_base + lpc_ctrl->mem_size)
if (vma->vm_pgoff + vma_pages(vma) > lpc_ctrl->mem_size >> PAGE_SHIFT)
return -EINVAL;
/* ast2400/2500 AHB accesses are not cache coherent */
@ -183,13 +184,22 @@ static long aspeed_lpc_ctrl_ioctl(struct file *file, unsigned int cmd,
/*
* Switch to FWH2AHB mode, AST2600 only.
*
* The other bits in this register are interrupt status bits
* that are cleared by writing 1. As we don't want to clear
* them, set only the bit of interest.
*/
if (lpc_ctrl->fwh2ahb)
if (lpc_ctrl->fwh2ahb) {
/*
* Enable FWH2AHB in SCU debug control register 2. This
* does not turn it on, but makes it available for it
* to be configured in HICR6.
*/
regmap_update_bits(lpc_ctrl->scu, 0x0D8, BIT(2), 0);
/*
* The other bits in this register are interrupt status bits
* that are cleared by writing 1. As we don't want to clear
* them, set only the bit of interest.
*/
regmap_write(lpc_ctrl->regmap, HICR6, SW_FWH2AHB);
}
/*
* Enable LPC FHW cycles. This is required for the host to
@ -296,9 +306,16 @@ static int aspeed_lpc_ctrl_probe(struct platform_device *pdev)
return rc;
}
if (of_device_is_compatible(dev->of_node, "aspeed,ast2600-lpc-ctrl"))
if (of_device_is_compatible(dev->of_node, "aspeed,ast2600-lpc-ctrl")) {
lpc_ctrl->fwh2ahb = true;
lpc_ctrl->scu = syscon_regmap_lookup_by_compatible("aspeed,ast2600-scu");
if (IS_ERR(lpc_ctrl->scu)) {
dev_err(dev, "couldn't find scu\n");
return PTR_ERR(lpc_ctrl->scu);
}
}
lpc_ctrl->miscdev.minor = MISC_DYNAMIC_MINOR;
lpc_ctrl->miscdev.name = DEVICE_NAME;
lpc_ctrl->miscdev.fops = &aspeed_lpc_ctrl_fops;

2
drivers/soc/aspeed/aspeed-p2a-ctrl.c
View file

@ -110,7 +110,7 @@ static int aspeed_p2a_mmap(struct file *file, struct vm_area_struct *vma)
vsize = vma->vm_end - vma->vm_start;
prot = vma->vm_page_prot;
if (vma->vm_pgoff + vsize > ctrl->mem_base + ctrl->mem_size)
if (vma->vm_pgoff + vma_pages(vma) > ctrl->mem_size >> PAGE_SHIFT)
return -EINVAL;
/* ast2400/2500 AHB accesses are not cache coherent */

1
drivers/soc/aspeed/aspeed-socinfo.c
View file

@ -26,6 +26,7 @@ static struct {
{ "AST2600", 0x05000303 },
{ "AST2620", 0x05010203 },
{ "AST2605", 0x05030103 },
{ "AST2625", 0x05030403 },
};
static const char *siliconid_to_name(u32 siliconid)