* [PATCH v2] of/irq: Consider device address size in interrupt map walk
@ 2024-08-07 13:40 Stefan Wiehler
2024-08-07 14:09 ` Rob Herring
2024-08-09 0:20 ` kernel test robot
0 siblings, 2 replies; 3+ messages in thread
From: Stefan Wiehler @ 2024-08-07 13:40 UTC (permalink / raw)
To: Rob Herring, Saravana Kannan; +Cc: devicetree, linux-kernel, Stefan Wiehler
When of_irq_parse_raw() is invoked with a device address smaller than
the interrupt parent node (from #address-cells property), KASAN detects
the following out-of-bounds read when populating the initial match table
(dyndbg="func of_irq_parse_* +p"):
OF: of_irq_parse_one: dev=/soc@0/picasso/watchdog, index=0
OF: parent=/soc@0/pci@878000000000/gpio0@17,0, intsize=2
OF: intspec=4
OF: of_irq_parse_raw: ipar=/soc@0/pci@878000000000/gpio0@17,0, size=2
OF: -> addrsize=3
==================================================================
BUG: KASAN: slab-out-of-bounds in of_irq_parse_raw+0x2b8/0x8d0
Read of size 4 at addr ffffff81beca5608 by task bash/764
CPU: 1 PID: 764 Comm: bash Tainted: G O 6.1.67-484c613561-nokia_sm_arm64 #1
Hardware name: Unknown Unknown Product/Unknown Product, BIOS 2023.01-12.24.03-dirty 01/01/2023
Call trace:
dump_backtrace+0xdc/0x130
show_stack+0x1c/0x30
dump_stack_lvl+0x6c/0x84
print_report+0x150/0x448
kasan_report+0x98/0x140
__asan_load4+0x78/0xa0
of_irq_parse_raw+0x2b8/0x8d0
of_irq_parse_one+0x24c/0x270
parse_interrupts+0xc0/0x120
of_fwnode_add_links+0x100/0x2d0
fw_devlink_parse_fwtree+0x64/0xc0
device_add+0xb38/0xc30
of_device_add+0x64/0x90
of_platform_device_create_pdata+0xd0/0x170
of_platform_bus_create+0x244/0x600
of_platform_notify+0x1b0/0x254
blocking_notifier_call_chain+0x9c/0xd0
__of_changeset_entry_notify+0x1b8/0x230
__of_changeset_apply_notify+0x54/0xe4
of_overlay_fdt_apply+0xc04/0xd94
...
The buggy address belongs to the object at ffffff81beca5600
which belongs to the cache kmalloc-128 of size 128
The buggy address is located 8 bytes inside of
128-byte region [ffffff81beca5600, ffffff81beca5680)
The buggy address belongs to the physical page:
page:00000000230d3d03 refcount:1 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x1beca4
head:00000000230d3d03 order:1 compound_mapcount:0 compound_pincount:0
flags: 0x8000000000010200(slab|head|zone=2)
raw: 8000000000010200 0000000000000000 dead000000000122 ffffff810000c300
raw: 0000000000000000 0000000000200020 00000001ffffffff 0000000000000000
page dumped because: kasan: bad access detected
Memory state around the buggy address:
ffffff81beca5500: 04 fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
ffffff81beca5580: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
>ffffff81beca5600: 00 fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
^
ffffff81beca5680: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
ffffff81beca5700: 00 00 00 00 00 00 fc fc fc fc fc fc fc fc fc fc
==================================================================
OF: -> got it !
Signed-off-by: Stefan Wiehler <stefan.wiehler@nokia.com>
---
- Fixed of_get_address_cells() open brace found by checkpatch
---
arch/powerpc/platforms/fsl_uli1575.c | 2 +-
drivers/bcma/main.c | 2 +-
drivers/of/irq.c | 65 ++++++++++++++++------------
drivers/pci/of.c | 2 +-
include/linux/of_irq.h | 3 +-
5 files changed, 42 insertions(+), 32 deletions(-)
diff --git a/arch/powerpc/platforms/fsl_uli1575.c b/arch/powerpc/platforms/fsl_uli1575.c
index b8d37a9932f1b..8da36f72b7b48 100644
--- a/arch/powerpc/platforms/fsl_uli1575.c
+++ b/arch/powerpc/platforms/fsl_uli1575.c
@@ -335,7 +335,7 @@ static void hpcd_final_uli5288(struct pci_dev *dev)
oirq.args_count = 1;
laddr[0] = (hose->first_busno << 16) | (PCI_DEVFN(31, 0) << 8);
laddr[1] = laddr[2] = 0;
- of_irq_parse_raw(laddr, &oirq);
+ of_irq_parse_raw(laddr, ARRAY_SIZE(laddr), &oirq);
dev->irq = irq_create_of_mapping(&oirq);
}
diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c
index 6b5d34919c72b..57d946305496a 100644
--- a/drivers/bcma/main.c
+++ b/drivers/bcma/main.c
@@ -175,7 +175,7 @@ static int bcma_of_irq_parse(struct device *parent,
out_irq->args[0] = num;
laddr[0] = cpu_to_be32(core->addr);
- return of_irq_parse_raw(laddr, out_irq);
+ return of_irq_parse_raw(laddr, ARRAY_SIZE(laddr), out_irq);
}
static unsigned int bcma_of_get_irq(struct device *parent,
diff --git a/drivers/of/irq.c b/drivers/of/irq.c
index c94203ce65bb3..78c35f81cde8f 100644
--- a/drivers/of/irq.c
+++ b/drivers/of/irq.c
@@ -151,9 +151,30 @@ const __be32 *of_irq_parse_imap_parent(const __be32 *imap, int len, struct of_ph
return imap;
}
+static u32 of_get_address_cells(struct device_node *node)
+{
+ struct device_node *tnode, *old = NULL;
+ const __be32 *tmp;
+
+ /* Look for this #address-cells. We have to implement the old linux
+ * trick of looking for the parent here as some device-trees rely on it
+ */
+ old = of_node_get(node);
+ do {
+ tmp = of_get_property(old, "#address-cells", NULL);
+ tnode = of_get_parent(old);
+ of_node_put(old);
+ old = tnode;
+ } while (old && tmp == NULL);
+ of_node_put(old);
+ old = NULL;
+ return (tmp == NULL) ? 2 : be32_to_cpu(*tmp);
+}
+
/**
* of_irq_parse_raw - Low level interrupt tree parsing
* @addr: address specifier (start of "reg" property of the device) in be32 format
+ * @addrsize: address cell size ("#address-cells" property of the device (parent))
* @out_irq: structure of_phandle_args updated by this function
*
* This function is a low-level interrupt tree walking function. It
@@ -165,13 +186,13 @@ const __be32 *of_irq_parse_imap_parent(const __be32 *imap, int len, struct of_ph
*
* Return: 0 on success and a negative number on error
*/
-int of_irq_parse_raw(const __be32 *addr, struct of_phandle_args *out_irq)
+int of_irq_parse_raw(const __be32 *addr, u32 addrsize, struct of_phandle_args *out_irq)
{
- struct device_node *ipar, *tnode, *old = NULL;
+ struct device_node *ipar, *tnode;
__be32 initial_match_array[MAX_PHANDLE_ARGS];
const __be32 *match_array = initial_match_array;
- const __be32 *tmp, dummy_imask[] = { [0 ... MAX_PHANDLE_ARGS] = cpu_to_be32(~0) };
- u32 intsize = 1, addrsize;
+ const __be32 dummy_imask[] = { [0 ... MAX_PHANDLE_ARGS] = cpu_to_be32(~0) };
+ u32 intsize = 1, ipar_addrsize;
int i, rc = -EINVAL;
#ifdef DEBUG
@@ -201,24 +222,11 @@ int of_irq_parse_raw(const __be32 *addr, struct of_phandle_args *out_irq)
if (out_irq->args_count != intsize)
goto fail;
- /* Look for this #address-cells. We have to implement the old linux
- * trick of looking for the parent here as some device-trees rely on it
- */
- old = of_node_get(ipar);
- do {
- tmp = of_get_property(old, "#address-cells", NULL);
- tnode = of_get_parent(old);
- of_node_put(old);
- old = tnode;
- } while (old && tmp == NULL);
- of_node_put(old);
- old = NULL;
- addrsize = (tmp == NULL) ? 2 : be32_to_cpu(*tmp);
-
- pr_debug(" -> addrsize=%d\n", addrsize);
+ ipar_addrsize = of_get_address_cells(ipar);
+ pr_debug(" -> addrsize=%d, ipar_addrsize=%d\n", addrsize, ipar_addrsize);
/* Range check so that the temporary buffer doesn't overflow */
- if (WARN_ON(addrsize + intsize > MAX_PHANDLE_ARGS)) {
+ if (WARN_ON(ipar_addrsize + intsize > MAX_PHANDLE_ARGS)) {
rc = -EFAULT;
goto fail;
}
@@ -227,7 +235,7 @@ int of_irq_parse_raw(const __be32 *addr, struct of_phandle_args *out_irq)
for (i = 0; i < addrsize; i++)
initial_match_array[i] = addr ? addr[i] : 0;
for (i = 0; i < intsize; i++)
- initial_match_array[addrsize + i] = cpu_to_be32(out_irq->args[i]);
+ initial_match_array[ipar_addrsize + i] = cpu_to_be32(out_irq->args[i]);
/* Now start the actual "proper" walk of the interrupt tree */
while (ipar != NULL) {
@@ -254,7 +262,7 @@ int of_irq_parse_raw(const __be32 *addr, struct of_phandle_args *out_irq)
* interrupt-map parsing does not work without a reg
* property when #address-cells != 0
*/
- if (addrsize && !addr) {
+ if (ipar_addrsize && !addr) {
pr_debug(" -> no reg passed in when needed !\n");
goto fail;
}
@@ -274,10 +282,10 @@ int of_irq_parse_raw(const __be32 *addr, struct of_phandle_args *out_irq)
/* Parse interrupt-map */
match = 0;
- while (imaplen > (addrsize + intsize + 1)) {
+ while (imaplen > (ipar_addrsize + intsize + 1)) {
/* Compare specifiers */
match = 1;
- for (i = 0; i < (addrsize + intsize); i++, imaplen--)
+ for (i = 0; i < (ipar_addrsize + intsize); i++, imaplen--)
match &= !((match_array[i] ^ *imap++) & imask[i]);
pr_debug(" -> match=%d (imaplen=%d)\n", match, imaplen);
@@ -306,7 +314,7 @@ int of_irq_parse_raw(const __be32 *addr, struct of_phandle_args *out_irq)
newpar = out_irq->np;
intsize = out_irq->args_count;
- addrsize = (imap - match_array) - intsize;
+ ipar_addrsize = (imap - match_array) - intsize;
if (ipar == newpar) {
pr_debug("%pOF interrupt-map entry to self\n", ipar);
@@ -343,7 +351,7 @@ int of_irq_parse_one(struct device_node *device, int index, struct of_phandle_ar
{
struct device_node *p;
const __be32 *addr;
- u32 intsize;
+ u32 addrsize, intsize;
int i, res;
pr_debug("of_irq_parse_one: dev=%pOF, index=%d\n", device, index);
@@ -354,12 +362,13 @@ int of_irq_parse_one(struct device_node *device, int index, struct of_phandle_ar
/* Get the reg property (if any) */
addr = of_get_property(device, "reg", NULL);
+ addrsize = of_get_address_cells(device);
/* Try the new-style interrupts-extended first */
res = of_parse_phandle_with_args(device, "interrupts-extended",
"#interrupt-cells", index, out_irq);
if (!res)
- return of_irq_parse_raw(addr, out_irq);
+ return of_irq_parse_raw(addr, addrsize, out_irq);
/* Look for the interrupt parent. */
p = of_irq_find_parent(device);
@@ -389,7 +398,7 @@ int of_irq_parse_one(struct device_node *device, int index, struct of_phandle_ar
/* Check if there are any interrupt-map translations to process */
- res = of_irq_parse_raw(addr, out_irq);
+ res = of_irq_parse_raw(addr, addrsize, out_irq);
out:
of_node_put(p);
return res;
diff --git a/drivers/pci/of.c b/drivers/pci/of.c
index 51e3dd0ea5abe..5d4b2ec5a3b13 100644
--- a/drivers/pci/of.c
+++ b/drivers/pci/of.c
@@ -506,7 +506,7 @@ static int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *
out_irq->args[0] = pin;
laddr[0] = cpu_to_be32((pdev->bus->number << 16) | (pdev->devfn << 8));
laddr[1] = laddr[2] = cpu_to_be32(0);
- rc = of_irq_parse_raw(laddr, out_irq);
+ rc = of_irq_parse_raw(laddr, ARRAY_SIZE(laddr), out_irq);
if (rc)
goto err;
return 0;
diff --git a/include/linux/of_irq.h b/include/linux/of_irq.h
index d6d3eae2f1452..74268e33d7305 100644
--- a/include/linux/of_irq.h
+++ b/include/linux/of_irq.h
@@ -32,7 +32,8 @@ static inline int of_irq_parse_oldworld(const struct device_node *device, int in
}
#endif /* CONFIG_PPC32 && CONFIG_PPC_PMAC */
-extern int of_irq_parse_raw(const __be32 *addr, struct of_phandle_args *out_irq);
+extern int of_irq_parse_raw(const __be32 *addr, u32 addrsize,
+ struct of_phandle_args *out_irq);
extern unsigned int irq_create_of_mapping(struct of_phandle_args *irq_data);
extern int of_irq_to_resource(struct device_node *dev, int index,
struct resource *r);
--
2.42.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] of/irq: Consider device address size in interrupt map walk
2024-08-07 13:40 [PATCH v2] of/irq: Consider device address size in interrupt map walk Stefan Wiehler
@ 2024-08-07 14:09 ` Rob Herring
2024-08-09 0:20 ` kernel test robot
1 sibling, 0 replies; 3+ messages in thread
From: Rob Herring @ 2024-08-07 14:09 UTC (permalink / raw)
To: Stefan Wiehler; +Cc: Saravana Kannan, devicetree, linux-kernel@vger.kernel.org
On Wed, Aug 7, 2024 at 7:45 AM Stefan Wiehler <stefan.wiehler@nokia.com> wrote:
>
> When of_irq_parse_raw() is invoked with a device address smaller than
> the interrupt parent node (from #address-cells property), KASAN detects
> the following out-of-bounds read when populating the initial match table
> (dyndbg="func of_irq_parse_* +p"):
>
> OF: of_irq_parse_one: dev=/soc@0/picasso/watchdog, index=0
> OF: parent=/soc@0/pci@878000000000/gpio0@17,0, intsize=2
> OF: intspec=4
> OF: of_irq_parse_raw: ipar=/soc@0/pci@878000000000/gpio0@17,0, size=2
> OF: -> addrsize=3
> ==================================================================
> BUG: KASAN: slab-out-of-bounds in of_irq_parse_raw+0x2b8/0x8d0
> Read of size 4 at addr ffffff81beca5608 by task bash/764
>
> CPU: 1 PID: 764 Comm: bash Tainted: G O 6.1.67-484c613561-nokia_sm_arm64 #1
> Hardware name: Unknown Unknown Product/Unknown Product, BIOS 2023.01-12.24.03-dirty 01/01/2023
> Call trace:
> dump_backtrace+0xdc/0x130
> show_stack+0x1c/0x30
> dump_stack_lvl+0x6c/0x84
> print_report+0x150/0x448
> kasan_report+0x98/0x140
> __asan_load4+0x78/0xa0
> of_irq_parse_raw+0x2b8/0x8d0
> of_irq_parse_one+0x24c/0x270
> parse_interrupts+0xc0/0x120
> of_fwnode_add_links+0x100/0x2d0
> fw_devlink_parse_fwtree+0x64/0xc0
> device_add+0xb38/0xc30
> of_device_add+0x64/0x90
> of_platform_device_create_pdata+0xd0/0x170
> of_platform_bus_create+0x244/0x600
> of_platform_notify+0x1b0/0x254
> blocking_notifier_call_chain+0x9c/0xd0
> __of_changeset_entry_notify+0x1b8/0x230
> __of_changeset_apply_notify+0x54/0xe4
> of_overlay_fdt_apply+0xc04/0xd94
> ...
>
> The buggy address belongs to the object at ffffff81beca5600
> which belongs to the cache kmalloc-128 of size 128
> The buggy address is located 8 bytes inside of
> 128-byte region [ffffff81beca5600, ffffff81beca5680)
>
> The buggy address belongs to the physical page:
> page:00000000230d3d03 refcount:1 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x1beca4
> head:00000000230d3d03 order:1 compound_mapcount:0 compound_pincount:0
> flags: 0x8000000000010200(slab|head|zone=2)
> raw: 8000000000010200 0000000000000000 dead000000000122 ffffff810000c300
> raw: 0000000000000000 0000000000200020 00000001ffffffff 0000000000000000
> page dumped because: kasan: bad access detected
>
> Memory state around the buggy address:
> ffffff81beca5500: 04 fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
> ffffff81beca5580: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
> >ffffff81beca5600: 00 fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
> ^
> ffffff81beca5680: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
> ffffff81beca5700: 00 00 00 00 00 00 fc fc fc fc fc fc fc fc fc fc
> ==================================================================
> OF: -> got it !
>
> Signed-off-by: Stefan Wiehler <stefan.wiehler@nokia.com>
> ---
> - Fixed of_get_address_cells() open brace found by checkpatch
Please don't send new versions right after the prior version. Give
people a chance to review.
Rob
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] of/irq: Consider device address size in interrupt map walk
2024-08-07 13:40 [PATCH v2] of/irq: Consider device address size in interrupt map walk Stefan Wiehler
2024-08-07 14:09 ` Rob Herring
@ 2024-08-09 0:20 ` kernel test robot
1 sibling, 0 replies; 3+ messages in thread
From: kernel test robot @ 2024-08-09 0:20 UTC (permalink / raw)
To: Stefan Wiehler, Rob Herring, Saravana Kannan
Cc: oe-kbuild-all, devicetree, linux-kernel, Stefan Wiehler
Hi Stefan,
kernel test robot noticed the following build errors:
[auto build test ERROR on robh/for-next]
[also build test ERROR on powerpc/next pci/next pci/for-linus linus/master v6.11-rc2 next-20240808]
[cannot apply to powerpc/fixes]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Stefan-Wiehler/of-irq-Consider-device-address-size-in-interrupt-map-walk/20240807-215113
base: https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git for-next
patch link: https://lore.kernel.org/r/20240807134032.1364503-2-stefan.wiehler%40nokia.com
patch subject: [PATCH v2] of/irq: Consider device address size in interrupt map walk
config: i386-buildonly-randconfig-003-20240809 (https://download.01.org/0day-ci/archive/20240809/202408090801.AcBWUFAJ-lkp@intel.com/config)
compiler: gcc-11 (Debian 11.3.0-12) 11.3.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240809/202408090801.AcBWUFAJ-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202408090801.AcBWUFAJ-lkp@intel.com/
All errors (new ones prefixed by >>):
drivers/pci/of_property.c: In function 'of_pci_prop_intr_map':
drivers/pci/of_property.c:234:47: warning: passing argument 2 of 'of_irq_parse_raw' makes integer from pointer without a cast [-Wint-conversion]
234 | ret = of_irq_parse_raw(laddr, &out_irq[i]);
| ^~~~~~~~~~~
| |
| struct of_phandle_args *
In file included from drivers/pci/of_property.c:8:
include/linux/of_irq.h:35:53: note: expected 'u32' {aka 'unsigned int'} but argument is of type 'struct of_phandle_args *'
35 | extern int of_irq_parse_raw(const __be32 *addr, u32 addrsize,
| ~~~~^~~~~~~~
>> drivers/pci/of_property.c:234:23: error: too few arguments to function 'of_irq_parse_raw'
234 | ret = of_irq_parse_raw(laddr, &out_irq[i]);
| ^~~~~~~~~~~~~~~~
In file included from drivers/pci/of_property.c:8:
include/linux/of_irq.h:35:12: note: declared here
35 | extern int of_irq_parse_raw(const __be32 *addr, u32 addrsize,
| ^~~~~~~~~~~~~~~~
vim +/of_irq_parse_raw +234 drivers/pci/of_property.c
dc12273fa3d8a8 Herve Codina 2024-05-27 205
407d1a51921e9f Lizhi Hou 2023-08-15 206 static int of_pci_prop_intr_map(struct pci_dev *pdev, struct of_changeset *ocs,
407d1a51921e9f Lizhi Hou 2023-08-15 207 struct device_node *np)
407d1a51921e9f Lizhi Hou 2023-08-15 208 {
33efa29e825636 Lizhi Hou 2023-09-29 209 u32 i, addr_sz[OF_PCI_MAX_INT_PIN] = { 0 }, map_sz = 0;
407d1a51921e9f Lizhi Hou 2023-08-15 210 struct of_phandle_args out_irq[OF_PCI_MAX_INT_PIN];
407d1a51921e9f Lizhi Hou 2023-08-15 211 __be32 laddr[OF_PCI_ADDRESS_CELLS] = { 0 };
407d1a51921e9f Lizhi Hou 2023-08-15 212 u32 int_map_mask[] = { 0xffff00, 0, 0, 7 };
407d1a51921e9f Lizhi Hou 2023-08-15 213 struct device_node *pnode;
407d1a51921e9f Lizhi Hou 2023-08-15 214 struct pci_dev *child;
407d1a51921e9f Lizhi Hou 2023-08-15 215 u32 *int_map, *mapp;
407d1a51921e9f Lizhi Hou 2023-08-15 216 int ret;
407d1a51921e9f Lizhi Hou 2023-08-15 217 u8 pin;
407d1a51921e9f Lizhi Hou 2023-08-15 218
407d1a51921e9f Lizhi Hou 2023-08-15 219 pnode = pci_device_to_OF_node(pdev->bus->self);
407d1a51921e9f Lizhi Hou 2023-08-15 220 if (!pnode)
407d1a51921e9f Lizhi Hou 2023-08-15 221 pnode = pci_bus_to_OF_node(pdev->bus);
407d1a51921e9f Lizhi Hou 2023-08-15 222
407d1a51921e9f Lizhi Hou 2023-08-15 223 if (!pnode) {
407d1a51921e9f Lizhi Hou 2023-08-15 224 pci_err(pdev, "failed to get parent device node");
407d1a51921e9f Lizhi Hou 2023-08-15 225 return -EINVAL;
407d1a51921e9f Lizhi Hou 2023-08-15 226 }
407d1a51921e9f Lizhi Hou 2023-08-15 227
407d1a51921e9f Lizhi Hou 2023-08-15 228 laddr[0] = cpu_to_be32((pdev->bus->number << 16) | (pdev->devfn << 8));
407d1a51921e9f Lizhi Hou 2023-08-15 229 for (pin = 1; pin <= OF_PCI_MAX_INT_PIN; pin++) {
407d1a51921e9f Lizhi Hou 2023-08-15 230 i = pin - 1;
407d1a51921e9f Lizhi Hou 2023-08-15 231 out_irq[i].np = pnode;
407d1a51921e9f Lizhi Hou 2023-08-15 232 out_irq[i].args_count = 1;
407d1a51921e9f Lizhi Hou 2023-08-15 233 out_irq[i].args[0] = pin;
407d1a51921e9f Lizhi Hou 2023-08-15 @234 ret = of_irq_parse_raw(laddr, &out_irq[i]);
407d1a51921e9f Lizhi Hou 2023-08-15 235 if (ret) {
33efa29e825636 Lizhi Hou 2023-09-29 236 out_irq[i].np = NULL;
33efa29e825636 Lizhi Hou 2023-09-29 237 pci_dbg(pdev, "parse irq %d failed, ret %d", pin, ret);
407d1a51921e9f Lizhi Hou 2023-08-15 238 continue;
407d1a51921e9f Lizhi Hou 2023-08-15 239 }
33efa29e825636 Lizhi Hou 2023-09-29 240 of_property_read_u32(out_irq[i].np, "#address-cells",
407d1a51921e9f Lizhi Hou 2023-08-15 241 &addr_sz[i]);
407d1a51921e9f Lizhi Hou 2023-08-15 242 }
407d1a51921e9f Lizhi Hou 2023-08-15 243
407d1a51921e9f Lizhi Hou 2023-08-15 244 list_for_each_entry(child, &pdev->subordinate->devices, bus_list) {
407d1a51921e9f Lizhi Hou 2023-08-15 245 for (pin = 1; pin <= OF_PCI_MAX_INT_PIN; pin++) {
407d1a51921e9f Lizhi Hou 2023-08-15 246 i = pci_swizzle_interrupt_pin(child, pin) - 1;
33efa29e825636 Lizhi Hou 2023-09-29 247 if (!out_irq[i].np)
33efa29e825636 Lizhi Hou 2023-09-29 248 continue;
407d1a51921e9f Lizhi Hou 2023-08-15 249 map_sz += 5 + addr_sz[i] + out_irq[i].args_count;
407d1a51921e9f Lizhi Hou 2023-08-15 250 }
407d1a51921e9f Lizhi Hou 2023-08-15 251 }
407d1a51921e9f Lizhi Hou 2023-08-15 252
33efa29e825636 Lizhi Hou 2023-09-29 253 /*
33efa29e825636 Lizhi Hou 2023-09-29 254 * Parsing interrupt failed for all pins. In this case, it does not
33efa29e825636 Lizhi Hou 2023-09-29 255 * need to generate interrupt-map property.
33efa29e825636 Lizhi Hou 2023-09-29 256 */
33efa29e825636 Lizhi Hou 2023-09-29 257 if (!map_sz)
33efa29e825636 Lizhi Hou 2023-09-29 258 return 0;
33efa29e825636 Lizhi Hou 2023-09-29 259
407d1a51921e9f Lizhi Hou 2023-08-15 260 int_map = kcalloc(map_sz, sizeof(u32), GFP_KERNEL);
e6f7d27df5d208 Duoming Zhou 2024-03-03 261 if (!int_map)
e6f7d27df5d208 Duoming Zhou 2024-03-03 262 return -ENOMEM;
407d1a51921e9f Lizhi Hou 2023-08-15 263 mapp = int_map;
407d1a51921e9f Lizhi Hou 2023-08-15 264
407d1a51921e9f Lizhi Hou 2023-08-15 265 list_for_each_entry(child, &pdev->subordinate->devices, bus_list) {
407d1a51921e9f Lizhi Hou 2023-08-15 266 for (pin = 1; pin <= OF_PCI_MAX_INT_PIN; pin++) {
33efa29e825636 Lizhi Hou 2023-09-29 267 i = pci_swizzle_interrupt_pin(child, pin) - 1;
33efa29e825636 Lizhi Hou 2023-09-29 268 if (!out_irq[i].np)
33efa29e825636 Lizhi Hou 2023-09-29 269 continue;
33efa29e825636 Lizhi Hou 2023-09-29 270
407d1a51921e9f Lizhi Hou 2023-08-15 271 *mapp = (child->bus->number << 16) |
407d1a51921e9f Lizhi Hou 2023-08-15 272 (child->devfn << 8);
407d1a51921e9f Lizhi Hou 2023-08-15 273 mapp += OF_PCI_ADDRESS_CELLS;
407d1a51921e9f Lizhi Hou 2023-08-15 274 *mapp = pin;
407d1a51921e9f Lizhi Hou 2023-08-15 275 mapp++;
407d1a51921e9f Lizhi Hou 2023-08-15 276 *mapp = out_irq[i].np->phandle;
407d1a51921e9f Lizhi Hou 2023-08-15 277 mapp++;
407d1a51921e9f Lizhi Hou 2023-08-15 278 if (addr_sz[i]) {
407d1a51921e9f Lizhi Hou 2023-08-15 279 ret = of_property_read_u32_array(out_irq[i].np,
407d1a51921e9f Lizhi Hou 2023-08-15 280 "reg", mapp,
407d1a51921e9f Lizhi Hou 2023-08-15 281 addr_sz[i]);
407d1a51921e9f Lizhi Hou 2023-08-15 282 if (ret)
407d1a51921e9f Lizhi Hou 2023-08-15 283 goto failed;
407d1a51921e9f Lizhi Hou 2023-08-15 284 }
407d1a51921e9f Lizhi Hou 2023-08-15 285 mapp += addr_sz[i];
407d1a51921e9f Lizhi Hou 2023-08-15 286 memcpy(mapp, out_irq[i].args,
407d1a51921e9f Lizhi Hou 2023-08-15 287 out_irq[i].args_count * sizeof(u32));
407d1a51921e9f Lizhi Hou 2023-08-15 288 mapp += out_irq[i].args_count;
407d1a51921e9f Lizhi Hou 2023-08-15 289 }
407d1a51921e9f Lizhi Hou 2023-08-15 290 }
407d1a51921e9f Lizhi Hou 2023-08-15 291
407d1a51921e9f Lizhi Hou 2023-08-15 292 ret = of_changeset_add_prop_u32_array(ocs, np, "interrupt-map", int_map,
407d1a51921e9f Lizhi Hou 2023-08-15 293 map_sz);
407d1a51921e9f Lizhi Hou 2023-08-15 294 if (ret)
407d1a51921e9f Lizhi Hou 2023-08-15 295 goto failed;
407d1a51921e9f Lizhi Hou 2023-08-15 296
407d1a51921e9f Lizhi Hou 2023-08-15 297 ret = of_changeset_add_prop_u32(ocs, np, "#interrupt-cells", 1);
407d1a51921e9f Lizhi Hou 2023-08-15 298 if (ret)
407d1a51921e9f Lizhi Hou 2023-08-15 299 goto failed;
407d1a51921e9f Lizhi Hou 2023-08-15 300
407d1a51921e9f Lizhi Hou 2023-08-15 301 ret = of_changeset_add_prop_u32_array(ocs, np, "interrupt-map-mask",
407d1a51921e9f Lizhi Hou 2023-08-15 302 int_map_mask,
407d1a51921e9f Lizhi Hou 2023-08-15 303 ARRAY_SIZE(int_map_mask));
407d1a51921e9f Lizhi Hou 2023-08-15 304 if (ret)
407d1a51921e9f Lizhi Hou 2023-08-15 305 goto failed;
407d1a51921e9f Lizhi Hou 2023-08-15 306
407d1a51921e9f Lizhi Hou 2023-08-15 307 kfree(int_map);
407d1a51921e9f Lizhi Hou 2023-08-15 308 return 0;
407d1a51921e9f Lizhi Hou 2023-08-15 309
407d1a51921e9f Lizhi Hou 2023-08-15 310 failed:
407d1a51921e9f Lizhi Hou 2023-08-15 311 kfree(int_map);
407d1a51921e9f Lizhi Hou 2023-08-15 312 return ret;
407d1a51921e9f Lizhi Hou 2023-08-15 313 }
407d1a51921e9f Lizhi Hou 2023-08-15 314
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-08-09 0:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-07 13:40 [PATCH v2] of/irq: Consider device address size in interrupt map walk Stefan Wiehler
2024-08-07 14:09 ` Rob Herring
2024-08-09 0:20 ` kernel test robot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).