From patchwork Mon Dec 26 17:58:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ilpo_J=C3=A4rvinen?= X-Patchwork-Id: 36672 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp1029813wrt; Mon, 26 Dec 2022 10:01:48 -0800 (PST) X-Google-Smtp-Source: AMrXdXvGOa69JAHbVFL9ORMMgt4U0mGaz0CBWR6oET2rP0j7bmyNN1IlimANs0N9JxDt6pRH+mWP X-Received: by 2002:a17:906:fb97:b0:7c1:64dc:ac3c with SMTP id lr23-20020a170906fb9700b007c164dcac3cmr16184984ejb.59.1672077708549; Mon, 26 Dec 2022 10:01:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672077708; cv=none; d=google.com; s=arc-20160816; b=bxEPumYGz5qXIVWS+hYZJC/0+YgEdpKk64S+75vMPv3hwMkDJ0zRvaDtL2o5Cp/Qlr rY2Z7IBza4vcsQJ6AlQ9l2jggDys7wG/I7olzJs7yHahJb9OXqEnC9bICmCgomqBIICt c7DaZHJkfKqfpabDLxxyt16nMKRD9B0cCe2AQOExIfcdndG1bJZrTbqZj4Md/dVayQzw 5GYDB5y5mejiFQ3uudUW41nMTSuj9w/xmxh/jrLcmeWvS6pjGSat7zQWB4jKAqt0IBkM 7GtRyOzVz59voTxnelsM6FZShJaXs7Snbh1FfTkll542J053cRD+9GAZIY+aIE1h/ahF tAVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=59qGuW4vzhcAJ+It0W7zxD4Gg6JIAfy0pV8AuF8STKs=; b=h4TcHBoQGhrJ3DyJ/Kv9x3dGVo7YLP20NWZDgsvkc1xPImZlG8hbzMW+0BJGjvUZqC tSjgKvZgCKQ5SFh3VP9WPs1sFkyfFkiarDjF5pypDKohuxM6rPmGxfJ4X8SbI8UJAu5n dJp6sy4V6F9tcPXHxt7dGEGAE7bX+EELn+GKD1I/Pq4TV5gTTNEOw98qO1KUM2KukMmA 6wqQh7Kci+D/UWAmdDyQaOxPcwY7wief34xcDNjcCbTyiueCX0QXmlZ4s7CgtN+P+uGx lNYU+eYKW5VMFZXMg9B09tGNgWaB4X+1Ze8zKlmpl3WqMa7E+nTi6AjgPHjyS6JZ4UzH 02Kg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=S6G6u5lK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hs11-20020a1709073e8b00b007aec7f879basi9228227ejc.22.2022.12.26.10.01.25; Mon, 26 Dec 2022 10:01:48 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=S6G6u5lK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231991AbiLZR7R (ORCPT + 99 others); Mon, 26 Dec 2022 12:59:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58910 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231698AbiLZR7M (ORCPT ); Mon, 26 Dec 2022 12:59:12 -0500 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B49BC2651; Mon, 26 Dec 2022 09:59:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1672077551; x=1703613551; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=7N6YGBrEGU7nYWMmoWqCRA6ddNKbSVOPjfO9fN7Oj8s=; b=S6G6u5lKF0065d1mDPkCOcWfjVLzynKdN9QAyvD0JDN1VzltIh2pMaSC 5ypojRGfYv4eG21gCkGJPvV3zutpu3o3ZWtjoh5wSuJEHPx3TZ5DvV8gP ZHPcwk+wdXKr5v5iSy2OQDknMat4XL3Dw/yl6NALoog+rEQHG9HAMZhBM 35AzS6XVrdmhxGtbFcxq/TGfvF7d4cTgoCMPE98HgFN6J8Nb3TmKT2ucW VGwZxxx73M4FYvikK/tjNpHD/iqnq5rTr21vC4cTQfjiNYirBdiveubOS NWDmZdLO1veWIK1crfoIn7UeMU3vHZ84meAxWLGDdStDUviVZNzqkl4d8 Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10572"; a="322570958" X-IronPort-AV: E=Sophos;i="5.96,276,1665471600"; d="scan'208,146";a="322570958" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Dec 2022 09:59:11 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10572"; a="654810060" X-IronPort-AV: E=Sophos;i="5.96,276,1665471600"; d="scan'208,146";a="654810060" Received: from ptelkov-mobl2.ccr.corp.intel.com (HELO ijarvine-MOBL2.ger.corp.intel.com) ([10.249.41.4]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Dec 2022 09:59:06 -0800 From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= To: linux-fpga@vger.kernel.org, Xu Yilun , Wu Hao , Tom Rix , Moritz Fischer , Lee Jones , Matthew Gerlach , Russ Weight , Tianfei zhang , Mark Brown , Marco Pagani , linux-kernel@vger.kernel.org Cc: =?utf-8?q?Ilpo_J=C3=A4rvinen?= Subject: [PATCH v5 01/10] mfd: intel-m10-bmc: Create m10bmc_platform_info for type specific info Date: Mon, 26 Dec 2022 19:58:40 +0200 Message-Id: <20221226175849.13056-2-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221226175849.13056-1-ilpo.jarvinen@linux.intel.com> References: <20221226175849.13056-1-ilpo.jarvinen@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1753300555513361116?= X-GMAIL-MSGID: =?utf-8?q?1753300555513361116?= BMC type specific info is currently set by a switch/case block. The size of this info is expected to grow as more dev types and features are added which would have made the switch block bloaty. Store type specific info into struct and place them into .driver_data instead because it makes things a bit cleaner. The m10bmc_type enum can be dropped as the differentiation is now fully handled by the platform info. The info member of struct intel_m10bmc that is added here is not used yet in this change but its addition logically still belongs to this change. The CSR map change that comes after this change needs to have the info member. Reviewed-by: Russ Weight Reviewed-by: Xu Yilun Signed-off-by: Ilpo Järvinen --- drivers/mfd/intel-m10-bmc.c | 53 ++++++++++++++----------------- include/linux/mfd/intel-m10-bmc.h | 12 +++++++ 2 files changed, 36 insertions(+), 29 deletions(-) diff --git a/drivers/mfd/intel-m10-bmc.c b/drivers/mfd/intel-m10-bmc.c index 7e3319e5b22f..12c522c16d83 100644 --- a/drivers/mfd/intel-m10-bmc.c +++ b/drivers/mfd/intel-m10-bmc.c @@ -13,12 +13,6 @@ #include #include -enum m10bmc_type { - M10_N3000, - M10_D5005, - M10_N5010, -}; - static struct mfd_cell m10bmc_d5005_subdevs[] = { { .name = "d5005bmc-hwmon" }, { .name = "d5005bmc-sec-update" } @@ -162,15 +156,17 @@ static int check_m10bmc_version(struct intel_m10bmc *ddata) static int intel_m10_bmc_spi_probe(struct spi_device *spi) { const struct spi_device_id *id = spi_get_device_id(spi); + const struct intel_m10bmc_platform_info *info; struct device *dev = &spi->dev; - struct mfd_cell *cells; struct intel_m10bmc *ddata; - int ret, n_cell; + int ret; ddata = devm_kzalloc(dev, sizeof(*ddata), GFP_KERNEL); if (!ddata) return -ENOMEM; + info = (struct intel_m10bmc_platform_info *)id->driver_data; + ddata->info = info; ddata->dev = dev; ddata->regmap = @@ -189,24 +185,8 @@ static int intel_m10_bmc_spi_probe(struct spi_device *spi) return ret; } - switch (id->driver_data) { - case M10_N3000: - cells = m10bmc_pacn3000_subdevs; - n_cell = ARRAY_SIZE(m10bmc_pacn3000_subdevs); - break; - case M10_D5005: - cells = m10bmc_d5005_subdevs; - n_cell = ARRAY_SIZE(m10bmc_d5005_subdevs); - break; - case M10_N5010: - cells = m10bmc_n5010_subdevs; - n_cell = ARRAY_SIZE(m10bmc_n5010_subdevs); - break; - default: - return -ENODEV; - } - - ret = devm_mfd_add_devices(dev, PLATFORM_DEVID_AUTO, cells, n_cell, + ret = devm_mfd_add_devices(dev, PLATFORM_DEVID_AUTO, + info->cells, info->n_cells, NULL, 0, NULL); if (ret) dev_err(dev, "Failed to register sub-devices: %d\n", ret); @@ -214,10 +194,25 @@ static int intel_m10_bmc_spi_probe(struct spi_device *spi) return ret; } +static const struct intel_m10bmc_platform_info m10bmc_spi_n3000 = { + .cells = m10bmc_pacn3000_subdevs, + .n_cells = ARRAY_SIZE(m10bmc_pacn3000_subdevs), +}; + +static const struct intel_m10bmc_platform_info m10bmc_spi_d5005 = { + .cells = m10bmc_d5005_subdevs, + .n_cells = ARRAY_SIZE(m10bmc_d5005_subdevs), +}; + +static const struct intel_m10bmc_platform_info m10bmc_spi_n5010 = { + .cells = m10bmc_n5010_subdevs, + .n_cells = ARRAY_SIZE(m10bmc_n5010_subdevs), +}; + static const struct spi_device_id m10bmc_spi_id[] = { - { "m10-n3000", M10_N3000 }, - { "m10-d5005", M10_D5005 }, - { "m10-n5010", M10_N5010 }, + { "m10-n3000", (kernel_ulong_t)&m10bmc_spi_n3000 }, + { "m10-d5005", (kernel_ulong_t)&m10bmc_spi_d5005 }, + { "m10-n5010", (kernel_ulong_t)&m10bmc_spi_n5010 }, { } }; MODULE_DEVICE_TABLE(spi, m10bmc_spi_id); diff --git a/include/linux/mfd/intel-m10-bmc.h b/include/linux/mfd/intel-m10-bmc.h index f0044b14136e..725b51ea4aee 100644 --- a/include/linux/mfd/intel-m10-bmc.h +++ b/include/linux/mfd/intel-m10-bmc.h @@ -118,14 +118,26 @@ /* Address of 4KB inverted bit vector containing staging area FLASH count */ #define STAGING_FLASH_COUNT 0x17ffb000 +/** + * struct intel_m10bmc_platform_info - Intel MAX 10 BMC platform specific information + * @cells: MFD cells + * @n_cells: MFD cells ARRAY_SIZE() + */ +struct intel_m10bmc_platform_info { + struct mfd_cell *cells; + int n_cells; +}; + /** * struct intel_m10bmc - Intel MAX 10 BMC parent driver data structure * @dev: this device * @regmap: the regmap used to access registers by m10bmc itself + * @info: the platform information for MAX10 BMC */ struct intel_m10bmc { struct device *dev; struct regmap *regmap; + const struct intel_m10bmc_platform_info *info; }; /*