From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754811AbcHSDtH (ORCPT ); Thu, 18 Aug 2016 23:49:07 -0400 Received: from eu-smtp-delivery-143.mimecast.com ([146.101.78.143]:26064 "EHLO eu-smtp-delivery-143.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754694AbcHSDtC (ORCPT ); Thu, 18 Aug 2016 23:49:02 -0400 Date: Fri, 19 Aug 2016 11:39:13 +0800 From: Dennis Chen To: Lorenzo Pieralisi CC: Tomasz Nowicki , , , , , , , , , , , , , , , , , , , , , , , Subject: Re: [PATCH V8 1/8] ACPI: I/O Remapping Table (IORT) initial support Message-ID: <20160819033911.GA4027@arm.com> References: <1470909998-16710-1-git-send-email-tn@semihalf.com> <1470909998-16710-2-git-send-email-tn@semihalf.com> <20160818105549.GB20404@arm.com> <20160818111419.GB8982@red-moon> MIME-Version: 1.0 In-Reply-To: <20160818111419.GB8982@red-moon> User-Agent: Mutt/1.5.24 (2015-08-30) X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:217.140.96.140;IPV:CAL;SCL:-1;CTRY:GB;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(7916002)(2980300002)(448002)(24454002)(199003)(189002)(87936001)(7696003)(356003)(7846002)(83506001)(19580405001)(33656002)(246002)(97756001)(8936002)(26826002)(36756003)(76176999)(305945005)(1076002)(46406003)(50986999)(586003)(54356999)(86362001)(106466001)(92566002)(110136002)(7416002)(11100500001)(626004)(47776003)(23726003)(85326001)(2906002)(104016004)(93886004)(15975445007)(50466002)(8676002)(4001350100001)(19580395003)(77096005)(189998001)(2950100001)(4326007)(18370500001)(2004002);DIR:OUT;SFP:1101;SCL:1;SRVR:DB6PR0802MB2456;H:nebula.arm.com;FPR:;SPF:PermError;PTR:fw-tnat.cambridge.arm.com;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;AM1FFO11OLC007;1:DIFU3fxFuEIzrrZoa9c9c2vOZxlmVSpq3II0oWiovKwikiFK3QDD0e8NIDINt4FFIe5uvr7yQFlA2E1wB8OK2y9ILz383DHvdEG8XaDL5bRH69centbK9JtBDcpeEdj53b2KbHdhIGjJNIWI/K4Yt9LJMKOPqD9NiVunJV5Cr1OjLBvxkcCBUaQe3qMAgEZGajXa/dVfbuP1axOEq2O5FxWooTMXaF5JutUlTN50srUWmpBLSXJOUs6PW3xpbmY+jE9ITLyoYs5Lz0rWHcOw6RLuvQ86Sgfeyq3fwSiXZTxZ/3moaVn/2TmS5al3OwT+IFn8I80jkD69nL6Qk01jo5wUoou/i2itKYzTw3Ehbe2K9SEi42gYKCEzRL71QGOo8HK46L2woJ3ET3o2Lf4pQUDAR3CGhnzPPh75Dz2pz2QAnirzyLlHnqwf04+U1AQN80wA3KuJopGKfYjFEzw51FtnZxJisHZy8irsBthOl3g3yi+LoTiGtk4fuRKNPJ/rYTrP1aSA7a9PXoyJmV/7YWD6wuzVoE33v8L/4xWlT97Y/BKSKk7zUTbrUK9+3unhhT7jn8xzuG4w7ZUGQ9T3sEaMGViEst72ecbfyUvPm9o= X-MS-Office365-Filtering-Correlation-Id: 8ba5eb46-3614-4c68-9805-08d3c7e26924 X-Microsoft-Exchange-Diagnostics: 1;DB6PR0802MB2456;2:lWsSNC3i0osRtkvD8njrWDLiW5KrGFvWxu0daWQL56tuhtZyssve/JBmxO/30Et/iUfvHpiFMIzLTlm3SowjPbjVt19Fowr8r1mXYIAHt0T+grvpSsz5JuFDpIP68DcCmhnVRd9eA+kCfy21meU2Mwo1PbVZ1ELadAcmUmkx2Viwc8nCNZzcH4HzG/qBM+zC;3:oyxlpqXEnSkj21TtWi/Zt/H5jgt2rm+2fGIxeDDNyDJrqDnZJf7oVp5jfxstkw+oTlwVZkQOmmRbbW7Yuzdb5g+sCmak/zLaLxUGtSQytljIYD8GGu63r96YSUr4A5lVg0syD7GsDe8TjzrDgOg1AzOfgl3ioUUdvVzTbgUHTJ/MBeTokqd5FWa+64UXvOLobk0ACuo1lZwJlIx3L+Ov0vxmo9DFGgnooxj3DWZ3F40= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DB6PR0802MB2456; X-Microsoft-Exchange-Diagnostics: 1;DB6PR0802MB2456;25:MDybSzB6waknslsd+qT3T+XHab8fHfY/9ZizLuy7DwPaqgnOuhF+ZFg4p7+ancFWheRqu43gVTCUhmGM851/NrsLQsPkKiCDj16JslXgnXKDrMIb5AVxJT/a/KdpveZewWqdjB0ddaK0apwG0E7SfvGVCztikwD+RJZnvQiJXKc+X5x/mw85hbbpxerZsvv8Zt9PfmNk/A8rd/iSLnnhALdXOkAnwPmmHqi8JC5lE4vWdk9qwWeul4VHnwSywJKAd7hwMti3PVkQ9wAePaPXrkwVG2obnjmIpdFYAR2GieHHaqHnwVJxag0dRTreqsrl+Do6gtPXmfqPh3xQcIVeIZSPS8G1mlfE0G/UqN4kkmHPsnxQ/lP92uswh5aKujcOP7O6x0FqG+gLBM7IC/82e1pAmkzlzcL4ztdeUYL2FSpAfCar/eS3f8RegHsYlB7cf2t2rZFdNQLvvd1f1fT6PR+yfij4MqUnvPMJpjCZc8/mvHZ6TvLhKgFpRXTHROnK5w2bg5TWHV0bqrEodIQVbPRgACnfZJ+9ZgmDUcnOgZrY712wwGccZ21zua7hrg72UzvSLL2d0cVJ4UQ2OXht9P/ZQfzf0DJRw1npT5dfn30b8Zq6gw01stmGg64O74Zgjsfr3dfvapvKjdz2Yhoz4MvzBTo3J2b8hvDSH7uDsPug4lxDc1Il9gxcAww8IiNOA6PSmKYpIvtG+wEYnHuUSMQcpQ/fL+cfPZtUOn20MwMbb0lI9BnV7szH87cdlSnLdw9zT0wUnJoXjcc8sFesvm8WmwaIoxEM/w1qQBkVkjZq3vX+UypdE+8zLxYNOIDT5YNeNvJ++cSc+n7iuDOxTJaSSyInDklnJg2L2WYiB78= X-LD-Processed: f34e5979-57d9-4aaa-ad4d-b122a662184d,ExtAddr X-Microsoft-Exchange-Diagnostics: 1;DB6PR0802MB2456;31:ZCYzrRSTxnos9eGysL9wF3HAiyZVCLV01KBLkYN6HqOcIpnfn4geWpOx1hEsjQwBvY943aFuUhcV/bmWS9XcRxPVccye3xfFgPYAJlBrz77V5Fe5a8wng/lEgHLOSQWui0F7/TJJ7efHNkG2/GnX1vKiU5Q9Fnjk5K2sa0I+sQ7bRmbLuo+RYkywiXdFRz0PwAD9fRIU0Q48ppjYXR23vEXQoMY865v8H2tMK5Sgiko=;20:C5Vz2O+N30lTl+QuCyChhBzB+TftwuQkkJPgDUI8JKtX1YdxvW0tnYVtnTaXn9FsrpdGpb41tcbpVZ4EaFijjxMAeM7kM9bZCQJSDk1I2vZg+7zIn81t+GnBZhasxxqcWV0MrZT5U9OvY/u3uPrD3Ik/xZwtkrA3nC55GoUiPdKdo1Ytb7n5BvzsxJkxwdJcLvK8lB6uhgnnr6asdDmNLvhMkf5OuSqSBYz6eWaYXxS1oX9wpQOVRaxIpnO1Nx7i NoDisclaimer: True X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(9452136761055); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040176)(601004)(2401047)(8121501046)(13023025)(13024025)(13013025)(13020025)(5005006)(10201501046)(3002001)(6055026);SRVR:DB6PR0802MB2456;BCL:0;PCL:0;RULEID:;SRVR:DB6PR0802MB2456; X-Microsoft-Exchange-Diagnostics: 1;DB6PR0802MB2456;4:wlXRuxD9QLbVf3M8e0Nir0Bd37sn/AJqbnfx5U5IS0ddvFQuhVo5wUYay4KRGudsmQqGaOuZlJqc1iKUN/F8UhK75rLbKIJsw9hWnPphWpRV2A1hT0R30QeMp5thNcCxf7jgbeLxvfPBcSpV05MDWmDjJEv7NoGYVYZBev+k01sC0mOEzEKAuuOAQCtMaCRQfaeIe9LKcBGQkWQsttedokrMPxYVn+aN4yDIQR1L6G4nft9nBo+j50/xIOpkDOglIayQaleROvrnSWWs5cxp8pIk9NedAmwiuFCjEEP7nJ3Fwya2d6vZynBM6u+yZTaJCSB1Te1DxT0WrSl7ASWVJEyTLf/lfB1e9eZJQQV57Qc4rPttjMoQ6yxMEnFvorPKSQEzxeZS08eo4zV563ZKBnLy25w9LSsOsbS/baTZsHpPLYJtq5CfNjSUxUywQ9Wb0EwprRsdJe1EZ9gb+FZUcsjUPy5BqoPE4cr7Io3GG3h/cDwAu4ktq1V/bkmQc9s36X36WaDTBXI0uq5s/pw3JQ== X-Forefront-PRVS: 0039C6E5C5 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;DB6PR0802MB2456;23:eSi0CYhV9VgMbJ2ssfBfwVMkNtmcYcGa6H4BTm7?= =?us-ascii?Q?N0DA7sQWrNHELKWrbBXQTbDsfRmfgRx64M2LX69w7uoLeoddXXUCrMxVg//k?= =?us-ascii?Q?qmHF+qC8L6qW8QPcxZAm8iOL2oxgRFLY6pYrC2YIuHj3jzrHdvFcvTilmaQD?= =?us-ascii?Q?wIvkp+Id5JF9wbSU/mcHGM9D+CnpQW9jnc4R6FeJSn3HQNAKYY/2SlrwKsBh?= =?us-ascii?Q?d87MgNk7pdZDbdh72aY5aUkQIDi6rBMROfgwDGNDk8O1I217z2Uk9DE3II68?= =?us-ascii?Q?C/1qRReAbt1bjkbwf6pyPQEyo7TFyw/iqkAAQDqvJrykE2Y5VyJ2o+mGPKFN?= =?us-ascii?Q?gqzJTl6GNdClyIOkCNv+2JzfC8se08fh6ZWN74wQwWbF5ImzhHEwaNAfokZW?= =?us-ascii?Q?MYzEYZ4kTMOW9AsgS+L9kkhHCM3N1lS7Bk2sBiP6aOPsrI2NLcqUaLdjwj7u?= =?us-ascii?Q?rmRgNTvwau5R2FZfZSgQ15oN4zWmkFCff1MYlrv+llsQz0hK8l3WT41g1i58?= =?us-ascii?Q?akocqnb1DuE80lxKerIf6rediZUus3T8UHNmInHhhzt1phLtAMezgOHMzBPr?= =?us-ascii?Q?6OscXf9K6pMzgc+SpOzxvs0+gPdNat1LMZJ0Q54nKCg8ldRYGhyDhjldLwYO?= =?us-ascii?Q?+UUufmtrIVz+5yQVNOhfdohdjIL6w5J/cdwY919SBHmw7psga8WWRfdE9xOZ?= =?us-ascii?Q?N5UCbUL9qLXq6NTFaFQ5+m2sNK/EnwOa6u8X/FRR5FMP/NFn+wO3s48I7X91?= =?us-ascii?Q?2O+MQCNIvP6h/zUZ35R3Ea+uvseJvkaWvBWfYhjM44iUTK+If5tTlSNHxleU?= =?us-ascii?Q?HIY/EoFbQ+cOTdZ/K54uS3jb4q8lJdEFSKoFofflUDrJiGVPb8PiZlAOaJqC?= =?us-ascii?Q?Jhh6QJ14SDXW1BpNpJT/4jYYOtWCIQa0KbX8WyLx0drof2J5F6mArA7LkCmV?= =?us-ascii?Q?p3plqGa9YrWv7eHTAvRFJOd4EMJrydSbVJqHf0nwHGv/I/AA+dh4dRT1HpsE?= =?us-ascii?Q?gXnptiFdDTpH3DW+7rtBQdtaEMJF9C9I85PhF2u/He4PFB4G3Uoej8nGr82D?= =?us-ascii?Q?WPSfrZA7Q9yFGSmuIqpY9SJTbcI4AtfxdHkp9bRK5sH7Fh1+sI+6ow8/pxww?= =?us-ascii?Q?seNMWTeAQxWIjAHWRcym2fit9/7xj0CvsJlSDUQrZCl7RqBduqYfgZtXsJl6?= =?us-ascii?Q?hR3wMqNwfX4swrS6yaopyAA4KxlEdQPC1CNrS/Ya0O0VIGtFWHgvdN90Kxg?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;DB6PR0802MB2456;6:a7wYSoTNXiWA7d9IpqBOorhK7RuelYO8mlFyJoWypDFaBdkFsC1dHXykaYJKHwojM6qHVm0AgZ+5xX1kxc+95eRZvLU9qIshhPL4dkQl1SANU1+cIYCL1/5ciiTZgv7xxYEH6gu4LmERqj1cJx3AWudyqkAizRM/9Cf1Yw2hP2Wp1GHRCvC4kVrHYzGpTwtfZCbgcR7W/rhI2CNRHZKEB1+wQvC7i186vgcksYVA25uUCJk+IaLIOEfKhpxdC6AZR4poiiG6yZAgf3un0n6Txtd1ZWydFjVguqvvnneEHu3jyb3tsiUHdqHfBJj2cruuiCE4BNzDD1XmT4BoVj6tBQ==;5:LhpEDdGyPR6pbAfy4dbgksFDPDxLCtODMrKRvoKug6nb6Pn/wwdYMxgpOpB0PwaeGTdwp9jablAteKiIDemsq4tRDklzgYrW9VZ9FMYez2tyiMdCjiGdNhwKTV6UYFs7G6x2qPZ2GQAfxJH8q7DiuA==;24:dbP8KUCKyM18SH876gJxHNYdzjOuiRXzTwABYVQPHVStlbtwDkjR9G0D3rYWmFlf4WOSbdGMld9x6zH/i2xNS0VXD5z8ofsjD1d3S6HwUVc=;7:c8MAl/owSPxQ9RjIRXu/CnmQlkoVRtpwFw2mfXF3GIEmy1ywKee8T2i+apRPGWb5dkM/BcUHVTg3/+TZB/U1Ll+weVujzlxl6y/hS7MRD0ml2HLgp3W0BsvdnrJhR59bJh+/enfarKism3So+sSHkq5Idc9Vxpiwskk+F87KIt9CTHQiILxKjde9xOXOouEBxRPuljaX2W924ZgGfweNMMX3ShaPuA3FMZGIeqqGtUZcFTp86h95FGt9C3794Iwm SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;DB6PR0802MB2456;20:flJXSd+s+xH6OZE/vrKIpup37uckxm6M4FhUhVTvzV/MqmYFAX7lTg2iLXFj1TCVwOazykJNZlJCbxMlb8+A7MjaRVlNyhTVqZb5o8RCRJX5/ZBNIwjTQ/HE36MauOQ/wGzNHy5FQed8qFIue6IIsf8E2eONXw/OCXgh2mt2Xt4= X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Aug 2016 03:39:22.7574 (UTC) X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[217.140.96.140];Helo=[nebula.arm.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0802MB2456 X-MC-Unique: SyfqQB5KPVi3zSifs_xoVA-1 Content-Type: text/plain; charset=WINDOWS-1252 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from quoted-printable to 8bit by mail.home.local id u7J3nHO0030202 On Thu, Aug 18, 2016 at 12:14:20PM +0100, Lorenzo Pieralisi wrote: > On Thu, Aug 18, 2016 at 06:55:50PM +0800, Dennis Chen wrote: > > [...] > > > > +static struct acpi_iort_node * > > > +iort_scan_node(enum acpi_iort_node_type type, > > > + iort_find_node_callback callback, void *context) > > > +{ > > > + struct acpi_iort_node *iort_node, *iort_end; > > > + struct acpi_table_iort *iort; > > > + int i; > > > + > > > + /* Get the first IORT node */ > > > + iort = (struct acpi_table_iort *)iort_table; > > > > > Here, the same as I comments on Lorenzo's patch. If IORT is missed in > > the firmware, then iort_table will be NULL, result in kernel panic in > > the codes followed. > > The pointer is checked in the functions that are visible to > other compilation units before calling this function: > > iort_msi_map_rid() > iort_get_device_domain() > > I missed to check it when I added iort_node_match() and > iort_iommu_configure() though, which makes me think that it is probably > better to move the iort_table pointer check to iort_scan_node() so that > it is done in one single place instead of adding it to all given > external interfaces. > Agree to check this in iort_scan_node(). Also, given some duplicate codes between iort_scan_node() and iort_smmu_init(), so maybe we can think about to refactor iort_match_callback() as the way to implement the function of iort_smmu_int(), thus we can call iort_node_match(ACPI_IORT_NODE_SMMU_V3)... Thanks, Dennis > > Lorenzo > > > > > Thanks, > > Dennis > > > + iort_node = ACPI_ADD_PTR(struct acpi_iort_node, iort, > > > + iort->node_offset); > > > + iort_end = ACPI_ADD_PTR(struct acpi_iort_node, iort_table, > > > + iort_table->length); > > > + > > > + for (i = 0; i < iort->node_count; i++) { > > > + if (WARN_TAINT(iort_node >= iort_end, TAINT_FIRMWARE_WORKAROUND, > > > + "IORT node pointer overflows, bad table!\n")) > > > + return NULL; > > > + > > > + if (iort_node->type == type) { > > > + if (ACPI_SUCCESS(callback(iort_node, context))) > > > + return iort_node; > > > + } > > > + > > > + iort_node = ACPI_ADD_PTR(struct acpi_iort_node, iort_node, > > > + iort_node->length); > > > + } > > > + > > > + return NULL; > > > +} > > > + > > > +static acpi_status > > > +iort_match_node_callback(struct acpi_iort_node *node, void *context) > > > +{ > > > + struct device *dev = context; > > > + > > > + switch (node->type) { > > > + case ACPI_IORT_NODE_NAMED_COMPONENT: { > > > + struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; > > > + struct acpi_device *adev = to_acpi_device_node(dev->fwnode); > > > + struct acpi_iort_named_component *ncomp; > > > + > > > + if (!adev) > > > + break; > > > + > > > + ncomp = (struct acpi_iort_named_component *)node->node_data; > > > + > > > + if (ACPI_FAILURE(acpi_get_name(adev->handle, > > > + ACPI_FULL_PATHNAME, &buffer))) { > > > + dev_warn(dev, "Can't get device full path name\n"); > > > + } else { > > > + int match; > > > + > > > + match = !strcmp(ncomp->device_name, buffer.pointer); > > > + acpi_os_free(buffer.pointer); > > > + > > > + if (match) > > > + return AE_OK; > > > + } > > > + > > > + break; > > > + } > > > + case ACPI_IORT_NODE_PCI_ROOT_COMPLEX: { > > > + struct acpi_iort_root_complex *pci_rc; > > > + struct pci_bus *bus; > > > + > > > + bus = to_pci_bus(dev); > > > + pci_rc = (struct acpi_iort_root_complex *)node->node_data; > > > + > > > + /* > > > + * It is assumed that PCI segment numbers maps one-to-one > > > + * with root complexes. Each segment number can represent only > > > + * one root complex. > > > + */ > > > + if (pci_rc->pci_segment_number == pci_domain_nr(bus)) > > > + return AE_OK; > > > + > > > + break; > > > + } > > > + } > > > + > > > + return AE_NOT_FOUND; > > > +} > > > + > > > +static int > > > +iort_id_map(struct acpi_iort_id_mapping *map, u8 type, u32 rid_in, u32 *rid_out) > > > +{ > > > + /* Single mapping does not care for input id */ > > > + if (map->flags & ACPI_IORT_ID_SINGLE_MAPPING) { > > > + if (type == ACPI_IORT_NODE_NAMED_COMPONENT || > > > + type == ACPI_IORT_NODE_PCI_ROOT_COMPLEX) { > > > + *rid_out = map->output_base; > > > + return 0; > > > + } > > > + > > > + pr_warn(FW_BUG "[map %p] SINGLE MAPPING flag not allowed for node type %d, skipping ID map\n", > > > + map, type); > > > + return -ENXIO; > > > + } > > > + > > > + if (rid_in < map->input_base || > > > + (rid_in >= map->input_base + map->id_count)) > > > + return -ENXIO; > > > + > > > + *rid_out = map->output_base + (rid_in - map->input_base); > > > + return 0; > > > +} > > > + > > > +static struct acpi_iort_node * > > > +iort_node_map_rid(struct acpi_iort_node *node, u32 rid_in, > > > + u32 *rid_out, u8 type) > > > +{ > > > + u32 rid = rid_in; > > > + > > > + /* Parse the ID mapping tree to find specified node type */ > > > + while (node) { > > > + struct acpi_iort_id_mapping *map; > > > + int i; > > > + > > > + if (node->type == type) { > > > + if (rid_out) > > > + *rid_out = rid; > > > + return node; > > > + } > > > + > > > + if (!node->mapping_offset || !node->mapping_count) > > > + goto fail_map; > > > + > > > + map = ACPI_ADD_PTR(struct acpi_iort_id_mapping, node, > > > + node->mapping_offset); > > > + > > > + /* Firmware bug! */ > > > + if (!map->output_reference) { > > > + pr_err(FW_BUG "[node %p type %d] ID map has NULL parent reference\n", > > > + node, node->type); > > > + goto fail_map; > > > + } > > > + > > > + /* Do the RID translation */ > > > + for (i = 0; i < node->mapping_count; i++, map++) { > > > + if (!iort_id_map(map, node->type, rid, &rid)) > > > + break; > > > + } > > > + > > > + if (i == node->mapping_count) > > > + goto fail_map; > > > + > > > + node = ACPI_ADD_PTR(struct acpi_iort_node, iort_table, > > > + map->output_reference); > > > + } > > > + > > > +fail_map: > > > + /* Map input RID to output RID unchanged on mapping failure*/ > > > + if (rid_out) > > > + *rid_out = rid_in; > > > + > > > + return NULL; > > > +} > > > + > > > +static struct acpi_iort_node * > > > +iort_find_dev_node(struct device *dev) > > > +{ > > > + struct pci_bus *pbus; > > > + > > > + if (!dev_is_pci(dev)) > > > + return iort_scan_node(ACPI_IORT_NODE_NAMED_COMPONENT, > > > + iort_match_node_callback, dev); > > > + > > > + /* Find a PCI root bus */ > > > + pbus = to_pci_dev(dev)->bus; > > > + while (!pci_is_root_bus(pbus)) > > > + pbus = pbus->parent; > > > + > > > + return iort_scan_node(ACPI_IORT_NODE_PCI_ROOT_COMPLEX, > > > + iort_match_node_callback, &pbus->dev); > > > +} > > > + > > > +void __init iort_table_detect(void) > > > +{ > > > + acpi_status status; > > > + > > > + status = acpi_get_table(ACPI_SIG_IORT, 0, &iort_table); > > > + if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) { > > > + const char *msg = acpi_format_exception(status); > > > + pr_err("Failed to get table, %s\n", msg); > > > + } > > > +} > > > diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c > > > index 85b7d07..55a84da 100644 > > > --- a/drivers/acpi/bus.c > > > +++ b/drivers/acpi/bus.c > > > @@ -36,6 +36,7 @@ > > > #ifdef CONFIG_X86 > > > #include > > > #endif > > > +#include > > > #include > > > #include > > > #include > > > @@ -1186,6 +1187,7 @@ static int __init acpi_init(void) > > > } > > > > > > pci_mmcfg_late_init(); > > > + iort_table_detect(); > > > acpi_scan_init(); > > > acpi_ec_init(); > > > acpi_debugfs_init(); > > > diff --git a/include/linux/iort.h b/include/linux/iort.h > > > new file mode 100644 > > > index 0000000..cde6809 > > > --- /dev/null > > > +++ b/include/linux/iort.h > > > @@ -0,0 +1,30 @@ > > > +/* > > > + * Copyright (C) 2016, Semihalf > > > + * Author: Tomasz Nowicki > > > + * > > > + * This program is free software; you can redistribute it and/or modify it > > > + * under the terms and conditions of the GNU General Public License, > > > + * version 2, as published by the Free Software Foundation. > > > + * > > > + * This program is distributed in the hope it will be useful, but WITHOUT > > > + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or > > > + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for > > > + * more details. > > > + * > > > + * You should have received a copy of the GNU General Public License along with > > > + * this program; if not, write to the Free Software Foundation, Inc., 59 Temple > > > + * Place - Suite 330, Boston, MA 02111-1307 USA. > > > + */ > > > + > > > +#ifndef __IORT_H__ > > > +#define __IORT_H__ > > > + > > > +#include > > > + > > > +#ifdef CONFIG_IORT_TABLE > > > +void iort_table_detect(void); > > > +#else > > > +static inline void iort_table_detect(void) { } > > > +#endif > > > + > > > +#endif /* __IORT_H__ */ > > > -- > > > 1.9.1 > > > > > > -- > > > To unsubscribe from this list: send the line "unsubscribe linux-pci" in > > > the body of a message to majordomo@vger.kernel.org > > > More majordomo info at http://vger.kernel.org/majordomo-info.html > > > >