From patchwork Mon Feb 26 00:28:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooks X-Patchwork-Id: 877643 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=opengear.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=opengear.com header.i=@opengear.com header.b="i4e2UCyb"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zqN5h5dyVz9s1p for ; Mon, 26 Feb 2018 11:30:32 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751954AbeBZAaA (ORCPT ); Sun, 25 Feb 2018 19:30:00 -0500 Received: from mail-bl2nam02on0058.outbound.protection.outlook.com ([104.47.38.58]:45136 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751817AbeBZA3z (ORCPT ); Sun, 25 Feb 2018 19:29:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=opengear.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=kCk/ZJFdVoPJc1df8iCQtZ9rU6epTv1X+2iyu3VugPM=; b=i4e2UCybcLRo/D+MuLrDmMJrE5tSvQ4H5ogPqKaFhHNMV8t+dGQaN46yPREg3FQEkRB0JtYcYcKPxLmK5jBIwKEZc+L9YJ4POldPxdlIV8wapt4zdrlnCvXvc94peStrvX+2xnwE0Nmr1Apy6pTXN4GP8zoZy8k7+WWRa/o0x3g= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=andrew.cooks@opengear.com; Received: from andrewc.bne.opengear.com (59.167.150.161) by DM5PR15MB1210.namprd15.prod.outlook.com (2603:10b6:3:b2::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.527.15; Mon, 26 Feb 2018 00:29:50 +0000 From: Andrew Cooks To: Jean Delvare , Wolfram Sang , linux-i2c@vger.kernel.org (open list:I2C/SMBUS CONTROLLER DRIVERS FOR PC), linux-kernel@vger.kernel.org (open list) Cc: Andrew Cooks , linux-acpi@vger.kernel.org, platypus-sw@opengear.com, "Tobin C . Harding" , Andrew Cooks Subject: [RESEND][PATCH v4 3/3] i2c: piix4: add ACPI support Date: Mon, 26 Feb 2018 10:28:45 +1000 Message-Id: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [59.167.150.161] X-ClientProxiedBy: ME2PR01CA0002.ausprd01.prod.outlook.com (2603:10c6:201:15::14) To DM5PR15MB1210.namprd15.prod.outlook.com (2603:10b6:3:b2::16) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3556f4cd-e8ed-476f-50b6-08d57cb00e29 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:DM5PR15MB1210; X-Microsoft-Exchange-Diagnostics: 1; DM5PR15MB1210; 3:fca5INRss1m4Gc+4nkzJKNAxYBco4k1ip6JpGDpqeX7ciZlwOqfzINvBRaAfCoSkwpgBjqq7guEiz10BDq9LXRzEZkJDmt6dfnCu9pQsIBtiqrw3SnVyA8wTxZOIddtto+tyHDsA3v6CYTb/GoOX++guw23lu3PVE38agL3oHyYV9IaQe5wYjzBavh1JctVDY6WrRAT7E0zN0zMG4ohLe5wbE/4UMGWcQZJCPIagXfiZ6WqZQzOb5cORGdVjJEqL; 25:1IiYTpYJjO8sjOxslA8fdJXgx4cHwVoGRsydFRI2uaw/DNe63CijgGqCiJ9FnWxQWFRSi3Vl/38/Lm62Sxj76+NcQ4hO1fxRzFfZQNjgMup5agTYxB50D3eyjiBzQL/hXR/hWJrDfRebZTG11azWEzCKdBKCgdfU9dZeV54Zqqc0jIAkX4f6h0vcxZlB8Q7f5LJ05IsqWDpOE9to31exW+8ecNk7CQ83uJwBuHvGLqZkAq1J21kyqpbqHA6yX6hX2LyE4MklZdT0MffDeSEvcdV228gikL48gMQgJfaz7NsLoGCvvNxGWtL5esrcxpSqH/qx11lruw2pCs9f7DRk/g==; 31:TNBOuXS5sSnWwKD4hEz429MJK5AfF3xJKxupzKrvdTMNfURF5wFWOY/AnfW+qr1fys100d7XJP2NSS+1BsvXGrmBFiotMFJorM7yoYqnY95V5eYqbVvHNPbU2GRuh9JcN7hf77F4ef4z8nVqOtxeHrEogbhbErMQLvWhH16KJuuGvrzoqExvmnokeIO8XL3ighZ+zVqxb2lH7+JV6sNeMMTBmJCjaZklsffx/REqQ7Q= X-MS-TrafficTypeDiagnostic: DM5PR15MB1210: X-Microsoft-Exchange-Diagnostics: 1; DM5PR15MB1210; 20:/XTryZHzxbPw5RgPvQoRVxdkhfItAC2to/V2B7fsxwJTM1oN/+jWNnIFDzKi4WlkcAQQ91fqQh/N5mtb8lw2nIoMwn8aB0XRN2Zj8Qt/o1YSCZyGtZbP+uW4/+Wd6B8ZJFQtI4qTTrtIUJ+ui+GaIQKnjni2oa4WB3lGvvYGyzk=; 4:18gCDNbyLv1JaBP/r8R08rvzyWd6u7MqU5TG4QNroY3drAq3uDnPapbP+ocFkOY24HW8nErkHslr6lnl73t+MqcZ5m1tkZCAJj88Qi1+/6G5jGCTA50Xo+mRsNQP6iRDaorHEeaLJF2OaWR35lW2/CoueP5Y5KLISt0mtgYn6PsOSYmQf8vYk3xzeAU22KmS7KycbCD05DeD/PFGBzfQt0NMHaMuzkXJVXhCXcLdQSeqJe/0PhixZv9IIlX0DwiHF+XbQdYiwsL1VwaBVslb3g== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040501)(2401047)(8121501046)(5005006)(3002001)(93006095)(93001095)(10201501046)(3231220)(944501161)(52105095)(6041288)(20161123562045)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(6072148)(201708071742011); SRVR:DM5PR15MB1210; BCL:0; PCL:0; RULEID:; SRVR:DM5PR15MB1210; X-Forefront-PRVS: 05954A7C45 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(346002)(376002)(39830400003)(39380400002)(366004)(199004)(189003)(66066001)(76176011)(52116002)(7696005)(1857600001)(97736004)(68736007)(54906003)(110136005)(118296001)(6486002)(51416003)(50466002)(48376002)(59450400001)(186003)(4326008)(16526019)(26005)(316002)(86362001)(25786009)(386003)(107886003)(305945005)(16586007)(105586002)(3846002)(6116002)(478600001)(53936002)(5660300001)(36756003)(7736002)(2906002)(106356001)(6666003)(8676002)(2950100002)(81166006)(8936002)(50226002)(47776003)(81156014); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR15MB1210; H:andrewc.bne.opengear.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: opengear.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; DM5PR15MB1210; 23:9N5gfMTddor0NnZ1jOXDwa7spgWjp/gx9gT57j6t+pgjAlAXKF42WeqT5qVnqUgxK7hUGInOnzFL5F7dcX7gx+7NJL81BNkOZXRiDgf5XBzfOeihux09BUOIWZQTeQU5BWfOCKa+DFxMJbwS5EJBttC8QZDDYhOsoad7JTiDlDIntT+iY2LKieUEUIpHclXn86bsDbbtIb33ROVSJ0YFBeHFHTH5pdVRR08nwlEpXI0tijXN7PKjYtyx5ZIZWFnRD/Aw/T3aFniO3eLmPj323fCehiXREa1GWsX2x89VUnsB8DtwqtZnpdkq4GOoBjELG+4Yv5+DnlID3VWrysO/RDGt5Yqyi9iMPdXW0Hp5+4u6vctmzuAEoFm3YLotp6lI8Iohp47skr9xPq9s/Xo+X5HqfoiW/A0w7WHsPnBmbbAWFpUDSO/lBkBqbwA8Mf3iZaPw3J7jfAT0Y0UrLOtgwZN4nZSxoAT6Vk5JEJxf8SVY1riZYKBX1LZ9wpgLPBLiBe+h6rHNWRZR7XIY8G2BYQUD5G5QfDYPi65Di8i5uFApdOig43DgMPL0mRDez2wY4UmlADDi1rqpvuOUxHnqXwlYvrqDH7CxoOU8+bzIv05biKQr7kfgUNRvDUExBsfpgkvvJeLDew5kO6C4c9F7FkSNYHU/XhZ4vL9i6MBQDBnvSjm8vnUp1bidPBEv7zAioxmThwN9oJZtp+iFR4n/ihN6JNE1ET+yfLZDS+U/Rqifk90IqdUWVbETIJGu5t+0f+dgOTvT7ucAhSUReg93UwQYAyRCuvQpi1LSGSumNMgvArxzRsyN/Q76miMQZPxLEkEUjD9cz5j8ld2gPI2Ts76FqGq5yo/TzsbcHqo732gEixj0UDBHgOXqSD/zMWYAgPTmPzNWvCKzCulrHiam/EOyHF7FXximq6sbrEb4fSz4nNHFhF2uRsmObMuSVZSU2g7mKwVwC2ST2FzJ9usEvAVINpgq+zw0QZuZIUY48WqNJApBSkEjVUHazBLr76/S8t5dkANCtFHhgGNggXc/nMb3qQdDcUBE+TrSnBNhfpTgNXNwW4VnrkSHCPRQoX59zUKcSUvkXT53HH1I7P7BtQFoLeKd8gDvJ+WONEnmxA/fFKCgBJNWDVl4vR0F7YuzcbrjgaHo4k6xpoo8PrzQzPZV7cHm7aDB0h3uaJGeJTosUnrE+HSiCrsvc8n9q9w7 X-Microsoft-Exchange-Diagnostics: 1; DM5PR15MB1210; 6:Wum29xN1ppu/kbhChnppP4+aMxkCrnI/mkLXXjwJXOMft36s1xSMjkFDbFYD/TIQCRyzX5ktwOpHe+XrWcCv/QtDQAFOhTNFsYOqIdHro6DP1wkCnuJp4XwgJmgYNydap2zCS9jkmQHMki7CZsVl/DmOr1fDmVJVvonGGBKPdlfmBnWy33UznOPtrLAEcdMjLUWirHOGNo30DBbzh2P2DMgOfUvXZJObZrzsuJPbK8mXxZ5llAcrODNlwEOCGUikPUoX9VS2CKeGqlVK+Qs5pbEKlrfdAqlGfO4GQUKxocO08bmz5L7MbKJIX1RU8+KJc0s00LqO/xXkVmM9zOnrPwwXtd8f3PBBXHdlxY8vLi0=; 5:5EAfUKc+6dNU6stGnPafHwaN18KHH5Oh+7gNPHGxe/bMBpFAoANwdmFZIIJ0Q/KizsY4QRmnZGySIWqHy0EHpXybuTMzDgiCDw2ftLR/b8JHondfaUGgZPbbJZS6E7N6WCRHsQbJN6cfEywvOQOEG/HIS4tdIIAee8S8uM/6rDI=; 24:SpLSp5lFjNN56GY/kZL9O1omvMO2PFBKf88mzm9A+jHBeY0jSDbaMq3U3DaE6Fb9YPJwD9flSCe1jPkqLHuzPS07d2SCBiAFDWo6Mnui16Y=; 7:xfdGIaVjvEGaQ3DGyS2LB7780Yu8+XK8ge9hyXbXef1WIflGnBjBMNSCxt+6tPhP21idzYsQ9mIDRlqqmjHR4rnrTCIi43ZKmovVxcDnBoFQUptjK9DtI+62NMv2FllFwptcH028o5VXDbbDULbqgEWaDlJepE1v33BifgnYBMDrK0aaUy3i9KmjQbaaO76P1IglJm9LoXnC2JIr/TDYH0F+TFHo9/oDrWWLDdUOFNBZcFE+Idkh1jZHJuqfAQ/p SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: opengear.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Feb 2018 00:29:50.2876 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3556f4cd-e8ed-476f-50b6-08d57cb00e29 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a6251c26-d21f-4164-a225-1f4eaebf5f9a X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR15MB1210 Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Enable the i2c-piix4 SMBus controller driver to enumerate I2C slave devices using ACPI. It builds on the related I2C mux device work in commit 8eb5c87a92c0 ("i2c: add ACPI support for I2C mux ports") In the i2c-piix4 driver the adapters are enumerated as: Main SMBus adapter Port 0, Port 2, ..., aux port (i.e., ASF adapter) However, in the AMD BKDG documentation[1], the implied order of ports is: Main SMBus adapter Port 0, ASF adapter, Port 2, Port 3, ... This ordering difference is unfortunate. We assume that ACPI developers will use the Linux ordering. [1] 52740 BIOS and Kernel Developer's Guide (BKDG) for AMD Family 16h Models 30h-3Fh Processors Signed-off-by: Andrew Cooks Signed-off-by: Jean Delvare --- drivers/i2c/busses/i2c-piix4.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c index 01f1610..9a6cdc8 100644 --- a/drivers/i2c/busses/i2c-piix4.c +++ b/drivers/i2c/busses/i2c-piix4.c @@ -837,6 +837,12 @@ static int piix4_add_adapter(struct pci_dev *dev, unsigned short smba, /* set up the sysfs linkage to our parent device */ adap->dev.parent = &dev->dev; + if (has_acpi_companion(&dev->dev)) { + acpi_preset_companion(&adap->dev, + ACPI_COMPANION(&dev->dev), + piix4_adapter_count); + } + snprintf(adap->name, sizeof(adap->name), "SMBus PIIX4 adapter%s at %04x", name, smba);