From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752720AbbJZC0Z (ORCPT ); Sun, 25 Oct 2015 22:26:25 -0400 Received: from mail-bn1bon0096.outbound.protection.outlook.com ([157.56.111.96]:51360 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752387AbbJZC0Y (ORCPT ); Sun, 25 Oct 2015 22:26:24 -0400 Authentication-Results: spf=none (sender IP is 165.204.84.221) smtp.mailfrom=amd.com; alien8.de; dkim=none (message not signed) header.d=none;alien8.de; dmarc=permerror action=none header.from=amd.com; X-WSS-ID: 0NWT2RT-07-4N2-02 X-M-MSG: Date: Mon, 26 Oct 2015 10:25:07 +0800 From: Huang Rui To: Guenter Roeck CC: Borislav Petkov , Peter Zijlstra , "Jean Delvare" , Andy Lutomirski , "Andreas Herrmann" , Thomas Gleixner , Ingo Molnar , "Rafael J. Wysocki" , "Len Brown" , John Stultz , =?utf-8?B?RnLvv71k77+9cmlj?= Weisbecker , , , , Andreas Herrmann , Aravind Gopalakrishnan , Borislav Petkov , Fengguang Wu , Aaron Lu , Tony Li Subject: Re: [PATCH v2 01/10] hwmon: (fam15h_power) Refactor attributes for dynamically added Message-ID: <20151026022507.GC8036@hr-amur2> References: <1445308109-17970-1-git-send-email-ray.huang@amd.com> <1445308109-17970-2-git-send-email-ray.huang@amd.com> <562A393C.3000707@roeck-us.net> <20151026015843.GA8036@hr-amur2> <20151026021427.GA12733@roeck-us.net> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: <20151026021427.GA12733@roeck-us.net> User-Agent: Mutt/1.5.21 (2010-09-15) X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:165.204.84.221;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(2980300002)(428002)(24454002)(199003)(189002)(164054003)(479174004)(377454003)(5007970100001)(189998001)(110136002)(92566002)(19580405001)(19580395003)(2950100001)(23726002)(77096005)(86362001)(4001350100001)(11100500001)(97736004)(54356999)(83506001)(33716001)(87936001)(97756001)(76176999)(47776003)(106466001)(5008740100001)(93886004)(33656002)(101416001)(105586002)(50986999)(50466002)(46406003)(107986001);DIR:OUT;SFP:1101;SCL:1;SRVR:BLUPR12MB0706;H:atltwp01.amd.com;FPR:;SPF:None;PTR:InfoDomainNonexistent;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BLUPR12MB0706;2:WWSmDUfXnQpvoRXkGC+xWygr7p3Rfd+4cwLkmF2Nl+PxZuS24zG7sB7eYlPtdLdQ7V8z5MPqJAF4BSsd6We5xiGRihlhN+VHq3Vxfp/ja8clpB0iDVk8Wdp7J6M5eUMFkur/CKLycD0EKW5IIJQBDfx00qUcgda4ywbojQbcRgU=;3:0FtmesVZUcPUbYJbsoVlFFhm/GrUZdu4Ce6oTHJPCP/PmAz19jdl2E61SFWCTIPX0S13AaheXAL1bxpKVke89d8h37SyhEtWBc60SM2Zkvv0HsX3G/IkODdgZmPP+L+9oX+bjP8zwXMc0IlQcUggbVBieF6KptdtqKDPyvyL/K5BVIe1iE8jf4B/JjRBzBSc7G5QXRUupQ1vZv+1gXlFr9ipsHwM8sgT+g27rXJwRdnaL8wRW1AW7AzKrU4pCyad;25:RrLEgqyNXS95ZuVwg7/22lhz+dTpp3jM7bAs5pTN+ZiXtjstF3mEz2y7n2CjK1BzWL9hWOcIslbVKu6BugPiLuanxP3auUv/16v0JWgcyVq70JrV6O0pjbjOXgB83hoMrgXGiiHmnx11ZDC7cacfqw8oNH2bTSTjsR0ZuNOtw/osGBgxfdQD7STYR2ozhaZrxy+l5RtbXEOTGVNwirKajC2V/42Ps5s1CPpNX148PaFV2vHlvzrb2rA6s1jsSAGi X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR12MB0706; X-Microsoft-Exchange-Diagnostics: 1;BLUPR12MB0706;20:KuS6bBwlhys2aVZBeSYehMcVnXUdzJYPsDI3qT6NPKORGu6vhEFbO9K0LOVyB/RcJfD3XQahrBDon7bWjf1jdkVlFVR48h8KGpmNB01JF/H6d+GwfpVfS92Ga34dkKtgTwlnI70FyEDN/+HlAPWPYxQdWLq+LBWclvbetf/wa9qWBU9XEg5NrgV4MJ27pM/sUJ16YnlI5bJXBwbSW25n32Jhmq0ia/Q2dgWfHT4U1Utoa8xuTDrsQ8rYnYjS3FrJDnWXa3m03LkbTX2QbOa0VZ9pYI+beeKQQmD1L8ZjAzfP55oa0i2Omt9Iz/wEre2+AsFmvcL6C/mBeGlMOzYG9F6HI1y2JisAIvjjFdpIo4Pr7zTCldN4nfn9+O4rhEsguseG9uPqbyWblNc0UdUcpz2GImwwk3uW7O3To+HaIUr4fukTRwlSx5wfi4SMyhCpr3Q240FQcvhq0cw3wpiDSezmSXbjyfxKMpeqKe4SsRpOAomBBnyWvJ9JiEEL4RdT;4:WVgI4Cc4zEQfiJaEi2BfBgWC6UDLcNaD5tR/AN7KZRKKqLROMipDMu+BrPmQ2Gpxf73YruQXjnpspPSEYiqUzpydjGWHMQtrqULhlyfeIq86j6WtCNebLWEdsLuBktLCHT9H6D+hBcRKciKdtKbIaps1i+vMbQp4vHRBh/WAvpp0B7yaRFj5pxXLANIW8iIqOtakdD6cTnSbnkwfI+XLXembQAXyuOplPOUcVE7xENTSJ8c7FWS+SqagnVGRWY7uiD+Ay1k/KsO1O0jUrx0uXupxQKjPLfEkRG/QNXTg3wK+CyLyrxAi0oxvZ9EkHVfjBBi5C8YFvrzMgy/NPDxzH+KtBtoK2vV8myEFYXtcZP1NJdNruPpc/TER3hkl3AUc X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(520078)(5005006)(8121501046)(3002001)(102215026);SRVR:BLUPR12MB0706;BCL:0;PCL:0;RULEID:;SRVR:BLUPR12MB0706; X-Forefront-PRVS: 0741C77572 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BLUPR12MB0706;23:oOzhcpyoN2pmShEBvrzzx5lIyy1y5LSWIM3i9SKjZ?= =?us-ascii?Q?6PlXRVlbcxMA3rTHiEdtuDbJD7tDEXBJRCfA+6DHtKqvSKG5MF1ucOhAoveI?= =?us-ascii?Q?OodmnBJrPDFuiMHT3yviwz5a+JYfIFGzliv4363uedYmIcJvpvoVFryeNIzv?= =?us-ascii?Q?x7du5bFKVPQ4r8JFOCZo8jqvvk0FLHK9yTpwJ3s2eSlCcPn9GnmuAOtX0QGH?= =?us-ascii?Q?ypuqV4OoXzOspUWenawwzLq0vV9KNl+UpjDD5clcoGeyg6tctcO0IUoS0+ID?= =?us-ascii?Q?EboFpMecm8kFOmdWVsBg9I8qAqdE5gPublAIeI+vHWk5Vdf5sbGFwmfM40xy?= =?us-ascii?Q?rcmZTzca2Dutyebt2metjTZhbcYQzSdkl9SL7Kq2gStxzY9PTH1Ty0OR121q?= =?us-ascii?Q?+jBV7a8/xaNQKmkJMi64H+P6SdVeWOAVnTT5cuExGMwSRuDaqGyjcQTqoSb+?= =?us-ascii?Q?ea140Ua3ir1j0pdtQg95qoWhizkFmHmcG1AJFPDq6coRTvy1Ew5y1LDIB88G?= =?us-ascii?Q?edY2dW4YXRDn/iVHvCJ8w32K0DQtN882K0dmQWBBTjaRe5my82MTrJcH6PQQ?= =?us-ascii?Q?AtvA2MS+P+ZqZAGuKyLgs/qxqy7vvFiumvEuQBpujOYB9sXbOxfCMzEHO/G3?= =?us-ascii?Q?Mq/JTpWhMTF6jJbhLTQYNdvB3lyk9xZTkEqvWdhkjPo9udvbDrdgSZ4kRtCs?= =?us-ascii?Q?qWeZRe25c8IBmC1oeed3V7uLjd3IYYs4zevvKPVZFqjmPRRU7ZlQo7QSq0jS?= =?us-ascii?Q?VESH5XYoisvElyFcp1AlaNZTaQl/781Lv3zUjazjoy7zV4GbUeJ1zTKBeBPF?= =?us-ascii?Q?YhVgCfdXEti4xaQ14gc+IPrQEsD90Lfv+7xycKGQRJrB8ulCQ5bDZe0yAa3W?= =?us-ascii?Q?8wnMwteABQcwSuNXsShsItLrvvhZWQRyvC2FNRtrjgVIKWoCXKnWqyYoh7B7?= =?us-ascii?Q?98jkk0+k4SSSYZgpqDw0waan7q9BNfpMhF46m7i3nVhbB0PwVJ4A9w4b9yNT?= =?us-ascii?Q?J0Gpi/6ayv4Ms6BKgVMhk3YTzVTbFTHKgjRi9HafVV5le9XPjSp4teiDNWvx?= =?us-ascii?Q?mizaio=3D?= X-Microsoft-Exchange-Diagnostics: 1;BLUPR12MB0706;5:GAsITjnqgZ+FKq24d9AzE9Uhmq4GvxtWvOubYQowvhMA4eJbgk5eC3PRzVd8pXLLgPj8sKTkOGwgZJXbZWvl7zw3gOhX5aBEHMR8BlOb9VD8mgXOkl9FuWFB75lYSVfiTIQUkDuj/6lBYCu9IEGNbg==;24:y8l/FSQVdoxU55mHewEcwnL+3+iWaDhr+MfovSG56TUXkYEr27b8RRsTZG14UqEaBBQ7Xe4hs77xiiwWKFwt1dXw59Olzx2pKj0KA3zo5Io=;20:8/uPbACLjwDlnJuCY5t6ERLhsQNsjCl868MmGzfZYKn4dAAfjpFH51ywhfItG9Gou68Gowh3t+zzV94tWIY3Yj1Ge4t0uSzlc7MlWmyP71jpiMC84MUJNcsNG/xBjAT2l2+7ahNodWAkoHfYhdkQfLOcOFDM1xf0yN0qfRXWcPu330Vw+2kY/MoA0SArjPjyVjNxwKsMJlZjC8z9aq0Y+P3GxAKtdI01xHgfkxvAhMn0i3ig+mSe6YwJSbAak3tv SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Oct 2015 02:26:18.3217 (UTC) X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.221];Helo=[atltwp01.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR12MB0706 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, Oct 25, 2015 at 07:14:27PM -0700, Guenter Roeck wrote: > On Mon, Oct 26, 2015 at 09:58:45AM +0800, Huang Rui wrote: > > On Fri, Oct 23, 2015 at 06:42:20AM -0700, Guenter Roeck wrote: > > > On 10/19/2015 07:28 PM, Huang Rui wrote: > > > >Attributes depend on the CPU model the driver gets loaded on. > > > >Therefore, add those attributes dynamically at init time. This is more > > > >flexible to control the different attributes on different platforms. > > > > > > > >Suggestedy-by: Borislav Petkov > > > >Signed-off-by: Huang Rui > > > >Cc: Guenter Roeck > > > >Cc: Peter Zijlstra > > > >Cc: Ingo Molnar > > > >--- > > > > drivers/hwmon/fam15h_power.c | 70 ++++++++++++++++++++++++++++---------------- > > > > 1 file changed, 45 insertions(+), 25 deletions(-) > > > > > > > >diff --git a/drivers/hwmon/fam15h_power.c b/drivers/hwmon/fam15h_power.c > > > >index e80ee23..41d022e 100644 > > > >--- a/drivers/hwmon/fam15h_power.c > > > >+++ b/drivers/hwmon/fam15h_power.c > > > >@@ -41,12 +41,17 @@ MODULE_LICENSE("GPL"); > > > > #define REG_TDP_RUNNING_AVERAGE 0xe0 > > > > #define REG_TDP_LIMIT3 0xe8 > > > > > > > >+#define FAM15H_MIN_NUM_ATTRS 2 > > > >+#define FAM15H_NUM_GROUPS 2 > > > >+ > > > > struct fam15h_power_data { > > > > struct pci_dev *pdev; > > > > unsigned int tdp_to_watts; > > > > unsigned int base_tdp; > > > > unsigned int processor_pwr_watts; > > > > unsigned int cpu_pwr_sample_ratio; > > > >+ const struct attribute_group *fam15h_power_groups[FAM15H_NUM_GROUPS]; > > > >+ struct attribute_group fam15h_power_group; > > > > }; > > > > > > > > static ssize_t show_power(struct device *dev, > > > >@@ -105,29 +110,31 @@ static ssize_t show_power_crit(struct device *dev, > > > > } > > > > static DEVICE_ATTR(power1_crit, S_IRUGO, show_power_crit, NULL); > > > > > > > >-static umode_t fam15h_power_is_visible(struct kobject *kobj, > > > >- struct attribute *attr, > > > >- int index) > > > >+static int fam15h_power_init_attrs(struct pci_dev *pdev, > > > >+ struct fam15h_power_data *data) > > > > { > > > >- /* power1_input is only reported for Fam15h, Models 00h-0fh */ > > > >- if (attr == &dev_attr_power1_input.attr && > > > >- (boot_cpu_data.x86 != 0x15 || boot_cpu_data.x86_model > 0xf)) > > > >- return 0; > > > >+ int n = FAM15H_MIN_NUM_ATTRS; > > > >+ struct attribute **fam15h_power_attrs; > > > > > > > >- return attr->mode; > > > >-} > > > >+ if (boot_cpu_data.x86 == 0x15 && boot_cpu_data.x86_model <= 0xf) > > > >+ n += 1; > > > > > > > >-static struct attribute *fam15h_power_attrs[] = { > > > >- &dev_attr_power1_input.attr, > > > >- &dev_attr_power1_crit.attr, > > > >- NULL > > > >-}; > > > >+ fam15h_power_attrs = devm_kcalloc(&pdev->dev, n, > > > >+ sizeof(*fam15h_power_attrs), > > > >+ GFP_KERNEL); > > > > > > > >-static const struct attribute_group fam15h_power_group = { > > > >- .attrs = fam15h_power_attrs, > > > >- .is_visible = fam15h_power_is_visible, > > > >-}; > > > >-__ATTRIBUTE_GROUPS(fam15h_power); > > > >+ if (!fam15h_power_attrs) > > > >+ return -ENOMEM; > > > >+ > > > >+ n = 0; > > > >+ fam15h_power_attrs[n++] = &dev_attr_power1_crit.attr; > > > >+ if (boot_cpu_data.x86 == 0x15 && boot_cpu_data.x86_model <= 0xf) > > > >+ fam15h_power_attrs[n++] = &dev_attr_power1_input.attr; > > > >+ > > > >+ data->fam15h_power_group.attrs = fam15h_power_attrs; > > > >+ > > > >+ return 0; > > > >+} > > > > > > > > static bool should_load_on_this_node(struct pci_dev *f4) > > > > { > > > >@@ -186,11 +193,12 @@ static int fam15h_power_resume(struct pci_dev *pdev) > > > > #define fam15h_power_resume NULL > > > > #endif > > > > > > > >-static void fam15h_power_init_data(struct pci_dev *f4, > > > >- struct fam15h_power_data *data) > > > >+static int fam15h_power_init_data(struct pci_dev *f4, > > > >+ struct fam15h_power_data *data) > > > > { > > > > u32 val, eax, ebx, ecx, edx; > > > > u64 tmp; > > > >+ int ret; > > > > > > > > pci_read_config_dword(f4, REG_PROCESSOR_TDP, &val); > > > > data->base_tdp = val >> 16; > > > >@@ -211,11 +219,15 @@ static void fam15h_power_init_data(struct pci_dev *f4, > > > > /* convert to microWatt */ > > > > data->processor_pwr_watts = (tmp * 15625) >> 10; > > > > > > > >+ ret = fam15h_power_init_attrs(f4, data); > > > >+ if (ret) > > > >+ return ret; > > > >+ > > > > cpuid(0x80000007, &eax, &ebx, &ecx, &edx); > > > > > > > > /* CPUID Fn8000_0007:EDX[12] indicates to support accumulated power */ > > > > if (!(edx & BIT(12))) > > > >- return; > > > >+ return 0; > > > > > > > > /* > > > > * determine the ratio of the compute unit power accumulator > > > >@@ -223,14 +235,17 @@ static void fam15h_power_init_data(struct pci_dev *f4, > > > > * Fn8000_0007:ECX > > > > */ > > > > data->cpu_pwr_sample_ratio = ecx; > > > >+ > > > >+ return 0; > > > > } > > > > > > > > static int fam15h_power_probe(struct pci_dev *pdev, > > > >- const struct pci_device_id *id) > > > >+ const struct pci_device_id *id) > > > > { > > > > struct fam15h_power_data *data; > > > > struct device *dev = &pdev->dev; > > > > struct device *hwmon_dev; > > > >+ int ret; > > > > > > > > /* > > > > * though we ignore every other northbridge, we still have to > > > >@@ -246,12 +261,17 @@ static int fam15h_power_probe(struct pci_dev *pdev, > > > > if (!data) > > > > return -ENOMEM; > > > > > > > >- fam15h_power_init_data(pdev, data); > > > >+ ret = fam15h_power_init_data(pdev, data); > > > >+ if (ret) > > > >+ return ret; > > > >+ > > > > data->pdev = pdev; > > > > > > > >+ data->fam15h_power_groups[0] = &data->fam15h_power_group; > > > >+ > > > > hwmon_dev = devm_hwmon_device_register_with_groups(dev, "fam15h_power", > > > > data, > > > >- fam15h_power_groups); > > > >+ (const struct attribute_group **)&data->fam15h_power_groups); > > > > > > Why this typecast ? It should not be needed. > > > > > > > That's because there will be a warning without the typecast. > > > > Expected 'const struct attribute_group **', but current type is 'const > > struct attribute_group * (*)[2]'. > > > > Maybe then either use data->fam15h_power_groups (no &) or > &data->fam15h_power_groups[0]. Looks better. :) > > On a side note, the "fam15h_" prefix in the variable name is really > unnecessary unless there are some other groups in the same data structure. > Even the "power_" prefix doesn't really add any value unless there > are other groups. > OK, I will update it on V3. Thanks, Rui